提交分类 修复BUG；优化功能

提交内容
    1、去除新的网络框架默认的header参数Accept-Encoding，防止出现解压缩过程中的异常
    2、调整弹出提示的工具类中的默认显示时间，由5秒缩短为1秒
    3、优化工作台actionbar标题，显示为当前账套名
    4、隐藏工作日历和销售看板的头布局
    5、切换登录ERP时清空B2Bsession信息
当前版本	测试版本6.1.0
是否冲突	否

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -214,7 +214,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(getString(R.string.work_customer));
+        getSupportActionBar().setTitle(R.string.sales_statistics);
         initBarChart();
         initSaleBarChart();
         initListener();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/activity/DataInquiryListActivity.java

@@ -113,15 +113,17 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             switch (msg.what) {
                 case GET_QUERY_CRITERIA:
                     isConditionSuccess = true;
-                    if (mDataListView.isRefreshing())
+                    if (mDataListView.isRefreshing()) {
                         mDataListView.onRefreshComplete();
+                    }
                     String result = msg.getData().getString("result");
                     analysisCondition(result);
                     getSchemeData();
                     break;
                 case GET_DATA_RESULT:
-                    if (mDataListView.isRefreshing())
+                    if (mDataListView.isRefreshing()) {
                         mDataListView.onRefreshComplete();
+                    }
                     progressDialog.dismiss();
                     analysisData(msg);
                     break;
@@ -130,10 +132,10 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     mTotalSpreadImageView.setVisibility(View.GONE);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-//                    mDataListView.setVisibility(View.VISIBLE);
                     mTotalSpreadImageView.setVisibility(View.GONE);
-                    if (mDataListView.isRefreshing())
+                    if (mDataListView.isRefreshing()) {
                         mDataListView.onRefreshComplete();
+                    }
                     progressDialog.dismiss();
                     ToastMessage(msg.getData().getString("result"));
                     if (mPageIndex > 1) {
@@ -285,10 +287,11 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
                 if (CommonUtil.isNetWorkConnected(DataInquiryListActivity.this)) {
                     mPageIndex = 1;
-                    if (isConditionSuccess)
+                    if (isConditionSuccess) {
                         getSchemeData();
-                    else
+                    } else {
                         getQueryCriteria();
+                    }
                 } else {
                     mDataListView.postDelayed(new Runnable() {
                         @Override
@@ -329,8 +332,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 if (hasFocus) {
-                    if (mExactWholeLl.getVisibility() == View.VISIBLE)
+                    if (mExactWholeLl.getVisibility() == View.VISIBLE) {
                         mExactWholeLl.setVisibility(View.GONE);
+                    }
                     if (mHistoricalRecordAdapter.getObjects().size() > 0) {
                         if (mFuzzyWholeLl.getVisibility() == View.GONE) {
                             mFuzzyHistoryLl.startAnimation(mInAnimation);
@@ -433,8 +437,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         String result = msg.getData().getString("result");
         if (result != null) {
             mDataInquiryTotalBeans.clear();
-            if (mPageIndex == 1)
+            if (mPageIndex == 1) {
                 mDataInquiryFlexBeans.clear();
+            }
             LogUtil.prinlnLongMsg("schemedata", msg.getData().getString("result"));
             try {
                 JSONObject resultObject = new JSONObject(result);
@@ -464,8 +469,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 }
 
                 if (listArray != null && listArray.length() > 0 && mDataInquiryTotalBeans.size() > 0) {
-                    if (mPageIndex == 1)
+                    if (mPageIndex == 1) {
                         mTotalLl.setVisibility(View.VISIBLE);
+                    }
                     mTotalSpreadImageView.setVisibility(View.VISIBLE);
                 } else {
                     if (mPageIndex == 1) {
@@ -612,8 +618,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
 
             } catch (JSONException e) {
                 mDataInquiryFlexAdapter.notifyDataSetChanged();
-                if (mDataInquiryFlexBeans.size() == 0)
+                if (mDataInquiryFlexBeans.size() == 0) {
                     mEmptyLayout.showEmpty();
+                }
                 e.printStackTrace();
             }
         }
@@ -654,8 +661,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                                         property.setValue(value);
                                         property.setState(false);
 
-                                        if (!"$ALL".equals(display) && !"$ALL".equals(value))
+                                        if (!"$ALL".equals(display) && !"$ALL".equals(value)) {
                                             propertyList.add(property);
+                                        }
                                     }
                                     schemeConditionBean.setProperties(propertyList);
                                 }
@@ -924,8 +932,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 mSearchEditText.setText(s);
                 mSearchEditText.setSelection(s.length());
 
-                if (b)
+                if (b) {
                     searchEvent();
+                }
             }
 
             @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -451,7 +451,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             subord_log.setText(getString(R.string.Subordinates_visit));
             my_log.setText(getString(R.string.my_visit));
         } else {
-            title = getString(R.string.work_oa);
+//            title = getString(R.string.work_oa);
+            title = getString(R.string.work_calender);
         }
         getSupportActionBar().setTitle(title);
 

WeiChat/src/main/res/layout/activity_client.xml

@@ -1,1074 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/bg_underlying"
-    android:orientation="vertical"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#6A6A6A"
-        android:orientation="horizontal"
-        android:padding="10dp"
-        android:weightSum="4"
-        android:visibility="visible">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <ImageButton
-                android:id="@+id/ib_business"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_margin="5dp"
-                android:background="@drawable/tab_icon4" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/crmmain_business"
-                android:textColor="#ffffff" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <ImageButton
-                android:id="@+id/ib_customer"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_margin="5dp"
-                android:background="@drawable/tab_icon1" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/crmmain_client"
-                android:textColor="#ffffff" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <ImageButton
-                android:id="@+id/ib_customer_vistor"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_margin="5dp"
-                android:background="@drawable/tab_icon2" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/crmmain_customer_visit"
-                android:textColor="#ffffff" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <ImageButton
-                android:id="@+id/ib_waller"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_margin="5dp"
-                android:background="@drawable/tab_icon3" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/crmmain_wall_of_fame"
-                android:textColor="#ffffff" />
-        </LinearLayout>
-    </LinearLayout>
-    <com.handmark.pulltorefresh.library.PullToRefreshScrollView
-        android:id="@+id/client_ptrsv"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="false">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <!--我的排名-->
-            <LinearLayout
-                style="@style/crm_ll_card"
-                android:layout_margin="0dp">
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp">
-
-                    <ImageView
-                        android:layout_toLeftOf="@+id/iv_icon1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/crm_left"/>
-
-                    <TextView
-                        android:id="@+id/iv_icon1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="#62B7F2"
-                        android:layout_centerInParent="true"
-                        android:text="@string/crm_icon1"  />
-                    <ImageView
-                        android:layout_toRightOf="@+id/iv_icon1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/crm_right"/>
-
-                    <TextView
-                        android:id="@+id/ib_ranking_condition"
-                        style="@style/crm_ib_card_topRight"
-                        android:drawableRight="@drawable/nav_icon_search_default"
-                        android:text="@string/crm_filter" />
-                </RelativeLayout>
-
-                <!--<View style="@style/app_line_gray_1dp"></View>-->
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        style="@style/crm_card_round_tv"
-                        android:text="@string/crm_sales" />
-
-                    <LinearLayout style="@style/crm_ll_card_ranking">
-
-                        <TextView
-                            android:id="@+id/tv_rank_sale_left"
-                            style="@style/crm_tv_ranking_left" />
-
-                        <TextView
-                            android:id="@+id/tv_rank_sale_right"
-                            style="@style/crm_tv_ranking_right" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <View style="@style/app_line_gray_1dp"></View>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        style="@style/crm_card_round_tv"
-                        android:text="@string/crm_Gross_profit" />
-
-                    <LinearLayout style="@style/crm_ll_card_ranking">
-
-                        <TextView
-                            android:id="@+id/tv_rank_rirun_left"
-                            style="@style/crm_tv_ranking_left"
-                            android:text="@string/crm_ge"/>
-
-                        <TextView
-                            android:id="@+id/tv_rank_rirun_right"
-                            style="@style/crm_tv_ranking_right"
-                            android:text="@string/crm_di_ming"/>
-                    </LinearLayout>
-                </LinearLayout>
-
-                <View style="@style/app_line_gray_1dp"></View>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        style="@style/crm_card_round_tv"
-                        android:text="@string/crm_Numberofcustome_visits" />
-
-                    <LinearLayout style="@style/crm_ll_card_ranking">
-
-                        <TextView
-                            android:id="@+id/tv_rank_visit_left"
-                            style="@style/crm_tv_ranking_left"
-                            android:text="@string/crm_di_ming"/>
-
-                        <TextView
-                            android:id="@+id/tv_rank_visit_right"
-                            style="@style/crm_tv_ranking_right"
-                            android:text="@string/crm_ge" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <View style="@style/app_line_gray_1dp"></View>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        style="@style/crm_card_round_tv"
-                        android:text="@string/crm_extra_get" />
-
-                    <LinearLayout style="@style/crm_ll_card_ranking">
-
-                        <TextView
-                            android:id="@+id/tv_rank_income_left"
-                            style="@style/crm_tv_ranking_left"
-                            android:text="@string/crm_di_ming" />
-
-                        <TextView
-                            android:id="@+id/tv_rank_income_right"
-                            style="@style/crm_tv_ranking_right"
-                            android:text="@string/crm_ge"/>
-                    </LinearLayout>
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                style="@style/crm_ll_card"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="0dp"
-                android:layout_marginRight="0dp"
-                android:layout_marginTop="10dp">
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp">
-                    <ImageView
-                        android:layout_toLeftOf="@+id/iv_sale"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/crm_left"/>
-                  
-                    <TextView
-                        android:id="@+id/iv_sale"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="#62B7F2"
-                        android:layout_centerInParent="true"
-                        android:text="@string/crm_icon2"  />
-                    <ImageView
-                        android:layout_toRightOf="@+id/iv_sale"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/crm_right"/>
-
-                    <!--   <ImageButton style="@style/crm_ib_card_topRight"
-                           android:id="@+id/ib_sale_condition" />-->
-                </RelativeLayout>
-
-                <!--<View style="@style/app_line_gray_1dp"></View>-->
-
-                <LinearLayout
-                    style="@style/crm_ll_sale"
-                    android:layout_marginTop="5dp"
-                    android:layout_weight="2">
-
-                    <TextView
-                        android:id="@+id/tv_huikuan"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="20dp"
-                        android:layout_weight="1"
-                        android:drawableLeft="@drawable/icon_mony"
-                        android:drawablePadding="5dp"
-                        android:gravity="left"
-                        android:text="@string/crm_back0wyuan" />
-
-                    <TextView
-                        android:id="@+id/tv_chuhuo"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:drawableLeft="@drawable/icon_mony"
-                        android:drawablePadding="5dp"
-                        android:gravity="left"
-                        android:text="@string/crm_out0wyuan" />
-                </LinearLayout>
-                <!--图表-->
-                <LinearLayout
-                    style="@style/crm_ll_sale"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical">
-
-                    <com.github.mikephil.charting.charts.BarChart
-                        android:id="@+id/crm_chart_sale"
-                        android:layout_width="match_parent"
-                        android:layout_height="200dp"
-                        android:layout_marginBottom="10dp"
-                        android:layout_marginTop="10dp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    style="@style/crm_ll_sale"
-                    android:visibility="gone">
-
-                    <LinearLayout
-                        style="@style/LinearLayout_horizontal"
-                        android:layout_weight="1">
-
-                        <TextView
-                            style="@style/crm_card_round_tv"
-                            android:text="@string/crmmain_client" />
-
-                        <TextView
-                            android:id="@+id/tv_sale_customer"
-                            style="@style/TextView_VerticalCenter"
-                            android:text="@string/crm_newadd_c" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        style="@style/LinearLayout_horizontal"
-                        android:layout_weight="1">
-
-                        <TextView
-                            style="@style/crm_card_round_tv"
-                            android:text="@string/common_Contact_person" />
-
-                        <TextView
-                            android:id="@+id/tv_sale_linkman"
-                            style="@style/TextView_VerticalCenter"
-                            android:text="@string/crm_newadd_c" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <View
-                    style="@style/app_line_gray_1dp"
-                    android:visibility="gone"></View>
-
-                <LinearLayout
-                    style="@style/crm_ll_sale"
-                    android:visibility="gone">
-
-                    <LinearLayout
-                        style="@style/LinearLayout_horizontal"
-                        android:layout_weight="1">
-
-                        <TextView
-                            style="@style/crm_card_round_tv"
-                            android:text="@string/crm_Numberofbusiness" />
-
-                        <TextView
-                            android:id="@+id/tv_sale_business"
-                            style="@style/TextView_VerticalCenter"
-                            android:text="@string/crm_newadd_c" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        style="@style/LinearLayout_horizontal"
-                        android:layout_weight="1">
-
-                        <TextView
-                            style="@style/crm_card_round_tv"
-                            android:text="@string/crm_change_business" />
-
-                        <TextView
-                            android:id="@+id/tv_sale_businessChange"
-                            style="@style/TextView_VerticalCenter"
-                            android:text="@string/crm_newadd_c" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <View
-                    style="@style/app_line_gray_1dp"
-                    android:visibility="gone"></View>
-
-                <LinearLayout
-                    style="@style/crm_ll_sale"
-                    android:visibility="gone">
-
-                    <LinearLayout
-                        style="@style/LinearLayout_horizontal"
-                        android:layout_weight="1">
-
-                        <TextView
-                            style="@style/crm_card_round_tv"
-                            android:text="@string/crm_Sales_order" />
-
-                        <TextView
-                            android:id="@+id/tv_sale_order"
-                            style="@style/TextView_VerticalCenter"
-                            android:text="@string/crm_newadd_c" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        style="@style/LinearLayout_horizontal"
-                        android:layout_weight="1">
-
-                        <TextView
-                            style="@style/crm_card_round_tv"
-                            android:text="@string/crm_visit_record" />
-
-                        <TextView
-                            android:id="@+id/tv_sale_visit"
-                            style="@style/TextView_VerticalCenter"
-                            android:text="@string/crm_newadd_c" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <View
-                    style="@style/app_line_gray_1dp"
-                    android:visibility="gone"></View>
-
-                <LinearLayout
-                    style="@style/crm_ll_sale"
-                    android:visibility="gone">
-
-                    <LinearLayout
-                        style="@style/LinearLayout_horizontal"
-                        android:layout_weight="1">
-
-                        <TextView
-                            style="@style/crm_card_round_tv"
-                            android:text="@string/crm_out_doc" />
-
-                        <TextView
-                            android:id="@+id/tv_sale_chuhuo"
-                            style="@style/TextView_VerticalCenter"
-                            android:text="@string/crm_newadd_c" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        style="@style/LinearLayout_horizontal"
-                        android:layout_weight="1">
-
-                        <TextView
-                            style="@style/crm_card_round_tv"
-                            android:text="@string/crm_Back_money" />
-
-                        <TextView
-                            android:id="@+id/tv_sale_huikuan"
-                            style="@style/TextView_VerticalCenter"
-                            android:text="@string/crm_newadd_c" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <View
-                    style="@style/app_line_gray_1dp"
-                    android:visibility="gone"></View>
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:id="@+id/ll_subordinate"
-                style="@style/crm_ll_card"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="0dp"
-                android:layout_marginRight="0dp"
-                android:layout_marginTop="10dp">
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp">
-                    <ImageView
-                        android:layout_toLeftOf="@+id/iv_icon3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/crm_left"/>
-
-                    <TextView
-                        android:id="@+id/iv_icon3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="#62B7F2"
-                        android:layout_centerInParent="true"
-                        android:text="@string/crm_icon3"  />
-                    <ImageView
-                        android:layout_toRightOf="@+id/iv_icon3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/crm_right"/>
-
-                    <!-- <ImageButton style="@style/crm_ib_card_topRight"
-                         android:id="@+id/ib_em_condition" />-->
-                </RelativeLayout>
-
-                <!--<View style="@style/app_line_gray_1dp"></View>-->
-
-                <LinearLayout
-                    style="@style/LinearLayout_horizontal"
-                    android:layout_weight="3"
-                    android:padding="10dp">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.5" />
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="2"
-                        android:gravity="center"
-                        android:text="@string/crm_plansales_dec1" />
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="2"
-                        android:gravity="center"
-                        android:text="@string/crm_realsales_dec2" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/ll_data_one"
-                    android:visibility="gone"
-                    style="@style/LinearLayout_horizontal"
-                    android:padding="8dp">
-
-                    <TextView
-                        android:id="@+id/tv_em_a"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_weight="1.5"
-                        android:text="沈佳" />
-
-                    <TextView
-                        android:id="@+id/tv_em_plana"
-                        style="@style/TextView_VerticalCenter"
-                        android:layout_width="0dp"
-                        android:layout_weight="2"
-                        android:text="@string/crm_wyuan" />
-
-                    <TextView
-                        android:id="@+id/tv_em_salea"
-                        style="@style/TextView_VerticalCenter"
-                        android:layout_width="0dp"
-                        android:layout_weight="2"
-                        android:text="@string/crm_wyuan" />
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/ll_data_two"
-                    android:visibility="gone"
-                    style="@style/LinearLayout_horizontal"
-                    android:padding="8dp">
-
-                    <TextView
-                        android:id="@+id/tv_em_b"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_weight="1.5"
-                        android:text="沈佳" />
-
-                    <TextView
-                        android:id="@+id/tv_em_planb"
-                        style="@style/TextView_VerticalCenter"
-                        android:layout_width="0dp"
-                        android:layout_weight="2"
-                        android:text="@string/crm_wyuan" />
-
-                    <TextView
-                        android:id="@+id/tv_em_saleb"
-                        style="@style/TextView_VerticalCenter"
-                        android:layout_width="0dp"
-                        android:layout_weight="2"
-                        android:text="@string/crm_wyuan" />
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/ll_data_three"
-                    android:visibility="gone"
-                    style="@style/LinearLayout_horizontal"
-                    android:padding="8dp">
-
-                    <TextView
-                        android:id="@+id/tv_em_c"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_weight="1.5"
-                        android:text="沈佳" />
-
-                    <TextView
-                        android:id="@+id/tv_em_planc"
-                        style="@style/TextView_VerticalCenter"
-                        android:layout_width="0dp"
-                        android:layout_weight="2"
-                        android:text="@string/crm_wyuan" />
-
-                    <TextView
-                        android:id="@+id/tv_em_salec"
-                        style="@style/TextView_VerticalCenter"
-                        android:layout_width="0dp"
-                        android:layout_weight="2"
-                        android:text="@string/crm_wyuan" />
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/ll_data_empty"
-                    style="@style/LinearLayout_horizontal"
-                    android:layout_margin="10dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_weight="1"
-                        android:text="沈佳"
-                        android:visibility="gone" />
-
-                    <TextView
-                        android:id="@+id/subs_tv"
-                        style="@style/TextView_VerticalCenter"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:drawableRight="@drawable/ic_more_blue_arrow"
-                        android:gravity="center"
-                        android:text="@string/crm_nodatas" />
-
-                    <TextView
-                        style="@style/TextView_VerticalCenter"
-                        android:layout_weight="1"
-                        android:text="@string/crm_wyuan"
-                        android:visibility="gone" />
-
-
-                </LinearLayout>
-
-
-                <View style="@style/app_line_gray_1dp"></View>
-
-                <LinearLayout
-                    style="@style/LinearLayout_vertical"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:text="沈佳" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:text="第三事业部" />
-
-                    <LinearLayout
-                        style="@style/crm_ll_sale_item"
-                        android:weightSum="2">
-
-                        <LinearLayout
-                            style="@style/LinearLayout_horizontal"
-                            android:layout_weight="1">
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_Plan_sales" />
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_wyuan" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            style="@style/LinearLayout_horizontal"
-                            android:layout_weight="1">
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_Actual_sales" />
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_wyuan" />
-                        </LinearLayout>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        style="@style/crm_ll_sale_item"
-                        android:weightSum="2">
-
-                        <LinearLayout
-                            style="@style/LinearLayout_horizontal"
-                            android:layout_weight="1">
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_Plan_gross_profit" />
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_wyuan" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            style="@style/LinearLayout_horizontal"
-                            android:layout_weight="1">
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="实际毛利润：" />
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text=" 万元" />
-                        </LinearLayout>
-                    </LinearLayout>
-                </LinearLayout>
-
-                <View style="@style/app_line_gray_1dp"></View>
-
-                <LinearLayout
-                    style="@style/LinearLayout_vertical"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:text="沈佳" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:text="第三事业部" />
-
-                    <LinearLayout
-                        style="@style/crm_ll_sale_item"
-                        android:weightSum="2">
-
-                        <LinearLayout
-                            style="@style/LinearLayout_horizontal"
-                            android:layout_weight="1">
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_Plan_sales" />
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_wyuan" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            style="@style/LinearLayout_horizontal"
-                            android:layout_weight="1">
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_Actual_sales" />
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_wyuan" />
-                        </LinearLayout>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        style="@style/crm_ll_sale_item"
-
-                        android:weightSum="2">
-
-                        <LinearLayout
-                            style="@style/LinearLayout_horizontal"
-                            android:layout_weight="1">
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_Plan_gross_profit" />
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_wyuan" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            style="@style/LinearLayout_horizontal"
-                            android:layout_weight="1">
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_Actual_gross_profit" />
-
-                            <TextView
-                                style="@style/TextView_VerticalCenter"
-                                android:text="@string/crm_wyuan" />
-                        </LinearLayout>
-                    </LinearLayout>
-                </LinearLayout>
-            </LinearLayout>
-
-
-            <LinearLayout
-                style="@style/crm_ll_card"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="0dp"
-                android:layout_marginRight="0dp"
-                android:layout_marginTop="10dp">
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp">
-
-                    <ImageView
-                        android:layout_toLeftOf="@+id/iv_icon4"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/crm_left"/>
-
-                    <TextView
-                        android:id="@+id/iv_icon4"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="#62B7F2"
-                        android:layout_centerInParent="true"
-                        android:text="@string/crm_icon4"  />
-                    <ImageView
-                        android:layout_toRightOf="@+id/iv_icon4"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/crm_right"/>
-
-                    <TextView
-                        android:id="@+id/ib_index_condition"
-                        style="@style/crm_ib_card_topRight"
-                        android:drawableRight="@drawable/nav_icon_search_default"
-                        android:text="@string/crm_filter" />
-                </RelativeLayout>
-
-                <!--<View style="@style/app_line_gray_1dp"></View>-->
-
-                <LinearLayout
-                    style="@style/LinearLayout_horizontal"
-                    android:weightSum="2">
-
-                    <LinearLayout
-                        style="@style/LinearLayout_vertical"
-                        android:layout_weight="1"
-                        android:padding="10dp"
-                        android:visibility="gone">
-
-                        <TextView
-                            style="@style/crm_tv_sale_title"
-                            android:text="@string/crm_Plan_sales" />
-
-                        <TextView
-                            style="@style/crm_tv_sale_title_value"
-                            android:text="@string/crm_sale_num" />
-
-                        <TextView
-                            style="@style/crm_tv_sale_title"
-                            android:text="@string/crm_Plan_sales" />
-
-                        <TextView
-                            style="@style/crm_tv_sale_title_value"
-                            android:text="@string/crm_sale_num" />
-
-                        <TextView
-                            style="@style/crm_tv_sale_title"
-                            android:text="@string/crm_Plan_sales" />
-
-                        <TextView
-                            style="@style/crm_tv_sale_title_value"
-                            android:text="@string/crm_sale_num" />
-
-                        <TextView
-                            style="@style/crm_tv_sale_title"
-                            android:text="@string/crm_Plan_sales" />
-
-                        <TextView
-                            style="@style/crm_tv_sale_title_value"
-                            android:text="@string/crm_sale_num" />
-                    </LinearLayout>
-
-                    <View style="@style/app_line_v_1dp"></View>
-
-                    <LinearLayout
-                        style="@style/LinearLayout_vertical"
-                        android:layout_weight="1">
-
-                        <com.github.mikephil.charting.charts.BarChart
-                            android:id="@+id/crm_chart_bar"
-                            android:layout_width="match_parent"
-                            android:layout_height="200dp"
-                            android:layout_marginBottom="10dp"
-                            android:layout_marginTop="10dp" />
-                    </LinearLayout>
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                style="@style/crm_ll_card"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="0dp"
-                android:layout_marginRight="0dp"
-                android:layout_marginTop="10dp">
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp">
-                    <ImageView
-                        android:layout_toLeftOf="@+id/iv_icon5"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/crm_left"/>
-
-                    <TextView
-                        android:id="@+id/iv_icon5"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="#62B7F2"
-                        android:layout_centerInParent="true"
-                        android:text="@string/crm_icon5" />
-                    <ImageView
-                        android:layout_toRightOf="@+id/iv_icon5"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/crm_right"/>
-
-                    <TextView
-                        android:id="@+id/tv_cu_count"
-                        style="@style/crm_tv_card_topLeftTitle"
-                        android:text="@string/crm_customer_forget_num"
-                        android:visibility="gone" />
-                    <!--
-                                    <TextView
-                                        android:id="@+id/ib_forget_condition"
-                                        style="@style/crm_ib_card_topRight"
-                                        android:text="更多"
-                                        android:textColor="@color/gray_light" />-->
-                </RelativeLayout>
-
-                <!--<View style="@style/app_line_gray_1dp"></View>-->
-
-                <LinearLayout
-                    android:id="@+id/ll_customer_lost"
-                    android:visibility="gone"
-                    style="@style/LinearLayout_vertical">
-
-                    <TextView
-                        android:id="@+id/tv_customer_name"
-                        style="@style/TextView_Basic"
-                        android:layout_marginLeft="10dp"
-                        android:text="@string/uas_company_name" />
-
-                    <LinearLayout
-                        style="@style/LinearLayout_horizontal"
-                        android:weightSum="2">
-
-                        <LinearLayout
-                            style="@style/LinearLayout_vertical"
-                            android:layout_marginBottom="20dp"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginRight="0dp"
-                            android:layout_weight="1">
-
-                            <TextView
-                                style="@style/TextView_Basic"
-                                android:text="@string/last_followup_time" />
-
-                            <TextView
-                                android:id="@+id/tv_customer_lastTime"
-                                style="@style/TextView_Basic"
-                                android:text="2016年07月1日 18:00" />
-                        </LinearLayout>
-
-                        <TextView
-                            android:id="@+id/tv_customer_days"
-                            style="@style/TextView_Basic_match"
-                            android:layout_weight="1"
-                            android:gravity="center_vertical"
-                            android:text="距离上次跟进188天" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/ll_data_empty1"
-                    style="@style/LinearLayout_horizontal"
-                    android:layout_margin="10dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_weight="1"
-                        android:text="沈佳"
-                        android:visibility="gone" />
-
-                    <TextView
-                        style="@style/TextView_VerticalCenter"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text="@string/crm_nodatas" />
-
-                    <TextView
-                        style="@style/TextView_VerticalCenter"
-                        android:layout_weight="1"
-                        android:text="@string/crm_wwyuan"
-                        android:visibility="gone" />
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/ll_data_more"
-                    style="@style/LinearLayout_horizontal"
-                    android:layout_margin="10dp">
-
-                    <TextView
-                        style="@style/TextView_VerticalCenter"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:textColor="@color/gray"
-                        android:text="默认显示一个遗忘客户，点击显示更多" />
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:layout_marginRight="10dp"
-                        android:src="@drawable/ic_more_blue_arrow" />
-
-                </LinearLayout>
-
-            </LinearLayout>
-        </LinearLayout>
-    </com.handmark.pulltorefresh.library.PullToRefreshScrollView>
-
-
-</LinearLayout>
-

WeiChat/src/main/res/layout/activity_oamain.xml

@@ -1,602 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--com.handmark.pulltorefresh.library.PullToRefreshScrollView -->
-<com.handmark.pulltorefresh.library.PullToRefreshScrollView android:id="@+id/oamain_ptrsv"
-                                                            xmlns:android="http://schemas.android.com/apk/res/android"
-                                                            android:layout_width="match_parent"
-                                                            android:layout_height="match_parent"
-                                                            android:background="#EBE9E9"
-                                                            android:fillViewport="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/oamain_head_menu_ll"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical"
-            android:visibility="visible">
-            <!--头布局-->
-            <LinearLayout
-                android:id="@+id/oa_rl_choose"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/toobar"
-                android:background="#6A6A6A"
-                android:orientation="vertical"
-                android:paddingTop="10dp"
-                android:visibility="visible">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingBottom="10dp">
-
-                    <RelativeLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <TextView
-                            android:id="@+id/tv_signin_num"
-                            android:layout_width="10dp"
-                            android:layout_height="10dp"
-                            android:layout_alignParentEnd="true"
-                            android:layout_alignParentRight="true"
-                            android:layout_alignTop="@+id/signin"
-                            android:layout_gravity="top|right"
-                            android:layout_marginRight="10dp"
-                            android:background="@drawable/hongdian"
-                            android:gravity="center"
-                            android:text=""
-                            android:textColor="@android:color/white"
-                            android:textSize="10.0dip" />
-
-                        <TextView
-                            android:id="@+id/signin"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerInParent="true"
-                            android:layout_marginTop="2dp"
-                            android:drawablePadding="@dimen/drawable_padding"
-                            android:drawableTop="@drawable/oa_1"
-                            android:text="@string/oasign_title"
-                            android:textColor="@color/white" />
-                    </RelativeLayout>
-
-                    <RelativeLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <TextView
-                            android:id="@+id/tv_signout_num"
-                            android:layout_width="10dp"
-                            android:layout_height="10dp"
-                            android:layout_alignParentRight="true"
-                            android:layout_gravity="top|right"
-                            android:layout_marginRight="10dp"
-                            android:background="@drawable/hongdian"
-                            android:gravity="center"
-                            android:text=""
-                            android:textColor="@android:color/white"
-                            android:textSize="10.0dip" />
-
-                        <TextView
-                            android:id="@+id/outoffice"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerInParent="true"
-                            android:layout_marginTop="2dp"
-                            android:drawablePadding="@dimen/drawable_padding"
-                            android:drawableTop="@drawable/oa_2"
-                            android:gravity="center"
-                            android:text="@string/oaoutplan_title"
-                            android:textColor="@color/white" />
-                    </RelativeLayout>
-
-                    <TextView
-                        android:id="@+id/worklog"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:drawablePadding="@dimen/drawable_padding"
-                        android:drawableTop="@drawable/oa_4"
-                        android:gravity="center"
-                        android:text="@string/oaworkdaily_title"
-                        android:textColor="@color/white" />
-
-                    <!--<LinearLayout-->
-                    <!--android:id="@+id/oamain_more_menu_ll"-->
-                    <!--android:layout_width="0dp"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:layout_marginTop="2dp"-->
-                    <!--android:layout_weight="1"-->
-                    <!--android:orientation="vertical">-->
-
-                    <!--<ImageView-->
-                    <!--android:id="@+id/oamain_more_menu_iv"-->
-                    <!--android:layout_width="match_parent"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:gravity="center"-->
-                    <!--android:src="@drawable/ic_oa_more" />-->
-
-                    <!--<TextView-->
-                    <!--android:id="@+id/more_menu_tv"-->
-                    <!--android:layout_width="match_parent"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:layout_marginTop="5dp"-->
-                    <!--android:gravity="center"-->
-                    <!--android:text="@string/oamore_tltle"-->
-                    <!--android:textColor="@color/white" />-->
-                    <!--</LinearLayout>-->
-                    <LinearLayout
-                        android:id="@+id/oamain_more_menu_ll"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:orientation="vertical"
-                        android:paddingLeft="5dp"
-                        android:visibility="visible">
-
-                        <FrameLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            >
-
-                            <ImageView
-                                android:id="@+id/oamain_more_menu_iv"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:gravity="center"
-                                android:src="@drawable/ic_oa_more" />
-
-                            <TextView
-                                android:id="@+id/oamain_more_menu_hd_tv"
-                                android:layout_width="10dp"
-                                android:layout_height="10dp"
-                                android:layout_gravity="top|right"
-                                android:layout_marginRight="15dp"
-                                android:background="@drawable/hongdian"
-                                android:textColor="@android:color/white"
-                                android:textSize="10.0dip"
-                                />
-                        </FrameLayout>
-
-                        <TextView
-                            android:id="@+id/more_menu_tv"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:gravity="center"
-                            android:text="@string/oamore_tltle"
-                            android:textColor="@color/white" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingBottom="10dp">
-
-
-                    <!--<TextView
-                        android:id="@+id/stroke"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:drawablePadding="@dimen/drawable_padding"
-                        android:drawableTop="@drawable/oa_6"
-                        android:gravity="center"
-                        android:text="我的行程"
-                        android:textColor="@color/white" />-->
-
-
-                    <TextView
-                        android:id="@+id/meeting"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:drawablePadding="@dimen/drawable_padding"
-                        android:drawableTop="@drawable/oa_3"
-                        android:gravity="center"
-                        android:text="@string/oametting_title"
-                        android:textColor="@color/white" />
-
-                    <TextView
-                        android:id="@+id/erp"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:drawablePadding="@dimen/drawable_padding"
-                        android:drawableTop="@drawable/oa_5"
-                        android:gravity="center"
-                        android:text="@string/oavacation_apply"
-                        android:textColor="@color/white" />
-
-                    <TextView
-                        android:id="@+id/outtask"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:drawablePadding="@dimen/drawable_padding"
-                        android:drawableTop="@drawable/oa_chuchai"
-                        android:gravity="center"
-                        android:text="@string/oatravel_apply"
-                        android:textColor="@color/white" />
-
-                    <TextView
-                        android:id="@+id/oamain_overtime_apply_tv"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:drawablePadding="@dimen/drawable_padding"
-                        android:drawableTop="@drawable/oa_jiaban"
-                        android:gravity="center"
-                        android:text="@string/oaovertime_apply"
-                        android:textColor="@color/white" />
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-        </LinearLayout>
-        <!--end 头布局-->
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <!--标签布局-->
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/subord_log"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text="@string/oasubordinate_work_calendar"
-                        android:textSize="16dp" />
-
-                    <View
-                        android:layout_width="2px"
-                        android:layout_height="match_parent"
-                        android:layout_margin="5dp"
-                        android:background="@color/default_shadow_color" />
-
-                    <TextView
-                        android:id="@+id/my_log"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text="@string/oamy_work_calender"
-                        android:textCursorDrawable="@color/yellow_home"
-                        android:textSize="16dp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp">
-
-                    <View
-                        android:id="@+id/subord_log_tag"
-                        android:layout_width="0dp"
-                        android:layout_height="4px"
-                        android:layout_marginRight="20dp"
-                        android:layout_weight="1"
-                        android:background="@color/darkorange" />
-
-                    <View
-                        android:id="@+id/my_log_tag"
-                        android:layout_width="0dp"
-                        android:layout_height="4px"
-                        android:layout_marginLeft="20dp"
-                        android:layout_weight="1"
-                        android:background="@color/item_line" />
-                </LinearLayout>
-                <!--end 标签布局-->
-
-                <!--年月日布局-->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="35dp"
-                    android:layout_gravity="center_horizontal"
-                    android:gravity="center">
-
-                    <TextView
-                        android:id="@+id/yeas_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="@color/text_main"
-                        android:textSize="@dimen/text_main" />
-
-                    <TextView
-                        android:id="@+id/day_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="@color/text_main"
-                        android:textSize="@dimen/text_main" />
-
-                    <TextView
-                        android:id="@+id/week_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:textColor="@color/text_main"
-                        android:textSize="@dimen/text_main" />
-                </LinearLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="2px"
-                    android:background="@color/item_line"
-                    android:visibility="gone" />
-
-                <android.support.v4.view.ViewPager
-                    android:id="@+id/viewPager"
-                    android:layout_width="match_parent"
-                    android:layout_height="230dp" />
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1px"
-                    android:background="@color/item_line" />
-                <!--end 年月日布局-->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/all_task_num"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginRight="10dp"
-                        android:gravity="center"
-                        android:text="@string/work_calender"
-                        android:textSize="@dimen/text_hine" />
-
-                    <View
-                        android:layout_width="1px"
-                        android:layout_height="match_parent"
-                        android:background="@color/item_line" />
-
-                    <TextView
-                        android:id="@+id/ok_task_num"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center|left"
-                        android:paddingLeft="12dp"
-                        android:text="@string/done"
-                        android:textSize="@dimen/text_hine" />
-
-                    <View
-                        android:layout_width="1px"
-                        android:layout_height="match_parent"
-                        android:background="@color/item_line" />
-
-                    <TextView
-                        android:id="@+id/uok_task_num"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center|left"
-                        android:paddingLeft="12dp"
-                        android:text="@string/undone"
-                        android:textSize="@dimen/text_hine" />
-
-                    <ImageView
-                        android:id="@+id/ok_scale"
-                        android:layout_width="wrap_content"
-                        android:layout_height="18dp"
-                        android:layout_marginRight="8dp"
-                        android:gravity="center"
-                        android:src="@drawable/filter" />
-
-                    <View
-                        android:layout_width="1px"
-                        android:layout_height="match_parent"
-                        android:background="@color/item_line" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="2px"
-                    android:background="@color/item_line" />
-
-                <com.core.widget.MyListView
-                    android:id="@+id/oa_listview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="30dp"
-                    android:divider="@color/item_line"
-                    android:dividerHeight="2px"
-                    android:focusableInTouchMode="false" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/oa_more_menu_ll"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:visibility="gone"
-                >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="#6A6A6A"
-                    android:orientation="horizontal"
-                    android:paddingBottom="10dp">
-
-                    <TextView
-                        android:id="@+id/oamain_special_attendance_tv"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:drawablePadding="@dimen/drawable_padding"
-                        android:drawableTop="@drawable/oa_8"
-                        android:gravity="center"
-                        android:text="@string/oaspecial_attendance_apply"
-                        android:textColor="@color/white" />
-
-
-                    <LinearLayout
-                        android:id="@+id/oamain_sign_statistical_tv"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:orientation="vertical"
-                        android:paddingLeft="5dp"
-                        android:visibility="visible">
-
-                        <FrameLayout
-                            android:id="@+id/notice_head_area"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="20dp">
-
-                            <ImageView
-                                android:id="@+id/notice_avatar_img"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:background="@color/transparent"
-                                android:contentDescription="@string/app_name"
-                                android:padding="0dp"
-                                android:src="@drawable/kaoqintongji" />
-
-                            <TextView
-                                android:id="@+id/oamain_sign_statistical_notice_tv"
-                                android:layout_width="10dp"
-                                android:layout_height="10dp"
-                                android:layout_gravity="top|right"
-                                android:layout_marginRight="15dp"
-                                android:background="@drawable/hongdian"
-                                android:textColor="@android:color/white"
-                                android:textSize="10.0dip"
-                                />
-                        </FrameLayout>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="13dp"
-                            android:layout_marginTop="5dp"
-                            android:gravity="center"
-                            android:text="@string/work_statistics"
-                            android:textColor="@color/white" />
-                    </LinearLayout>
-
-
-                    <LinearLayout
-                        android:id="@+id/oamain_expense_reimbursement_ll"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:orientation="vertical"
-                        android:paddingLeft="5dp"
-                        android:visibility="visible">
-
-                        <FrameLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="20dp">
-
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:background="@color/transparent"
-                                android:contentDescription="@string/app_name"
-                                android:padding="0dp"
-                                android:src="@drawable/reimbursement" />
-
-                            <TextView
-                                android:id="@+id/expense_reimbursement_hd_tv"
-                                android:layout_width="10dp"
-                                android:layout_height="10dp"
-                                android:layout_gravity="top|right"
-                                android:layout_marginRight="15dp"
-                                android:background="@drawable/hongdian"
-                                android:textColor="@android:color/white"
-                                android:textSize="10.0dip"
-                                />
-                        </FrameLayout>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="13dp"
-                            android:layout_marginTop="5dp"
-                            android:gravity="center"
-                            android:text="@string/Expense_reimbursement"
-                            android:textColor="@color/white" />
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/release_switch_tv3"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:textColor="@color/white"
-                        android:visibility="gone" />
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:textColor="@color/white" />
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/oa_more_cancel_ll"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="#40000000"
-                    android:orientation="horizontal">
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-        </FrameLayout>
-    </LinearLayout>
-
-
-</com.handmark.pulltorefresh.library.PullToRefreshScrollView><!---->

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

@@ -1439,5 +1439,6 @@
     <string name="obtain_pdf_path">正在获取报表文件资源,请稍候...</string>
     <string name="download_paused">下载已暂停</string>
     <string name="str_reloading">正在加载....</string>
+    <string name="sales_statistics">销售看板</string>
 
 </resources>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -1551,5 +1551,6 @@
     <string name="obtain_pdf_path">正在获取报表文件资源,请稍候...</string>
     <string name="download_paused">下载已暂停</string>
     <string name="str_reloading">正在加载....</string>
+    <string name="sales_statistics">销售看板</string>
 
 </resources>

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

@@ -1540,5 +1540,6 @@
     <string name="obtain_pdf_path">正在获取报表文件资源,请稍候...</string>
     <string name="download_paused">下载已暂停</string>
     <string name="str_reloading">正在加载....</string>
+    <string name="sales_statistics">销售看板</string>
 
 </resources>

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

@@ -1883,4 +1883,5 @@
     <string name="obtain_pdf_path">正在获取报表文件资源,请稍候...</string>
     <string name="download_paused">下载已暂停</string>
     <string name="str_reloading">正在加载....</string>
+    <string name="sales_statistics">销售看板</string>
 </resources>

app_core/common/src/main/assets/work_menu.json

@@ -1,4 +1,58 @@
 [
+  {
+    "moduleName": "UU应用",
+    "isLocalModule": true,
+    "moduleTag": "uu_application",
+    "moduleId": "",
+    "moduleVisible": true,
+    "moduleList": [
+      {
+        "isLocalMenu": true,
+        "menuName": "预约小秘书",
+        "menuIcon": "ic_work_subscribe_secretary",
+        "menuActivity": "com.modular.booking.BookingListActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "UU运动",
+        "menuIcon": "ic_work_uu_sports",
+        "menuActivity": "com.modular.appme.UURanking",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "商旅服务",
+        "menuIcon": "ic_work_business_travel_service",
+        "menuActivity": "",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "一元捐",
+        "menuIcon": "ic_work_charitable_donations",
+        "menuActivity": "com.modular.work.CharitableActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "产城服务",
+        "menuIcon": "ic_work_city_industry_service",
+        "menuActivity": "com.modular.cityIndustry.CityIndustryServiceMainActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      }
+    ]
+  },
   {
     "moduleName": "行政办公",
     "isLocalModule": true,
@@ -224,60 +278,6 @@
       }
     ]
   },
-  {
-    "moduleName": "UU应用",
-    "isLocalModule": true,
-    "moduleTag": "uu_application",
-    "moduleId": "",
-    "moduleVisible": true,
-    "moduleList": [
-      {
-        "isLocalMenu": true,
-        "menuName": "预约小秘书",
-        "menuIcon": "ic_work_subscribe_secretary",
-        "menuActivity": "com.modular.booking.BookingListActivity",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "UU运动",
-        "menuIcon": "ic_work_uu_sports",
-        "menuActivity": "com.modular.appme.UURanking",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "商旅服务",
-        "menuIcon": "ic_work_business_travel_service",
-        "menuActivity": "",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "一元捐",
-        "menuIcon": "ic_work_charitable_donations",
-        "menuActivity": "com.modular.work.CharitableActivity",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "产城服务",
-        "menuIcon": "ic_work_city_industry_service",
-        "menuActivity": "com.modular.cityIndustry.CityIndustryServiceMainActivity",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
-      }
-    ]
-  },
   {
     "moduleName": "优软云平台",
     "isLocalModule": true,

app_core/common/src/main/assets/work_menu_b2b.json

@@ -1,4 +1,58 @@
 [
+  {
+    "moduleName": "UU应用",
+    "isLocalModule": true,
+    "moduleTag": "uu_application",
+    "moduleId": "",
+    "moduleVisible": true,
+    "moduleList": [
+      {
+        "isLocalMenu": true,
+        "menuName": "预约小秘书",
+        "menuIcon": "ic_work_subscribe_secretary",
+        "menuActivity": "com.modular.booking.BookingListActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "UU运动",
+        "menuIcon": "ic_work_uu_sports",
+        "menuActivity": "com.modular.appme.UURanking",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "商旅服务",
+        "menuIcon": "ic_work_business_travel_service",
+        "menuActivity": "",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "一元捐",
+        "menuIcon": "ic_work_charitable_donations",
+        "menuActivity": "com.modular.work.CharitableActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "产城服务",
+        "menuIcon": "ic_work_city_industry_service",
+        "menuActivity": "com.modular.cityIndustry.CityIndustryServiceMainActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      }
+    ]
+  },
   {
     "moduleName": "行政办公",
     "isLocalModule": true,
@@ -89,60 +143,6 @@
       }
     ]
   },
-  {
-    "moduleName": "UU应用",
-    "isLocalModule": true,
-    "moduleTag": "uu_application",
-    "moduleId": "",
-    "moduleVisible": true,
-    "moduleList": [
-      {
-        "isLocalMenu": true,
-        "menuName": "预约小秘书",
-        "menuIcon": "ic_work_subscribe_secretary",
-        "menuActivity": "com.modular.booking.BookingListActivity",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "UU运动",
-        "menuIcon": "ic_work_uu_sports",
-        "menuActivity": "com.modular.appme.UURanking",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "商旅服务",
-        "menuIcon": "ic_work_business_travel_service",
-        "menuActivity": "",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "一元捐",
-        "menuIcon": "ic_work_charitable_donations",
-        "menuActivity": "com.modular.work.CharitableActivity",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "产城服务",
-        "menuIcon": "ic_work_city_industry_service",
-        "menuActivity": "com.modular.cityIndustry.CityIndustryServiceMainActivity",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
-      }
-    ]
-  },
   {
     "moduleName": "优软云平台",
     "isLocalModule": true,

app_core/common/src/main/java/com/core/app/Constants.java

@@ -17,7 +17,8 @@ public class Constants {
 		String url = "";
 		if (BaseConfig.isDebug()) {
 			url = IM_BASE_URL_TEST;
-		} else {
+            url = IM_BASE_URL;
+        } else {
 			url = IM_BASE_URL;
 		}
 		return url;

app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -229,11 +229,12 @@ public class MyApplication extends BaseApplication {
 		DatabaseManager.initializeInstance(DBOpenHelper.getInstance(this));
 	}
 
-	
+
 	public void initShareAPI() {
 		PlatformConfig.setWeixin("wx2539cc96bf158e00", "b057aa3e807ba7c505a2f03cc541bbf6");
 		PlatformConfig.setSinaWeibo("493318722", "7def652c3683603b08bab87d34b1f944");
 		PlatformConfig.setQQZone("1104894295", "Nk8zMIz5YSqwRQ1F");
+//		Config.IsToastTip = false;
 	}
 
 	private void initUmengStatistics() {
@@ -348,7 +349,7 @@ public class MyApplication extends BaseApplication {
 				.showImageForEmptyUri(R.drawable.avatar_normal)
 				.showImageOnFail(R.drawable.avatar_normal)
 				.showImageOnLoading(R.drawable.avatar_normal).build();
-             
+
 		if (mPicturesDir!=null) {
 			ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this)
 					.defaultDisplayImageOptions(mNormalImageOptions)
@@ -381,8 +382,8 @@ public class MyApplication extends BaseApplication {
 					.build();
 			ImageLoader.getInstance().init(config);
 		}
-	
-		
+
+
 	}
 
 

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -361,6 +361,9 @@ public class ViewUtil {
                     String result = msg.getData().getString("result");
                     try {
                         if (JSONUtil.validate(result) && result != null) {
+                            //登录ERP成功，清除B2B缓存
+                            CommonUtil.clearSharedPreferences(ct, Constants.B2B_SESSION_CACHE);
+                            CommonUtil.clearSharedPreferences(ct, Constants.B2B_UID_CACHE);
                             boolean success = JSON.parseObject(result).getBoolean("success");
                             if (success) {
                                 Intent intent = new Intent("com.app.home.update");
@@ -1064,5 +1067,7 @@ public class ViewUtil {
         CommonUtil.clearSharedPreferences(ct, "Master_ch");
         CommonUtil.clearSharedPreferences(ct, "erp_emname");
         CommonUtil.clearSharedPreferences(ct, "userRole");
+        CommonUtil.clearSharedPreferences(ct, Constants.B2B_SESSION_CACHE);
+        CommonUtil.clearSharedPreferences(ct, Constants.B2B_UID_CACHE);
     }
 }

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -112,8 +112,8 @@ public class CommonUtil {
         if (ct == null) {
             return "";
         }
-        return "https://admin-city.ubtob.com/";
-//        return "https://city-service.ubtob.com/city/thxz/";
+//        return "https://admin-city.ubtob.com/";
+        return "https://city-service.ubtob.com/city/thxz/";
 //        return "http://192.168.253.31:8687/city/thxz/";
     }
 

app_core/common/src/main/java/com/core/utils/NotifyUtils.java

@@ -31,10 +31,10 @@ public class NotifyUtils {
             if (crouton != null) {
                 crouton.cancel();
 
-                crouton = Crouton.makeText((Activity) cont, msg, Style.holoGreenLight, 5000);
+                crouton = Crouton.makeText((Activity) cont, msg, Style.holoGreenLight, 1000);
                 crouton.show();
             } else {
-                crouton = Crouton.makeText((Activity) cont, msg, Style.holoGreenLight, 5000);
+                crouton = Crouton.makeText((Activity) cont, msg, Style.holoGreenLight, 1000);
                 crouton.show();
             }
         } else {

app_core/common/src/main/java/com/core/utils/StatusBarUtil.java

@@ -18,8 +18,7 @@ import java.lang.reflect.Method;
 import java.util.regex.Pattern;
 
 /**
- * 状态栏透明
- * Created by SCWANG on 2016/10/26.
+ * 状态栏工具类(状态栏沉浸，状态栏颜色改变)
  */
 
 @SuppressWarnings("unused")

app_core/common/src/main/res/layout/activity_client.xml

@@ -13,7 +13,7 @@
         android:orientation="horizontal"
         android:padding="10dp"
         android:weightSum="4"
-        android:visibility="visible">
+        android:visibility="gone">
 
         <LinearLayout
             android:layout_width="match_parent"

app_core/common/src/main/res/layout/activity_oamain.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?><!--com.handmark.pulltorefresh.library.PullToRefreshScrollView -->
-<com.handmark.pulltorefresh.library.PullToRefreshScrollView android:id="@+id/oamain_ptrsv"
-                                                            xmlns:android="http://schemas.android.com/apk/res/android"
-                                                            android:layout_width="match_parent"
-                                                            android:layout_height="match_parent"
-                                                            android:background="#EBE9E9"
-                                                            android:fillViewport="true">
+<com.handmark.pulltorefresh.library.PullToRefreshScrollView
+    android:id="@+id/oamain_ptrsv"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#EBE9E9"
+    android:fillViewport="true">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -18,7 +19,7 @@
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:orientation="vertical"
-            android:visibility="visible">
+            android:visibility="gone">
             <!--头布局-->
             <LinearLayout
                 android:id="@+id/oa_rl_choose"

app_core/network/src/main/java/com/me/network/app/http/HttpClient.java

@@ -122,7 +122,6 @@ public class HttpClient {
         //默认的参数
         public Builder() {
             this.method = Method.GET;
-//            this.headers.put("User-Agent", "android_agent");//用户代理，用于平台接口验证
             this.headers.put("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
         }
 

app_core/network/src/main/java/com/me/network/app/http/impl/RetrofitImpl.java

@@ -89,9 +89,7 @@ public class RetrofitImpl extends HttpBase {
                     }
                 });
 
-        LogInterceptor logInterceptor = new LogInterceptor();
-        logInterceptor.setBuilder(mbuilder);
-//        mOkBuilder.addInterceptor(logInterceptor);
+        LogInterceptor logInterceptor = new LogInterceptor(mbuilder);
         mOkBuilder.addNetworkInterceptor(logInterceptor);
         if (mbuilder.getCacheFileSize() != 0) {
             mOkBuilder.cache(new Cache(mbuilder.getCacheFile(), mbuilder.getCacheFileSize()));

app_core/network/src/main/java/com/me/network/app/http/interceptor/LogInterceptor.java

@@ -1,20 +1,18 @@
 package com.me.network.app.http.interceptor;
 
-import android.util.Log;
-
-import com.alibaba.fastjson.JSON;
 import com.me.network.app.http.HttpClient;
 
 import java.io.IOException;
-import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.Map;
 
 import okhttp3.FormBody;
 import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
+import okhttp3.MediaType;
 import okhttp3.Request;
 import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 public class LogInterceptor implements Interceptor {
 
@@ -47,7 +45,11 @@ public class LogInterceptor implements Interceptor {
                             .build();
                 }
             }
-            request = request.newBuilder().removeHeader("User-Agent").build();
+            request = request.newBuilder()
+                    .removeHeader("User-Agent")
+                    .removeHeader("Accept-Encoding")
+                    .build();
+
             if (params != null) {
                 //get请求    添加公共参数
                 if (request.method().equals("GET")) {
@@ -81,18 +83,14 @@ public class LogInterceptor implements Interceptor {
         }
 
         Response response = chain.proceed(request);
-        okhttp3.MediaType mediaType = response.body().contentType();
-        String content = response.body().string();
-        if (builder.isDebug()) {
-            Log.d("HttpLogs", "接口URL:" + URLDecoder.decode(JSON.toJSONString(response.request().url().toString()), "UTF-8"));
-            Log.d("HttpLogs", "请求头:" + URLDecoder.decode(JSON.toJSONString(response.request().headers().toMultimap()), "UTF-8"));
-            Log.d("HttpLogs", "参数:" + URLDecoder.decode(postParam.toString(), "UTF-8"));
-            Log.d("HttpLogs", "返回结果:" + content);
+        if (response.body() != null && response.body().contentType() != null) {
+            MediaType mediaType = response.body().contentType();
+            String content = response.body().string();
+            ResponseBody responseBody = ResponseBody.create(mediaType, content);
+            return response.newBuilder().body(responseBody).build();
+        } else {
+            return response;
         }
-
-        return response.newBuilder()
-                .body(okhttp3.ResponseBody.create(mediaType, content))
-                .build();
     }
 
     public void setBuilder(HttpClient builder) {

app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkFuncSetActivity.java

@@ -48,6 +48,7 @@ public class WorkFuncSetActivity extends BaseMVPActivity<WorkPlatPresenter> impl
 //        linearLayoutManager.setRecycleChildrenOnDetach(true);
 //        mFuncRecyclerView.setItemViewCacheSize(0);
         mFuncRecyclerView.setLayoutManager(linearLayoutManager);
+        mFuncRecyclerView.setNestedScrollingEnabled(false);
 
         mWorkMenuBeans = new ArrayList<>();
         mHideWorkMenuBeans = new ArrayList<>();
@@ -110,8 +111,9 @@ public class WorkFuncSetActivity extends BaseMVPActivity<WorkPlatPresenter> impl
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onOptionsItemSelected(final MenuItem item) {
         if (item.getItemId() == R.id.sort_complete) {
+            item.setEnabled(false);
             List<WorkMenuBean> workMenuBeans = mWorkFuncSetParentAdapter.getWorkMenuBeans();
             workMenuBeans.addAll(mHideWorkMenuBeans);
             String resultJson = JSON.toJSONString(workMenuBeans);
@@ -121,6 +123,7 @@ public class WorkFuncSetActivity extends BaseMVPActivity<WorkPlatPresenter> impl
             new Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
+                    item.setEnabled(true);
                     if (WorkFuncSetActivity.this == null
                             || WorkFuncSetActivity.this.isDestroyed()
                             || WorkFuncSetActivity.this.isFinishing()) {

app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkModuleSortActivity.java

@@ -3,6 +3,7 @@ package com.uas.appworks.activity;
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Handler;
+import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
@@ -78,11 +79,13 @@ public class WorkModuleSortActivity extends BaseMVPActivity<WorkPlatPresenter> i
         mLayoutManager = new LinearLayoutManager(this);
         mAddRecyclerView.setLayoutManager(mLayoutManager);
         mAddRecyclerView.setNestedScrollingEnabled(false);
+        mAddRecyclerView.setItemAnimator(new DefaultItemAnimator());
         mAddRecyclerView.addItemDecoration(new RecycleViewDivider(this, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light)));
 
         mLayoutManager = new LinearLayoutManager(this);
         mDeleteRecyclerView.setLayoutManager(mLayoutManager);
         mDeleteRecyclerView.setNestedScrollingEnabled(false);
+        mDeleteRecyclerView.setItemAnimator(new DefaultItemAnimator());
         mDeleteRecyclerView.addItemDecoration(new RecycleViewDivider(this, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light)));
 
         mAddRecyclerView.setAdapter(mWorkModuleSortAddAdapter);
@@ -111,7 +114,9 @@ public class WorkModuleSortActivity extends BaseMVPActivity<WorkPlatPresenter> i
             public void onDeleteItemClick(View view, int position) {
                 if (mAddWorkMenuBeans != null && mDeleteWorkMenuBeans != null && mAddWorkMenuBeans.size() > 0) {
                     mDeleteWorkMenuBeans.add(mAddWorkMenuBeans.get(position));
+//                    mWorkModuleSortDeleteAdapter.notifyItemInserted(mDeleteWorkMenuBeans.size() - 1);
                     mAddWorkMenuBeans.remove(position);
+//                    mWorkModuleSortAddAdapter.notifyItemRemoved(position);
                     mWorkModuleSortAddAdapter.notifyDataSetChanged();
                     mWorkModuleSortDeleteAdapter.notifyDataSetChanged();
                     visiableOrGone();
@@ -124,7 +129,9 @@ public class WorkModuleSortActivity extends BaseMVPActivity<WorkPlatPresenter> i
             public void onAddItemClick(View view, int position) {
                 if (mDeleteWorkMenuBeans != null && mAddWorkMenuBeans != null && mDeleteWorkMenuBeans.size() > 0) {
                     mAddWorkMenuBeans.add(mDeleteWorkMenuBeans.get(position));
+//                    mWorkModuleSortAddAdapter.notifyItemInserted(mAddWorkMenuBeans.size() - 1);
                     mDeleteWorkMenuBeans.remove(position);
+//                    mWorkModuleSortDeleteAdapter.notifyItemRemoved(position);
                     mWorkModuleSortAddAdapter.notifyDataSetChanged();
                     mWorkModuleSortDeleteAdapter.notifyDataSetChanged();
                     visiableOrGone();
@@ -238,6 +245,8 @@ public class WorkModuleSortActivity extends BaseMVPActivity<WorkPlatPresenter> i
             mDeleteTextView.setVisibility(View.VISIBLE);
             mDeleteRecyclerView.setVisibility(View.VISIBLE);
         }
+
+        this.getRootView().postInvalidate();
     }
 
     @Override
@@ -252,8 +261,9 @@ public class WorkModuleSortActivity extends BaseMVPActivity<WorkPlatPresenter> i
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onOptionsItemSelected(final MenuItem item) {
         if (item.getItemId() == R.id.sort_complete) {
+            item.setEnabled(false);
             List<WorkMenuBean> resultList = new ArrayList<>();
             List<WorkMenuBean> addWorkMenuBeans = mWorkModuleSortAddAdapter.getWorkMenuBeans();
             List<WorkMenuBean> deleteWorkMenuBeans = mWorkModuleSortDeleteAdapter.getWorkMenuBeans();
@@ -270,6 +280,7 @@ public class WorkModuleSortActivity extends BaseMVPActivity<WorkPlatPresenter> i
             new Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
+                    item.setEnabled(true);
                     if (WorkModuleSortActivity.this == null
                             || WorkModuleSortActivity.this.isDestroyed()
                             || WorkModuleSortActivity.this.isFinishing()) {

app_modular/appworks/src/main/java/com/uas/appworks/adapter/WorkModuleSortAddAdapter.java

@@ -113,7 +113,7 @@ public class WorkModuleSortAddAdapter extends RecyclerView.Adapter<WorkModuleSor
             public void onClick(View view) {
                 if (mOnDeleteItemClickListener != null) {
                     msg.setModuleVisible(false);
-                    mOnDeleteItemClickListener.onDeleteItemClick(view, holder.getLayoutPosition());
+                    mOnDeleteItemClickListener.onDeleteItemClick(view, holder.getAdapterPosition());
                 }
             }
         });

app_modular/appworks/src/main/java/com/uas/appworks/adapter/WorkModuleSortDeleteAdapter.java

@@ -44,14 +44,15 @@ public class WorkModuleSortDeleteAdapter extends RecyclerView.Adapter<WorkModule
     }
 
     @Override
-    public void onBindViewHolder(MyViewHolder holder, final int position) {
+    public void onBindViewHolder(final MyViewHolder holder, final int position) {
         holder.contentTextView.setText(mWorkMenuBeans.get(position).getModuleName());
         holder.addImageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 if (mOnAddItemClickListener != null) {
-                    mWorkMenuBeans.get(position).setModuleVisible(true);
-                    mOnAddItemClickListener.onAddItemClick(view, position);
+                    int realPosition = holder.getAdapterPosition();
+                    mWorkMenuBeans.get(realPosition).setModuleVisible(true);
+                    mOnAddItemClickListener.onAddItemClick(view, realPosition);
                 }
             }
         });

app_modular/appworks/src/main/res/layout/activity_work_module_sort.xml

@@ -31,7 +31,7 @@
             android:background="@color/white"
             android:fadingEdge="none"
             android:overScrollMode="never"
-            android:scrollbars="none" />
+            android:scrollbars="none"/>
 
 
         <TextView
@@ -51,7 +51,7 @@
             android:layout_height="wrap_content"
             android:background="@color/white"
             android:overScrollMode="never"
-            android:scrollbars="none" />
+            android:scrollbars="none"/>
 
     </LinearLayout>