Commit 565646d3 by 王文龙

[update]完善细节

parent e87afc70
...@@ -94,7 +94,7 @@ dependencies { ...@@ -94,7 +94,7 @@ dependencies {
implementation 'com.android.support:multidex:1.0.3' implementation 'com.android.support:multidex:1.0.3'
implementation("com.offcn.live:titleview:1.1.0-s1") implementation("com.offcn.live:titleview:1.1.0-s1")
implementation("com.offcn.live:imsdk-kit:1.0.0.12") implementation("com.offcn.live:imsdk-kit:1.0.0.13")
// DB // DB
implementation 'org.greenrobot:greendao:3.2.2' implementation 'org.greenrobot:greendao:3.2.2'
......
...@@ -49,7 +49,15 @@ public class ChatListFragmentWrapper extends BaseFragment { ...@@ -49,7 +49,15 @@ public class ChatListFragmentWrapper extends BaseFragment {
@Override @Override
protected void init(View view) { protected void init(View view) {
view.findViewById(R.id.search).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (!CommonUtils.isFastDoubleClick()) {
startActivity(new Intent(getActivity(), SearchActivity.class));
getActivity().overridePendingTransition(R.anim.push_bottom_in, R.anim.push_bottom_still);
}
}
});
} }
@Override @Override
......
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:fitsSystemWindows="true"
tools:ignore="MissingDefaultResource"> tools:ignore="MissingDefaultResource">
<com.jyall.titleview.TitleView <com.jyall.titleview.TitleView
android:id="@+id/title_view" android:id="@+id/title_view"
android:background="@android:color/white"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingTop="@dimen/toolbar_padding_top" />
<fragment <fragment
android:id="@+id/fragment_chat" android:id="@+id/fragment_chat"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="20dp" android:layout_margin="20dp"
android:fitsSystemWindows="true" android:paddingTop="@dimen/toolbar_padding_top"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:orientation="vertical"> android:orientation="vertical">
......
...@@ -9,15 +9,16 @@ ...@@ -9,15 +9,16 @@
android:id="@+id/tab_layout" android:id="@+id/tab_layout"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
app:tabIndicatorHeight="0dp" app:tabIndicatorHeight="0dp"
android:background="@android:color/white"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" /> android:layout_height="60dp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="0.5dp"
android:id="@+id/view_line" android:id="@+id/view_line"
android:layout_above="@+id/tab_layout" android:layout_above="@+id/tab_layout"
android:background="@android:color/darker_gray"/> android:background="@color/color_cecece" />
<com.offcn.live.imkit.view.ScrollEnabledViewPager <com.offcn.live.imkit.view.ScrollEnabledViewPager
android:id="@+id/view_pager" android:id="@+id/view_pager"
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:background="@android:color/white" android:background="@android:color/white"
android:paddingTop="@dimen/toolbar_padding_top"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
......
...@@ -5,11 +5,34 @@ ...@@ -5,11 +5,34 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:background="@android:color/white"
android:paddingTop="@dimen/main_padding_top"> android:paddingTop="@dimen/main_padding_top">
<RelativeLayout
android:id="@+id/search"
android:layout_width="match_parent"
android:layout_height="38dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@drawable/bg_search">
<TextView
android:layout_width="wrap_content"
android:layout_height="38dp"
android:layout_centerInParent="true"
android:drawableLeft="@mipmap/ic_search"
android:drawablePadding="5dp"
android:gravity="center"
android:text="@string/search"
android:textColor="@color/color_cecece"
android:textSize="15sp" />
</RelativeLayout>
<fragment <fragment
android:name="com.offcn.live.imkit.ui.ChatListFragment" android:name="com.offcn.live.imkit.ui.ChatListFragment"
android:id="@+id/chat_list_fragment" android:id="@+id/chat_list_fragment"
android:layout_marginTop="15dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
......
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
<com.offcn.imclient.view.AnimatedExpandableListView <com.offcn.imclient.view.AnimatedExpandableListView
android:id="@+id/recycler_view" android:id="@+id/recycler_view"
android:divider="@null"
android:childDivider="@null"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:groupIndicator="@null" /> android:groupIndicator="@null" />
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="50dp"> android:paddingLeft="30dp">
<ImageView <ImageView
android:id="@+id/iv_avatar" android:id="@+id/iv_avatar"
android:layout_width="45dp" android:layout_width="40dp"
android:layout_height="45dp" android:layout_height="40dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@mipmap/ic_teacher" /> android:src="@mipmap/ic_teacher" />
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
android:id="@+id/tv_name" android:id="@+id/tv_name"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment