Selaa lähdekoodia

朋友圈移动到我的界面、

Bitliker 9 vuotta sitten
vanhempi
commit
fd7a851942
32 muutettua tiedostoa jossa 218 lisäystä ja 263 poistoa
  1. 4 5
      WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SelectBean.java
  2. 6 22
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java
  3. 15 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectActivity.java
  4. 4 7
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/LinksManFragment.java
  5. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java
  6. 1 29
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java
  7. 2 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/ViewUtil.java
  8. 23 5
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java
  9. BIN
      WeiChat/src/main/res/drawable-hdpi/set_fans_u.png
  10. BIN
      WeiChat/src/main/res/drawable-xhdpi/set_fans_u.png
  11. BIN
      WeiChat/src/main/res/drawable-xhdpi/set_list_next.png
  12. BIN
      WeiChat/src/main/res/drawable-xxhdpi/oa_add.png
  13. BIN
      WeiChat/src/main/res/drawable-xxhdpi/set_fans_u.png
  14. BIN
      WeiChat/src/main/res/drawable-xxhdpi/set_list_next.png
  15. 2 2
      WeiChat/src/main/res/layout/act_extra_work2.xml
  16. 3 3
      WeiChat/src/main/res/layout/activity_about.xml
  17. 13 13
      WeiChat/src/main/res/layout/activity_base_info.xml
  18. 6 6
      WeiChat/src/main/res/layout/activity_contact_man_add.xml
  19. 12 12
      WeiChat/src/main/res/layout/activity_room_info.xml
  20. 2 2
      WeiChat/src/main/res/layout/activity_send_shuoshuo.xml
  21. 6 6
      WeiChat/src/main/res/layout/activity_setting.xml
  22. 1 1
      WeiChat/src/main/res/layout/activity_signin_set.xml
  23. 1 1
      WeiChat/src/main/res/layout/dy_listview_items_demo_style2.xml
  24. 7 7
      WeiChat/src/main/res/layout/form_travel_main2.xml
  25. 78 65
      WeiChat/src/main/res/layout/fragment_me.xml
  26. 5 51
      WeiChat/src/main/res/layout/fragment_works.xml
  27. 3 3
      WeiChat/src/main/res/layout/from_extra_leave2.xml
  28. 3 3
      WeiChat/src/main/res/layout/from_leave_view2.xml
  29. 7 7
      WeiChat/src/main/res/layout/headview_cantacts_menus.xml
  30. 1 1
      WeiChat/src/main/res/menu/menu_nearby.xml
  31. 1 0
      WeiChat/src/main/res/values/strings.xml
  32. 11 8
      WeiChat/src/main/res/values/styles.xml

+ 4 - 5
WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SelectBean.java

@@ -6,12 +6,11 @@ import android.os.Parcelable;
 /**
  * Created by pengminggong on 2016/9/29.
  */
-
 public class SelectBean<T> implements Parcelable {
-    private String name;
-    private boolean isClick = false;
-    private T object;
-    private String json;
+    private String name;//选项索引
+    private boolean isClick = false;//是否已被选择(默认非选择)
+    private T object;//选择的内容详细信息 T
+    private String json;//方式时候返回选择的jsonObject
 
     public SelectBean() {
     }

+ 6 - 22
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -225,20 +225,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private AppConfig config;
     private String mLoginUserId;
 
-    public void chea() {
-
-    }
-
-    public void changeRedZone(boolean b) {
-        if (b) {
-            unWorkReadTV.setVisibility(View.VISIBLE);
-            if (mWorksFragment != null)
-                mWorksFragment.setVISIBLE();
-        } else {
-            unWorkReadTV.setVisibility(View.GONE);
-        }
-    }
-
     private void requestMyBusiness() {
         if (config == null) {
             config = MyApplication.getInstance().getConfig();
@@ -248,17 +234,16 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         }
         HashMap<String, String> params = new HashMap<String, String>();
         params.put("access_token", MyApplication.getInstance().mAccessToken);
-        final BaseActivity mContext = MainActivity.this;
         StringJsonArrayRequest<CircleMessage> request = new StringJsonArrayRequest<CircleMessage>(
                 config.MSG_LIST, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
-                ToastUtil.showErrorNet(mContext);
+                ToastUtil.showErrorNet(ct);
             }
         }, new StringJsonArrayRequest.Listener<CircleMessage>() {
             @Override
             public void onResponse(ArrayResult<CircleMessage> result) {
-                boolean success = Result.defaultParser(mContext, result, false);
+                boolean success = Result.defaultParser(ct, result, false);
                 if (success) {
                     List<CircleMessage> datas = result.getData();
                     if (datas != null && datas.size() > 0) { // 没有更多数据
@@ -268,14 +253,13 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                         if (newTime > oldTime) {//当有新消息
                             if (!data.getUserId().equals(MyApplication.getInstance().mLoginUser.getUserId())) {
                                 unWorkReadTV.setVisibility(View.VISIBLE);
-                                if (mWorksFragment != null)
-                                    mWorksFragment.setVISIBLE();
+                                if (mMeFragment != null)
+                                    mMeFragment.setChangerRemain(false);
                                 timeMin = newTime;
                                 isUnReadWork = true;
                             } else {
-                                PreferenceUtils.putLong(mContext, TIME_MAIN, newTime); //获取以前时间
+                                PreferenceUtils.putLong(ct, TIME_MAIN, newTime); //获取以前时间
                             }
-
                         } else {
                             unWorkReadTV.setVisibility(View.GONE);
                             isUnReadWork = false;
@@ -617,7 +601,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             mTabRadioGroup.check(R.id.main_tab_one);
         }
         mMsgUnReadTv = (TextView) findViewById(R.id.main_tab_one_tv);
-        unWorkReadTV = (TextView) findViewById(R.id.main_tab_three_tv);
+        unWorkReadTV = (TextView) findViewById(R.id.main_tab_five_tv);
     }
 
     private void changeFragment(Fragment addFragment, String tag) {

+ 15 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectActivity.java

@@ -32,9 +32,23 @@ import java.util.LinkedHashMap;
 import java.util.List;
 
 /**
+ * 通用列表界面
+ * 1.type 类型(1.网络请求  2.本地数据)(int)
+ * 2.title 标题(String)
+ * 3.reid  标题主题(int)
+ * 4.isSingle  是否单选(默认单选)(boolean)
+ * <p>
+ * location
+ * data   List<SelectBean>  供选择的数组对象
+ * <p>
+ * net
+ * action 网址(String)
+ * param  参数(map)
+ * key 请求网络后取的数组key(String)
+ * showKey 请求网络后显示选择索引的key,在key的数组的对象中(String)
+ * <p>
  * Created by pengminggong on 2016/9/29.
  */
-
 public class SelectActivity extends BaseActivity {
     private ListView list;//列表控件
     private ListAdapter adapter;
@@ -97,7 +111,6 @@ public class SelectActivity extends BaseActivity {
                         }
                     }
                 } else {//当返回的没有不需要key值时候
-
                 }
             } else {
                 emptyLayout.showEmpty();

+ 4 - 7
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/LinksManFragment.java

@@ -298,14 +298,11 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
             @Override
             public void afterTextChanged(Editable editable) {
                 sortFrientSeach.clear();
-                String filter = search_edit.getText().toString().trim().toUpperCase();
+                String filter = editable.toString().trim();
                 if (filter.length() > 0) {
-                    for (int i = 0; i < mSortFriends.size(); i++) {
-                        BaseSortModel<Friend> mode = mSortFriends.get(i);
-                        // 获取筛选的数据
-                        if (TextUtils.isEmpty(filter) || mode.getSimpleSpell().startsWith(filter) || mode.getWholeSpell().startsWith(filter)
-                                || mode.getBean().getShowName().startsWith(filter)) {
-                            sortFrientSeach.add(mode);
+                    for (BaseSortModel<Friend> e : mSortFriends) {
+                        if (!StringUtils.isEmpty(e.getBean().getShowName()) && com.xzjmyk.pm.activity.ui.erp.util.StringUtils.isInclude(e.getBean().getShowName(), filter)) {
+                            sortFrientSeach.add(e);
                         }
                     }
                     mAdapter.setData(sortFrientSeach);

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -356,7 +356,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
 
     private boolean isPlay() {
         if (!CommonUtil.isNetWorkConnected(ct)) {
-            Crouton.makeText(ct, "当前网络不可用,请检查网络连接");
+            Crouton.makeText(ct, ct.getString(R.string.networks_out));
             return false;
         }
         if (isSignining) {

+ 1 - 29
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -6,25 +6,20 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConfig;
-import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.XutilsFragment;
-import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.FastVolley;
 
@@ -38,14 +33,10 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
     private String TAG = "WorksFragment";
     private Context ct;
     private LayoutInflater mInflater;
-    @ViewInject(R.id.iv_remain)
-    private ImageView iv_remain;
     @ViewInject(R.id.setting_rl)
     private RelativeLayout setting_rl;
     @ViewInject(R.id.rl_uas_sys)
     private RelativeLayout rl_uas_sys;
-    @ViewInject(R.id.my_friend_rl)
-    private RelativeLayout my_friend_rl;
     @ViewInject(R.id.my_data_rl)
     private RelativeLayout my_data_rl;
     @ViewInject(R.id.goods_find)
@@ -75,21 +66,14 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         }
     }
 
-    public void setVISIBLE() {
-        iv_remain.setVisibility(View.VISIBLE);
-    }
 
     private void initView() {
         rl_uas_sys.setOnClickListener(this);
         setting_rl.setOnClickListener(this);
-        my_friend_rl.setOnClickListener(this);
         my_data_rl.setOnClickListener(this);
         my_client_rl.setOnClickListener(this);
         goods_find.setOnClickListener(this);
-        if (MainActivity.isUnReadWork)
-            iv_remain.setVisibility(View.VISIBLE);
-        else
-            iv_remain.setVisibility(View.GONE);
+
         
     }
 
@@ -130,18 +114,6 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                     ToastUtil.showToast(getActivity(), "抱歉,该功能未启用!");
                 }
                 break;
-            case R.id.my_friend_rl:
-                iv_remain.setVisibility(View.GONE);
-                MainActivity.isUnReadWork = false;
-                Intent intent = new Intent(getActivity(), BusinessCircleActivity.class);
-                intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_MY_BUSINESS);
-                if (MainActivity.timeMin != -1 && MainActivity.timeMin != PreferenceUtils.getLong(getActivity(), MainActivity.TIME_MAIN)) {
-                    PreferenceUtils.putLong(getActivity(), MainActivity.TIME_MAIN, MainActivity.timeMin); //获取以前时间
-                } else {
-
-                }
-                startActivity(intent);
-                break;
             case R.id.my_data_rl:
                 ToastUtil.showToast(getActivity(), "抱歉,该功能尚未完善");
                 break;

+ 2 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/ViewUtil.java

@@ -9,6 +9,7 @@ import android.util.Log;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
 import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpUtil;
 
 import java.util.HashMap;
@@ -166,7 +167,7 @@ public class ViewUtil {
                 } else {
                     Bundle bundle = new Bundle();
                     Message message = new Message();
-                    bundle.putString("result", "网络未连接!");
+                    bundle.putString("result", MyApplication.getInstance().getString(R.string.networks_out));
                     message.setData(bundle);
                     message.what = Constants.APP_SOCKETIMEOUTEXCEPTION;
                     handler.sendMessage(message);

+ 23 - 5
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -34,8 +34,9 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
-import com.xzjmyk.pm.activity.ui.cardcast.CardcastActivity;
+import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.BaseInfoActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Master;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -46,6 +47,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.MasterDialog;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.util.HashMap;
@@ -53,6 +55,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.xzjmyk.pm.activity.R.id.my_friend_rl;
+
 
 public class MeFragment extends EasyFragment implements View.OnClickListener {
 
@@ -63,6 +67,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
 
     @ViewInject(R.id.company_tv)
     private TextView company_tv;
+    @ViewInject(R.id.iv_remain)
+    private ImageView iv_remain;
     @ViewInject(R.id.master_tv)
     private TextView master_tv;
 
@@ -210,7 +216,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private void initView() {
         ct = getActivity();
         findViewById(R.id.my_data_rl).setOnClickListener(this);
-        findViewById(R.id.my_friend_rl).setOnClickListener(this);
+        findViewById(my_friend_rl).setOnClickListener(this);
         findViewById(R.id.my_space_rl).setOnClickListener(this);
         findViewById(R.id.local_video_rl).setOnClickListener(this);
         findViewById(R.id.setting_rl).setOnClickListener(this);
@@ -292,7 +298,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         switch (id) {
             case R.id.rl_company_change:
                 com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.LoginTask(MyApplication.getInstance().mLoginUser.getTelephone()
-                        , CommonUtil.getSharedPreferences(ct,"user_password"), ct);
+                        , CommonUtil.getSharedPreferences(ct, "user_password"), ct);
                 break;
             case R.id.info_rl://个人资料
                 startActivity(new Intent(getActivity(), BaseInfoActivity.class));
@@ -303,8 +309,16 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             case R.id.my_data_rl:// 我的资料
                 startActivityForResult(new Intent(getActivity(), BasicInfoEditActivity.class), 1);
                 break;
-            case R.id.my_friend_rl:// 我的朋友
-                startActivity(new Intent(getActivity(), CardcastActivity.class));
+            case my_friend_rl://我的朋友圈
+                setChangerRemain(true);
+                MainActivity.isUnReadWork = false;
+                Intent intent = new Intent(getActivity(), BusinessCircleActivity.class);
+                intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_MY_BUSINESS);
+                if (MainActivity.timeMin != -1 && MainActivity.timeMin != PreferenceUtils.getLong(getActivity(), MainActivity.TIME_MAIN)) {
+                    PreferenceUtils.putLong(getActivity(), MainActivity.TIME_MAIN, MainActivity.timeMin); //获取以前时间
+                } else {
+                }
+                startActivity(intent);
                 break;
             case R.id.my_space_rl:// 我的空间
 //                Intent intent = intent;
@@ -371,6 +385,10 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         }
     }
 
+    public void setChangerRemain(boolean isRead) {//isRead:true 已阅读   false: 未阅读
+        iv_remain.setVisibility(isRead ? View.GONE : View.VISIBLE);
+    }
+
     //获取中文账套
     public void getChinaMaster() {
         String url = Constants.getAppBaseUrl(ct) + "mobile/getAllMasters.action";

BIN
WeiChat/src/main/res/drawable-hdpi/set_fans_u.png


BIN
WeiChat/src/main/res/drawable-xhdpi/set_fans_u.png


BIN
WeiChat/src/main/res/drawable-xhdpi/set_list_next.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/oa_add.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/set_fans_u.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/set_list_next.png


+ 2 - 2
WeiChat/src/main/res/layout/act_extra_work2.xml

@@ -56,7 +56,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="0.26"
-                        android:background="@drawable/set_list_next"
+                        android:background="@drawable/oa_next"
                         android:contentDescription="@string/app_name" />
                 </RelativeLayout>
 
@@ -93,7 +93,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="0.26"
-                        android:background="@drawable/set_list_next"
+                        android:background="@drawable/oa_next"
                         android:contentDescription="@string/app_name" />
                 </RelativeLayout>
 

+ 3 - 3
WeiChat/src/main/res/layout/activity_about.xml

@@ -85,7 +85,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
         <View
@@ -118,7 +118,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
         <View
@@ -151,7 +151,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
         <View

+ 13 - 13
WeiChat/src/main/res/layout/activity_base_info.xml

@@ -31,7 +31,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -63,7 +63,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -94,7 +94,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name"
                 android:id="@+id/imageView" />
 
@@ -145,7 +145,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -182,7 +182,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -220,7 +220,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -257,7 +257,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name"
                 android:layout_alignParentEnd="true" />
         </RelativeLayout>
@@ -294,7 +294,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -332,7 +332,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -363,7 +363,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name"
                 android:visibility="gone"/>
         </RelativeLayout>
@@ -400,7 +400,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name"
                 android:id="@+id/iv_tel"
                 android:visibility="gone"/>
@@ -438,7 +438,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name"
                 android:id="@+id/iv_depart"
                 android:visibility="gone"/>
@@ -477,7 +477,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name"
                 android:id="@+id/iv_position"
                 android:visibility="gone"/>

+ 6 - 6
WeiChat/src/main/res/layout/activity_contact_man_add.xml

@@ -75,7 +75,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -113,7 +113,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -151,7 +151,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -189,7 +189,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -316,7 +316,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -356,7 +356,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 

+ 12 - 12
WeiChat/src/main/res/layout/activity_room_info.xml

@@ -46,7 +46,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -94,7 +94,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -127,7 +127,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -160,7 +160,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -192,7 +192,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name"
                     android:visibility="invisible" />
 
@@ -226,7 +226,7 @@
                     android:layout_height="@dimen/next_height"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name"
                     android:visibility="invisible" />
             </RelativeLayout>
@@ -260,7 +260,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -286,7 +286,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -312,7 +312,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -338,7 +338,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -364,7 +364,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -415,7 +415,7 @@
                     android:layout_height="@dimen/next_height"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 

+ 2 - 2
WeiChat/src/main/res/layout/activity_send_shuoshuo.xml

@@ -81,7 +81,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:src="@drawable/set_list_next" />
+                    android:src="@drawable/oa_next" />
             </RelativeLayout>
 
             <View
@@ -109,7 +109,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:drawableRight="@drawable/set_list_next"
+                    android:drawableRight="@drawable/oa_next"
                     android:gravity="center"
                     android:text="所有人可见" />
             </RelativeLayout>

+ 6 - 6
WeiChat/src/main/res/layout/activity_setting.xml

@@ -46,7 +46,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -111,7 +111,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -139,7 +139,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -169,7 +169,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -198,7 +198,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -233,7 +233,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
             <View

+ 1 - 1
WeiChat/src/main/res/layout/activity_signin_set.xml

@@ -25,7 +25,7 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:alpha="0.26"
-            android:background="@drawable/set_list_next"
+            android:background="@drawable/oa_next"
             android:contentDescription="@string/app_name" />
 
     </RelativeLayout>

+ 1 - 1
WeiChat/src/main/res/layout/dy_listview_items_demo_style2.xml

@@ -12,7 +12,7 @@
         android:layout_centerVertical="true"
         android:layout_marginRight="10dp"
         android:alpha="0.26"
-        android:src="@drawable/set_list_next" />
+        android:src="@drawable/oa_next" />
 
 
     <LinearLayout

+ 7 - 7
WeiChat/src/main/res/layout/form_travel_main2.xml

@@ -56,7 +56,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="0.26"
-                        android:background="@drawable/set_list_next"
+                        android:background="@drawable/oa_next"
                         android:contentDescription="@string/app_name" />
                 </RelativeLayout>
 
@@ -93,7 +93,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="0.26"
-                        android:background="@drawable/set_list_next"
+                        android:background="@drawable/oa_next"
                         android:contentDescription="@string/app_name" />
                 </RelativeLayout>
 
@@ -131,7 +131,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="0.26"
-                        android:background="@drawable/set_list_next"
+                        android:background="@drawable/oa_next"
                         android:contentDescription="@string/app_name" />
                 </RelativeLayout>
                 <View
@@ -167,7 +167,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="0.26"
-                        android:background="@drawable/set_list_next"
+                        android:background="@drawable/oa_next"
                         android:contentDescription="@string/app_name" />
                 </RelativeLayout>
                 <View
@@ -204,7 +204,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="0.26"
-                        android:background="@drawable/set_list_next"
+                        android:background="@drawable/oa_next"
                         android:contentDescription="@string/app_name" />
                 </RelativeLayout>
 
@@ -242,7 +242,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="0.26"
-                        android:background="@drawable/set_list_next"
+                        android:background="@drawable/oa_next"
                         android:contentDescription="@string/app_name" />
                 </RelativeLayout>
 
@@ -280,7 +280,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="0.26"
-                        android:background="@drawable/set_list_next"
+                        android:background="@drawable/oa_next"
                         android:contentDescription="@string/app_name" />
                 </RelativeLayout>
 

+ 78 - 65
WeiChat/src/main/res/layout/fragment_me.xml

@@ -16,7 +16,7 @@
                 android:id="@+id/avatar_img"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
-               
+
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:contentDescription="@string/app_name"
@@ -58,17 +58,15 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name"
                 android:alpha="0.26"
-                />
+                android:background="@drawable/oa_next"
+                android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/my_data_rl"
-            android:visibility="gone"
             style="@style/IMTbleLine_UP_Me"
-           >
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -87,40 +85,14 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/my_friend_rl"
-            android:visibility="gone"
-            style="@style/IMTbleLine_UP_Me">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/my_friend"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="@string/my_friend"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <ImageView
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/my_space_rl"
-            android:visibility="gone"
-            style="@style/IMTbleLine_UP_Me">
+            style="@style/IMTbleLine_UP_Me"
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -134,22 +106,22 @@
                 android:textSize="@dimen/text_main" />
 
             <ImageView
+                android:id="@+id/imageView"
                 android:layout_width="@dimen/next_width"
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name"
-                android:id="@+id/imageView" />
+                android:background="@drawable/oa_next"
+                android:contentDescription="@string/app_name" />
 
             <LinearLayout
-                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_alignBottom="@+id/imageView"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true"></LinearLayout>
+                android:orientation="horizontal"></LinearLayout>
         </RelativeLayout>
 
         <RelativeLayout
@@ -174,7 +146,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -203,7 +175,7 @@
                 android:text="未登录"
                 android:textColor="@color/text_hine"
                 android:textSize="@dimen/text_hine"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
             <ImageView
                 android:id="@+id/friend_arrow_img"
@@ -212,23 +184,66 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name"
-                android:visibility="gone"/>
+                android:visibility="gone" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
+
+        <RelativeLayout
+            android:id="@+id/my_friend_rl"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:id="@+id/tv_zone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/set_fans_u"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="我的朋友圈"
+                android:textColor="@color/text_main"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:id="@+id/iv_remain"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/tv_zone"
+                android:src="@drawable/tab_unread_bg"
+                android:visibility="gone" />
+
+            <ImageView
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:alpha="0.26"
+                android:background="@drawable/oa_next"
+                android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-    
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
+            android:layout_marginTop="7dp"
             android:background="@color/item_line" />
-        
         <!--公司-->
+        <!--账套-->
         <RelativeLayout
             android:id="@+id/rl_company_change"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="7dp">
+            style="@style/IMTbleLine_UP_Me">
 
             <TextView
                 android:id="@+id/company_text"
@@ -257,16 +272,13 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
-
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
             android:background="@color/item_line" />
-
-        <!--账套-->
         <RelativeLayout
             android:id="@+id/rl_master_change"
             style="@style/IMTbleLine_UP_Me">
@@ -298,7 +310,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -308,9 +320,9 @@
             android:background="@color/item_line" />
 
         <RelativeLayout
-            android:visibility="gone"
             android:id="@+id/app_scan_code_rl"
-            style="@style/IMTbleLine_UP_Me">
+            style="@style/IMTbleLine_UP_Me"
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/uas_text"
@@ -332,7 +344,7 @@
                 android:text="未登录"
                 android:textColor="@color/text_hine"
                 android:textSize="@dimen/text_hine"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
             <ImageView
                 android:id="@+id/uas_arrow_img"
@@ -341,14 +353,14 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name"
-                android:visibility="gone"/>
+                android:visibility="gone" />
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/app_drafts_rl"
-            
+
             style="@style/IMTbleLine_UP_Me"
             android:visibility="gone">
 
@@ -372,7 +384,7 @@
                 android:text="未登录"
                 android:textColor="@color/text_hine"
                 android:textSize="@dimen/text_hine"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
             <ImageView
                 android:id="@+id/drafts_arrow_img"
@@ -381,15 +393,16 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name"
-                android:visibility="gone"/>
+                android:visibility="gone" />
         </RelativeLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
             android:background="@color/item_line" />
+
         <RelativeLayout
             android:id="@+id/my_b2b_rl"
             style="@style/IMTbleLine_UP_Me"
@@ -401,7 +414,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-            
+
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="@string/my_b2b"
@@ -424,7 +437,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -451,7 +464,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 

+ 5 - 51
WeiChat/src/main/res/layout/fragment_works.xml

@@ -29,53 +29,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:layout_marginTop="7dp"
-            android:background="@color/item_line" />
-
-        <RelativeLayout
-            android:id="@+id/my_friend_rl"
-            style="@style/IMTbleLine">
-
-            <TextView
-                android:id="@+id/tv_zone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/set_fans_u"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="我的朋友圈"
-                android:textColor="@color/text_main"
-                android:textSize="14sp" />
-
-            <ImageView
-                android:id="@+id/iv_remain"
-                android:layout_width="15dp"
-                android:layout_height="15dp"
-                android:layout_centerVertical="true"
-                android:layout_toRightOf="@+id/tv_zone"
-                android:src="@drawable/tab_unread_bg"
-                android:visibility="gone" />
-
-            <ImageView
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -112,7 +66,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -143,7 +97,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -173,7 +127,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -204,7 +158,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
-                android:background="@drawable/set_list_next"
+                android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 

+ 3 - 3
WeiChat/src/main/res/layout/from_extra_leave2.xml

@@ -56,7 +56,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="0.26"
-                        android:background="@drawable/set_list_next"
+                        android:background="@drawable/oa_next"
                         android:contentDescription="@string/app_name" />
                 </RelativeLayout>
 
@@ -93,7 +93,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="0.26"
-                        android:background="@drawable/set_list_next"
+                        android:background="@drawable/oa_next"
                         android:contentDescription="@string/app_name" />
                 </RelativeLayout>
 
@@ -131,7 +131,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="0.26"
-                        android:background="@drawable/set_list_next"
+                        android:background="@drawable/oa_next"
                         android:contentDescription="@string/app_name" />
                 </RelativeLayout>
                 <View

+ 3 - 3
WeiChat/src/main/res/layout/from_leave_view2.xml

@@ -56,7 +56,7 @@ android:orientation="vertical">
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name"
                     />
             </RelativeLayout>
@@ -93,7 +93,7 @@ android:orientation="vertical">
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
@@ -131,7 +131,7 @@ android:orientation="vertical">
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:alpha="0.26"
-                    android:background="@drawable/set_list_next"
+                    android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
             <View

+ 7 - 7
WeiChat/src/main/res/layout/headview_cantacts_menus.xml

@@ -62,7 +62,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="@drawable/set_list_next"
+            android:background="@drawable/oa_next"
             android:contentDescription="@string/app_name"
             android:visibility="gone" />
 
@@ -95,7 +95,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="@drawable/set_list_next"
+            android:background="@drawable/oa_next"
             android:contentDescription="@string/app_name"
             android:visibility="gone" />
 
@@ -130,7 +130,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="@drawable/set_list_next"
+            android:background="@drawable/oa_next"
             android:contentDescription="@string/app_name"
             android:visibility="gone" />
 
@@ -171,7 +171,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="@drawable/set_list_next"
+            android:background="@drawable/oa_next"
             android:contentDescription="@string/app_name"
             android:visibility="gone" />
 
@@ -212,7 +212,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="@drawable/set_list_next"
+            android:background="@drawable/oa_next"
             android:contentDescription="@string/app_name"
             android:visibility="gone" />
 
@@ -244,7 +244,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="@drawable/set_list_next"
+            android:background="@drawable/oa_next"
             android:contentDescription="@string/app_name"
             android:visibility="gone" />
     </RelativeLayout>
@@ -271,7 +271,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="@drawable/set_list_next"
+            android:background="@drawable/oa_next"
             android:contentDescription="@string/app_name"
           />
 

+ 1 - 1
WeiChat/src/main/res/menu/menu_nearby.xml

@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/search"
-        android:icon="@drawable/abc_ic_search_api_mtrl_alpha"
+        android:icon="@drawable/more"
         android:title="@string/search"
         app:showAsAction="ifRoom"/>
 

+ 1 - 0
WeiChat/src/main/res/values/strings.xml

@@ -7,6 +7,7 @@
         <item>转为新客户</item>
         <item>关联已有客户</item>
     </string-array>
+    <string name="networks_out">网络未连接!</string>
     <string name="session_out">会话已断开</string>
     <string name="crm_sale_num">****元  (第**名)</string>
     <string name="not_format_phone">手机格式不正确!</string>

+ 11 - 8
WeiChat/src/main/res/values/styles.xml

@@ -222,7 +222,7 @@
         <item name="android:layout_height">@dimen/next_height</item>
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:background">@drawable/set_list_next</item>
+        <item name="android:background">@drawable/oa_next</item>
     </style>
 
     <style name="ChattingUISystem">
@@ -447,6 +447,7 @@
         <item name="android:textColor">@color/text_main</item>
         <item name="android:textSize">@dimen/text_main</item>
     </style>
+
     <style name="form_relative_left_text2">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -606,7 +607,7 @@
     <style name="crm_ll_card">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">310dp</item>
-       
+
         <item name="android:orientation">vertical</item>
         <item name="android:background">@drawable/shape_crm_card</item>
     </style>
@@ -622,13 +623,13 @@
     <style name="crm_card_round_tv">
         <item name="android:layout_width">80dp</item>
         <item name="android:layout_height">50dp</item>
-       
+
         <item name="android:layout_marginLeft">8dp</item>
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:layout_marginBottom">8dp</item>
         <item name="android:layout_marginRight">1dp</item>
         <item name="android:gravity">center_vertical|left</item>
-       
+
     </style>
 
     <style name="crm_ll_card_ranking">
@@ -804,7 +805,7 @@
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-    
+
     <!--动画-->
     <style name="Animation.CustomPopup" parent="@android:style/Animation">
         <item name="android:windowEnterAnimation">@anim/pop_in</item>
@@ -869,7 +870,7 @@
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
-    
+
     <!--umeng-->
     <style name="umeng_socialize_action_bar_itemlayout">
         <item name="android:layout_height">fill_parent</item>
@@ -925,8 +926,10 @@
     </style>
 
     <style name="umeng_socialize_shareboard_animation">
-        <item name="android:windowEnterAnimation">@anim/umeng_socialize_shareboard_animation_in</item>
-        <item name="android:windowExitAnimation">@anim/umeng_socialize_shareboard_animation_out</item>
+        <item name="android:windowEnterAnimation">@anim/umeng_socialize_shareboard_animation_in
+        </item>
+        <item name="android:windowExitAnimation">@anim/umeng_socialize_shareboard_animation_out
+        </item>
     </style>
 
     <style name="Theme.UMDialog" parent="android:style/Theme.Dialog">