发现页面的修改

skWeiChatBaidu/src/main/java/com/liaobo/im/fragment/FindFragment.java

@@ -1,69 +1,31 @@
 package com.liaobo.im.fragment;
 
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.liaobo.im.AppConstant;
 import com.liaobo.im.R;
-import com.liaobo.im.Reporter;
-import com.liaobo.im.bean.SignInStatus;
-import com.liaobo.im.bean.User;
-import com.liaobo.im.broadcast.OtherBroadcast;
-import com.liaobo.im.course.LocalCourseActivity;
-import com.liaobo.im.db.InternationalizationHelper;
-import com.liaobo.im.db.dao.FriendDao;
-import com.liaobo.im.db.dao.UserDao;
-import com.liaobo.im.helper.AvatarHelper;
 import com.liaobo.im.ui.MainActivity;
-import com.liaobo.im.ui.account.SignInActivity;
 import com.liaobo.im.ui.base.EasyFragment;
-import com.liaobo.im.ui.circle.BusinessCircleActivity;
 import com.liaobo.im.ui.company.ManagerCompany;
 import com.liaobo.im.ui.contacts.PublishNumberActivity;
-import com.liaobo.im.ui.contacts.RoomActivity;
 import com.liaobo.im.ui.contacts.label.LabelActivity;
-import com.liaobo.im.ui.dialog.VerifiedDialogView;
-import com.liaobo.im.ui.me.BasicInfoEditActivity;
 import com.liaobo.im.ui.me.FriendsCircleFragmentActivity;
 import com.liaobo.im.ui.me.LifeCircleActivity;
-import com.liaobo.im.ui.me.MyCollection;
 import com.liaobo.im.ui.me.NearPersonActivity;
-import com.liaobo.im.ui.me.SelectFriendsActivity;
-import com.liaobo.im.ui.me.SettingActivity;
-import com.liaobo.im.ui.me.redpacket.WxPayBlance;
-import com.liaobo.im.ui.tool.SingleImagePreviewActivity;
-import com.liaobo.im.ui.tool.WebViewActivity;
-import com.liaobo.im.util.AsyncUtils;
 import com.liaobo.im.util.Constants;
-import com.liaobo.im.util.PreferenceUtils;
-import com.liaobo.im.util.SkinUtils;
-import com.liaobo.im.util.ToastUtil;
 import com.liaobo.im.util.UiUtils;
 import com.liaobo.im.util.Util;
-import com.liaobo.im.xuan.xuanhttplibrary.okhttp.HttpUtils;
-import com.liaobo.im.xuan.xuanhttplibrary.okhttp.callback.BaseCallback;
-import com.liaobo.im.xuan.xuanhttplibrary.okhttp.result.ObjectResult;
 import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
 import com.tencent.mm.opensdk.modelmsg.WXMediaMessage;
 import com.tencent.mm.opensdk.modelmsg.WXWebpageObject;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import okhttp3.Call;
-
 public class FindFragment extends EasyFragment implements View.OnClickListener {
 
     private TextView mTvTitle;
@@ -92,11 +54,11 @@ public class FindFragment extends EasyFragment implements View.OnClickListener {
         mTvTitle = (TextView) findViewById(R.id.tv_title_center);
         mTvTitle.setText(R.string.find);
 
-        findViewById(R.id.my_monry).setOnClickListener(this);
-        findViewById(R.id.my_space_rl).setOnClickListener(this);
-        findViewById(R.id.my_collection_rl).setOnClickListener(this);
+        findViewById(R.id.ll_my_monry).setOnClickListener(this);
+        findViewById(R.id.ll_my_space).setOnClickListener(this);
+        findViewById(R.id.ll_my_collection).setOnClickListener(this);
         findViewById(R.id.my_sign_rl).setOnClickListener(this);
-        findViewById(R.id.scanning).setOnClickListener(this);
+        findViewById(R.id.ll_scanning).setOnClickListener(this);
         findViewById(R.id.colleague_rl).setOnClickListener(this);
         findViewById(R.id.notice_rl).setOnClickListener(this);
         findViewById(R.id.label_rl).setOnClickListener(this);
@@ -110,15 +72,15 @@ public class FindFragment extends EasyFragment implements View.OnClickListener {
         }
         int id = v.getId();
         switch (id) {
-            case R.id.my_monry:
+            case R.id.ll_my_monry:
                 // 朋友圈
                 startActivity(new Intent(getActivity(), FriendsCircleFragmentActivity.class));
                 break;
-            case R.id.my_space_rl:
+            case R.id.ll_my_space:
                 // 动态广场
                 startActivity(new Intent(getActivity(), LifeCircleActivity.class));
                 break;
-            case R.id.my_collection_rl:
+            case R.id.ll_my_collection:
                 // 邀请微信好友
                 inviteFriends();
                 break;
@@ -126,7 +88,7 @@ public class FindFragment extends EasyFragment implements View.OnClickListener {
                 //附近人
                 startActivity(new Intent(getActivity(), NearPersonActivity.class));
                 break;
-            case R.id.scanning:
+            case R.id.ll_scanning:
                 // 扫一扫
                 MainActivity.requestQrCodeScan(getActivity());
                 break;

skWeiChatBaidu/src/main/java/com/liaobo/im/fragment/FriendFragment.java

@@ -336,7 +336,7 @@ public class FriendFragment extends EasyFragment {
                 mMessagePopupWindow.dismiss();
                 startActivity(new Intent(getActivity(), UserSearchActivity.class));
                 break;
-            case R.id.scanning:
+            case R.id.ll_scanning:
                 // 扫一扫
                 mMessagePopupWindow.dismiss();
                 MainActivity.requestQrCodeScan(getActivity());

skWeiChatBaidu/src/main/java/com/liaobo/im/ui/me/redpacket/RedListActivity.java

@@ -36,7 +36,7 @@ import okhttp3.Call;
  * 红包记录界面Activity
  * Created by 魏正旺 on 2016/9/23.
  */
-public class RedListActivity extends BaseActivity  {
+public class RedListActivity extends BaseActivity {
 
     // 数据格式，保留两位小数
     DecimalFormat df;
@@ -50,7 +50,7 @@ public class RedListActivity extends BaseActivity  {
     // 表示发出的还是接受的红包list  0代表收到  1代表发出
     private int adapterType;
     // 两个listview数据加载的页数
-    private int mPageIndex =1;
+    private int mPageIndex = 0;
     private RedListItemAdapter redListItemAdapter;
     private SmartRefreshLayout smartRefreshLayout;
     private ListView mRedPacketListView;
@@ -63,15 +63,15 @@ public class RedListActivity extends BaseActivity  {
         getSupportActionBar().hide();
         findViewById(R.id.iv_title_left).setOnClickListener(view -> finish());
         TextView tvTitle = findViewById(R.id.tv_title_center);
-        adapterType = getIntent().getIntExtra(ADAPTER_TYPE,0);
-        if (adapterType==0){
+        adapterType = getIntent().getIntExtra(ADAPTER_TYPE, 0);
+        if (adapterType == 0) {
             redListItemAdapter = new RedListItemAdapter<>();
             tvTitle.setText(InternationalizationHelper.getString("PACKETS_RECEIVED"));
 
-        }else if (adapterType ==1){
+        } else if (adapterType == 1) {
             redListItemAdapter = new RedListItemAdapter<RedSendRedItemEntry>();
             tvTitle.setText(InternationalizationHelper.getString("ENVELOPES_ISSUED"));
-        }else {
+        } else {
             tvTitle.setText(R.string.view_auto_get_red_packet_title);
             redListItemAdapter = new RedListItemAdapter<>();
         }
@@ -96,13 +96,13 @@ public class RedListActivity extends BaseActivity  {
         smartRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
             @Override
             public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
-                getData(mPageIndex+1);
+                getData(mPageIndex + 1);
             }
 
             @Override
             public void onRefresh(@NonNull RefreshLayout refreshLayout) {
                 smartRefreshLayout.setEnableLoadMore(true);
-                mPageIndex =1;
+                mPageIndex = 0;
                 getData(mPageIndex);
 
             }
@@ -112,11 +112,11 @@ public class RedListActivity extends BaseActivity  {
 
 
     private void getData(int pageIndex) {
-        if (adapterType==0){
+        if (adapterType == 0) {
             loadReceiveRedPacket(pageIndex);
-        }else if (adapterType ==1){
+        } else if (adapterType == 1) {
             loadSendRed(pageIndex);
-        }else {
+        } else {
             loadAutoGetAssignRedReceiveList(pageIndex);
         }
     }
@@ -126,7 +126,7 @@ public class RedListActivity extends BaseActivity  {
         params.put("access_token", coreManager.getSelfStatus().accessToken);
         params.put("pageIndex", pageIndex + "");
         params.put("pageSize", "25");
-        params.put("secret","");
+        params.put("secret", "");
 
         HttpUtils.get().url(coreManager.getConfig().SEND_REDPACKET_LIST_GET)
                 .params(params)
@@ -137,18 +137,18 @@ public class RedListActivity extends BaseActivity  {
                     public void onResponse(ObjectResult<RedPacketSendBean> result) {
                         smartRefreshLayout.finishLoadMore();
                         smartRefreshLayout.finishRefresh();
-                        if (result!=null && result.getData()!=null && result.getData().getList()!=null && result.getData().getList().size() > 0) {
-                          List<RedSendRedItemEntry> dataList = result.getData().getList();
+                        if (result != null && result.getData() != null && result.getData().getList() != null && result.getData().getList().size() > 0) {
+                            List<RedSendRedItemEntry> dataList = result.getData().getList();
 
-                            if (mPageIndex==1){
+                            if (mPageIndex == 0) {
                                 redListItemAdapter.setData(dataList);
 
-                            }else {
+                            } else {
                                 redListItemAdapter.addData(dataList);
                             }
                             redListItemAdapter.notifyDataSetChanged();
                             mPageIndex++;
-                        }else {
+                        } else {
                             smartRefreshLayout.setEnableLoadMore(false);
                         }
 
@@ -178,15 +178,15 @@ public class RedListActivity extends BaseActivity  {
                         smartRefreshLayout.finishLoadMore();
                         smartRefreshLayout.finishRefresh();
 
-                        if (result!=null && result.getData()!=null&& result.getData().list!=null && result.getData().list.size() > 0) {
+                        if (result != null && result.getData() != null && result.getData().list != null && result.getData().list.size() > 0) {
                             List<BaseRedPacketItemEntity> dataList = result.getData().list;
-                            if (mPageIndex==1){
+                            if (mPageIndex == 0) {
                                 redListItemAdapter.setData(dataList);
-                            }else {
+                            } else {
                                 redListItemAdapter.addData(dataList);
                             }
                             mPageIndex++;
-                        }else {
+                        } else {
                             smartRefreshLayout.setEnableLoadMore(false);
                         }
 
@@ -217,15 +217,15 @@ public class RedListActivity extends BaseActivity  {
                         smartRefreshLayout.finishLoadMore();
                         smartRefreshLayout.finishRefresh();
 
-                        if (result!=null && result.getData()!=null&& result.getData().list!=null && result.getData().list.size() > 0) {
+                        if (result != null && result.getData() != null && result.getData().list != null && result.getData().list.size() > 0) {
                             List<BaseRedPacketItemEntity> dataList = result.getData().list;
-                            if (mPageIndex==1){
+                            if (mPageIndex == 0) {
                                 redListItemAdapter.setData(dataList);
-                            }else {
+                            } else {
                                 redListItemAdapter.addData(dataList);
                             }
                             mPageIndex++;
-                        }else {
+                        } else {
                             smartRefreshLayout.setEnableLoadMore(false);
                         }
 
@@ -248,7 +248,7 @@ public class RedListActivity extends BaseActivity  {
 
         @Override
         public int getCount() {
-            return mList ==null?0:mList.size();
+            return mList == null ? 0 : mList.size();
         }
 
         @Override
@@ -256,19 +256,21 @@ public class RedListActivity extends BaseActivity  {
             return null;
         }
 
-        public void addData(List<T> list){
-            if (list!=null){
+        public void addData(List<T> list) {
+            if (list != null) {
                 mList.addAll(list);
                 notifyDataSetChanged();
             }
         }
-        public void addData(T entity){
+
+        public void addData(T entity) {
             mList.add(entity);
             notifyDataSetChanged();
         }
-        public void setData(List<T> list){
-            if (list!=null){
-                mList= list;
+
+        public void setData(List<T> list) {
+            if (list != null) {
+                mList = list;
                 notifyDataSetChanged();
             }
         }
@@ -295,14 +297,14 @@ public class RedListActivity extends BaseActivity  {
                 redViewHolder = (RedViewHolder) convertView.getTag();
             }
 
-            if (adapterType == 0 ||adapterType==2) {
+            if (adapterType == 0 || adapterType == 2) {
                 long lcc_time = mList.get(position).time;
                 String StrTime = sdf.format(new Date(lcc_time * 1000L));
                 redViewHolder.userNameTv.setText(mList.get(position).sendName);
                 redViewHolder.timeTv.setText(StrTime);
                 redViewHolder.moneyTv.setText(df.format(mList.get(position).money) + InternationalizationHelper.getString("YUAN"));
             } else if (adapterType == 1) {
-                int type = ((RedSendRedItemEntry)mList.get(position)).type;
+                int type = ((RedSendRedItemEntry) mList.get(position)).type;
                 switch (type) {
                     case 1: {
                         //                        redViewHolder.userNameTv.setText("普通红包");
@@ -322,7 +324,7 @@ public class RedListActivity extends BaseActivity  {
                     }
                     break;
                 }
-                long lcc_time = ((RedSendRedItemEntry)mList.get(position)).sendTime;
+                long lcc_time = ((RedSendRedItemEntry) mList.get(position)).sendTime;
                 String StrTime = sdf.format(new Date(lcc_time * 1000L));
                 redViewHolder.timeTv.setText(StrTime);
                 redViewHolder.moneyTv.setText(df.format(mList.get(position).money) + InternationalizationHelper.getString("YUAN"));

skWeiChatBaidu/src/main/res/drawable/shape_bg_white_radius_12.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="12dp"/>
+    <solid android:color="@color/white"/>
+
+</shape>

skWeiChatBaidu/src/main/res/layout/fragment_find.xml

@@ -3,161 +3,241 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/normal_bg"
+    android:background="#EAEAEA"
     android:orientation="vertical">
 
     <include layout="@layout/a_view_actionbar" />
 
-    <ScrollView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="8dp"
+        android:background="@drawable/shape_bg_white_radius_12"
+        android:orientation="horizontal"
+        android:paddingTop="22dp"
+        android:paddingBottom="22dp"
+        android:weightSum="4">
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:id="@+id/ll_my_monry"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
             android:orientation="vertical">
 
-            <RelativeLayout
-                android:id="@+id/my_monry"
-                style="@style/IMTbleLine_UP"
-                android:background="@color/white"
-                android:visibility="visible">
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/icon_friend_circle" />
 
-                <com.liaobo.im.view.LightImageView
-                    android:layout_width="21dp"
-                    android:layout_height="21dp"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/icon_friend_circle"
-                    app:srcLight="@drawable/icon_friend_circle" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="@string/moments"
+                android:textColor="@color/gray"
+                android:textSize="12sp" />
 
-                <TextView
-                    style="@style/IMTbleLine_TextName"
-                    android:layout_centerVertical="true"
-                    android:text="@string/moments" />
+        </LinearLayout>
 
-                <ImageView
-                    style="@style/IMTbleLine_ArrowImg.Me"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/me_chevron_right"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
+        <LinearLayout
+            android:id="@+id/ll_my_space"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
 
-            <RelativeLayout
-                android:id="@+id/my_space_rl"
-                style="@style/IMTbleLine_UP"
-                android:layout_marginTop="10dp"
-                android:background="@color/white"
-                android:visibility="visible">
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/my_set_speace" />
 
-                <ImageView
-                    style="@style/IMTbleLine_ArrowImg.Me"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/me_chevron_right"
-                    android:contentDescription="@string/app_name" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="@string/dynamic_square"
+                android:textColor="@color/gray"
+                android:textSize="12sp" />
 
-                <com.liaobo.im.view.LightImageView
-                    android:layout_width="21dp"
-                    android:layout_height="21dp"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/my_set_speace"
-                    app:srcLight="@drawable/my_set_speace_light" />
+        </LinearLayout>
 
-                <TextView
-                    android:id="@+id/MySky"
-                    style="@style/IMTbleLine_TextName"
-                    android:text="@string/dynamic_square" />
-            </RelativeLayout>
+        <LinearLayout
+            android:id="@+id/ll_my_collection"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
 
-            <RelativeLayout
-                android:id="@+id/my_collection_rl"
-                style="@style/IMTbleLine_UP"
-                android:background="@color/white">
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/icon_yaoyy" />
 
-                <com.liaobo.im.view.LightImageView
-                    android:layout_width="21dp"
-                    android:layout_height="21dp"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/icon_yaoyy"
-                    app:srcLight="@drawable/icon_yaoyy" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="@string/friend_invite"
+                android:textColor="@color/gray"
+                android:textSize="12sp" />
 
-                <TextView
-                    android:id="@+id/my_collection_tv"
-                    style="@style/IMTbleLine_TextName"
-                    android:layout_centerVertical="true"
-                    android:text="@string/invite_wx_friends" />
+        </LinearLayout>
 
-                <ImageView
-                    style="@style/IMTbleLine_ArrowImg.Me"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/me_chevron_right"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
+        <LinearLayout
+            android:id="@+id/ll_scanning"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
 
-            <RelativeLayout
-                android:id="@+id/scanning"
-                style="@style/IMTbleLine_UP"
-                android:background="@drawable/list_selector_background_ripple">
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/messaeg_scnning" />
 
-                <android.support.v7.widget.AppCompatImageView
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/messaeg_scnning" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="@string/scanning"
+                android:textColor="@color/gray"
+                android:textSize="12sp" />
 
-                <TextView
-                    style="@style/IMTbleLine_TextName"
-                    android:layout_centerVertical="true"
-                    android:text="@string/scanning" />
+        </LinearLayout>
 
-                <ImageView
-                    style="@style/IMTbleLine_ArrowImg.Me"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/me_chevron_right"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
+    </LinearLayout>
 
-            <RelativeLayout
-                android:id="@+id/label_rl"
-                style="@style/IMTbleLine_UP"
-                android:background="@color/white">
 
-                <com.liaobo.im.view.CircleImageView
-                    android:id="@+id/label"
-                    android:layout_width="21dp"
-                    android:layout_height="21dp"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/label" />
 
-                <TextView
-                    style="@style/IMTbleLine_TextName"
-                    android:layout_centerVertical="true"
-                    android:text="@string/tag" />
+    <LinearLayout
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="8dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        android:background="@drawable/shape_bg_white_radius_12"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/colleague_rl"
+            style="@style/IMTbleLine_UP"
+            android:background="@color/white">
+
+            <ImageView
+                android:id="@+id/colleague_iv"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_centerVertical="true"
+                android:src="@drawable/im_colleague" />
+
+            <TextView
+                style="@style/IMTbleLine_TextName"
+                android:layout_centerVertical="true"
+                android:text="@string/my_colleague" />
+
+            <ImageView
+                style="@style/IMTbleLine_ArrowImg.Me"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/me_chevron_right"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:background="#fafafa"
+            android:layout_height="1px"/>
+        <RelativeLayout
+            android:id="@+id/label_rl"
+            style="@style/IMTbleLine_UP"
+            android:background="@color/white">
+
+            <ImageView
+                android:id="@+id/label"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_centerVertical="true"
+                android:src="@drawable/label" />
+
+            <TextView
+                style="@style/IMTbleLine_TextName"
+                android:layout_centerVertical="true"
+                android:text="@string/tag" />
+
+            <ImageView
+                style="@style/IMTbleLine_ArrowImg.Me"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/me_chevron_right"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:background="#fafafa"
+            android:layout_height="1px"/>
 
-            </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/notice_rl"
+            style="@style/IMTbleLine_UP"
+            android:background="@color/white">
+
+            <ImageView
+                android:id="@+id/notice_number"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_centerVertical="true"
+                android:src="@drawable/ic_notice" />
+
+            <TextView
+                style="@style/IMTbleLine_TextName"
+                android:layout_centerVertical="true"
+                android:text="@string/service_number" />
+
+            <ImageView
+                style="@style/IMTbleLine_ArrowImg.Me"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/me_chevron_right"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+
+
+
+        <LinearLayout
+            android:id="@+id/ll_more"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <RelativeLayout
-                android:id="@+id/colleague_rl"
+                android:id="@+id/meeting_rl"
                 style="@style/IMTbleLine_UP"
-                android:background="@color/white">
+                android:background="@color/white"
+                android:visibility="visible">
 
-                <com.liaobo.im.view.CircleImageView
-                    android:id="@+id/colleague_iv"
+                <com.liaobo.im.view.LightImageView
                     android:layout_width="21dp"
                     android:layout_height="21dp"
+                    android:layout_alignParentStart="true"
                     android:layout_centerVertical="true"
-                    android:src="@drawable/im_colleague" />
+                    android:src="@drawable/my_meeting"
+                    app:srcLight="@drawable/my_meeting_light" />
 
                 <TextView
                     style="@style/IMTbleLine_TextName"
                     android:layout_centerVertical="true"
-                    android:text="@string/my_colleague" />
+                    android:text="@string/chat_video_conference" />
 
                 <ImageView
                     style="@style/IMTbleLine_ArrowImg.Me"
@@ -168,21 +248,23 @@
             </RelativeLayout>
 
             <RelativeLayout
-                android:id="@+id/notice_rl"
+                android:id="@+id/live_rl"
                 style="@style/IMTbleLine_UP"
-                android:background="@color/white">
+                android:background="@color/white"
+                android:visibility="visible">
 
-                <com.liaobo.im.view.CircleImageView
-                    android:id="@+id/notice_number"
+                <com.liaobo.im.view.LightImageView
                     android:layout_width="21dp"
                     android:layout_height="21dp"
+                    android:layout_alignParentStart="true"
                     android:layout_centerVertical="true"
-                    android:src="@drawable/ic_notice" />
+                    android:src="@drawable/my_live"
+                    app:srcLight="@drawable/my_live_light" />
 
                 <TextView
                     style="@style/IMTbleLine_TextName"
                     android:layout_centerVertical="true"
-                    android:text="@string/service_number" />
+                    android:text="@string/live_demo" />
 
                 <ImageView
                     style="@style/IMTbleLine_ArrowImg.Me"
@@ -193,24 +275,23 @@
             </RelativeLayout>
 
             <RelativeLayout
-                android:id="@+id/my_sign_rl"
-                style="@style/IMTbleLine_UP"
-                android:layout_marginTop="10dp"
-                android:background="@color/white">
+                android:id="@+id/douyin_rl"
+                style="@style/IMTbleLine"
+                android:background="@color/white"
+                android:visibility="gone">
 
                 <com.liaobo.im.view.LightImageView
                     android:layout_width="21dp"
                     android:layout_height="21dp"
                     android:layout_alignParentStart="true"
                     android:layout_centerVertical="true"
-                    android:src="@drawable/nearby_person"
-                    app:srcLight="@drawable/nearby_person" />
+                    android:src="@drawable/my_douyin"
+                    app:srcLight="@drawable/my_douyin_light" />
 
                 <TextView
-                    android:id="@+id/my_sign_tv"
                     style="@style/IMTbleLine_TextName"
                     android:layout_centerVertical="true"
-                    android:text="@string/near_person" />
+                    android:text="@string/douyin" />
 
                 <ImageView
                     style="@style/IMTbleLine_ArrowImg.Me"
@@ -219,96 +300,45 @@
                     android:background="@drawable/me_chevron_right"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
-
-            <LinearLayout
-                android:id="@+id/ll_more"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:orientation="vertical"
-                android:visibility="gone">
-
-                <RelativeLayout
-                    android:id="@+id/meeting_rl"
-                    style="@style/IMTbleLine_UP"
-                    android:background="@color/white"
-                    android:visibility="visible">
-
-                    <com.liaobo.im.view.LightImageView
-                        android:layout_width="21dp"
-                        android:layout_height="21dp"
-                        android:layout_alignParentStart="true"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/my_meeting"
-                        app:srcLight="@drawable/my_meeting_light" />
-
-                    <TextView
-                        style="@style/IMTbleLine_TextName"
-                        android:layout_centerVertical="true"
-                        android:text="@string/chat_video_conference" />
-
-                    <ImageView
-                        style="@style/IMTbleLine_ArrowImg.Me"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:background="@drawable/me_chevron_right"
-                        android:contentDescription="@string/app_name" />
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/live_rl"
-                    style="@style/IMTbleLine_UP"
-                    android:background="@color/white"
-                    android:visibility="visible">
-
-                    <com.liaobo.im.view.LightImageView
-                        android:layout_width="21dp"
-                        android:layout_height="21dp"
-                        android:layout_alignParentStart="true"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/my_live"
-                        app:srcLight="@drawable/my_live_light" />
-
-                    <TextView
-                        style="@style/IMTbleLine_TextName"
-                        android:layout_centerVertical="true"
-                        android:text="@string/live_demo" />
-
-                    <ImageView
-                        style="@style/IMTbleLine_ArrowImg.Me"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:background="@drawable/me_chevron_right"
-                        android:contentDescription="@string/app_name" />
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/douyin_rl"
-                    style="@style/IMTbleLine"
-                    android:background="@color/white"
-                    android:visibility="gone">
-
-                    <com.liaobo.im.view.LightImageView
-                        android:layout_width="21dp"
-                        android:layout_height="21dp"
-                        android:layout_alignParentStart="true"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/my_douyin"
-                        app:srcLight="@drawable/my_douyin_light" />
-
-                    <TextView
-                        style="@style/IMTbleLine_TextName"
-                        android:layout_centerVertical="true"
-                        android:text="@string/douyin" />
-
-                    <ImageView
-                        style="@style/IMTbleLine_ArrowImg.Me"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:background="@drawable/me_chevron_right"
-                        android:contentDescription="@string/app_name" />
-                </RelativeLayout>
-            </LinearLayout>
         </LinearLayout>
-    </ScrollView>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="8dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        android:background="@drawable/shape_bg_white_radius_12"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <RelativeLayout
+            android:id="@+id/my_sign_rl"
+            style="@style/IMTbleLine_UP"
+
+            android:background="@color/white">
+
+            <ImageView
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:src="@drawable/nearby_person"/>
+
+            <TextView
+                android:id="@+id/my_sign_tv"
+                style="@style/IMTbleLine_TextName"
+                android:layout_centerVertical="true"
+                android:text="@string/near_person" />
+
+            <ImageView
+                style="@style/IMTbleLine_ArrowImg.Me"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/me_chevron_right"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+    </LinearLayout>
+
 </LinearLayout>

skWeiChatBaidu/src/main/res/layout/popu_message.xml

@@ -122,7 +122,7 @@
     </LinearLayout>
 
     <LinearLayout
-    android:id="@+id/scanning"
+    android:id="@+id/ll_scanning"
     android:layout_width="140dp"
     android:layout_height="40dp"
     android:background="@drawable/list_selector_background_ripple"

skWeiChatBaidu/src/main/res/values-en/strings.xml

@@ -340,7 +340,7 @@
     <string name="moments">Moments</string>
     <string name="my_moments">Moments</string>
     <string name="dynamic_square">Dynamic Square</string>
-    <string name="invite_wx_friends">Invite WeChat friends</string>
+    <string name="friend_invite">Invite friends</string>
 
     <string name="add_friends">Add Friends</string>
     <string name="scanning">Scanning</string>

skWeiChatBaidu/src/main/res/values-zh-rHK/strings.xml

@@ -605,7 +605,7 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ`¬!"£$%^*()~=#{}[];':,./?/*-_+<>@&#03
     <string name="moments">朋友圈</string>
     <string name="my_moments">我的動態</string>
     <string name="dynamic_square">動態廣場</string>
-    <string name="invite_wx_friends">邀請微信好友</string>
+    <string name="friend_invite">邀請好友</string>
 
     <string name="create_group">發起群聊</string>
     <string name="add_friends">添加朋友</string>

skWeiChatBaidu/src/main/res/values-zh-rTW/strings.xml

@@ -603,7 +603,7 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ`¬!"£$%^*()~=#{}[];':,./?/*-_+<>@&#03
     <string name="moments">朋友圈</string>
     <string name="my_moments">我的動態</string>
     <string name="dynamic_square">動態廣場</string>
-    <string name="invite_wx_friends">邀請微信好友</string>
+    <string name="friend_invite">邀請好友</string>
 
     <string name="create_group">發起群聊</string>
     <string name="add_friends">添加朋友</string>

skWeiChatBaidu/src/main/res/values/strings.xml

@@ -579,10 +579,10 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ`¬!"£$%^*()~=#{}[];':,./?/*-_+<>@&#03
     <string name="reselection">重选</string>
 
     <string name="prompt_title">提示</string>
-    <string name="moments">朋友圈</string>
+    <string name="moments">我的圈子</string>
     <string name="my_moments">我的动态</string>
     <string name="dynamic_square">动态广场</string>
-    <string name="invite_wx_friends">邀请微信好友</string>
+    <string name="friend_invite">邀请好友</string>
 
     <string name="create_group">发起群聊</string>
     <string name="add_friends">添加朋友</string>

skWeiChatBaidu/src/main/res/values/styles.xml

@@ -207,7 +207,7 @@
 
     <style name="IMTbleLine_TextName" parent="IMTbleLine_TextValue">
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_marginStart">40dp</item>
+        <item name="android:layout_marginStart">54dp</item>
         <item name="android:textSize">15sp</item>
     </style>