Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

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/java/com/xzjmyk/pm/activity/ui/platform/task/TaskActivity.java

@@ -273,7 +273,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
-        mEmptyLayout.showEmpty();
+//        mEmptyLayout.showEmpty();
         //加载网络数据
         new Thread(new getallprocess_run()).start();
 //        sendResquestForServer("START", 2);

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/AndroidManifest.xml

@@ -19,7 +19,8 @@
         <activity android:name="com.core.widget.view.Activity.SearchLocationActivity"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="stateUnspecified|adjustNothing" />
-        <activity android:name="com.core.widget.view.Activity.SelectActivity"/>
+        <activity android:name="com.core.widget.view.Activity.SelectActivity">
+        </activity>
         <activity
             android:name="com.core.widget.view.selectcalendar.SelectCalendarActivity"
             android:label="@string/title_activity_select_calendar"/>

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/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");
@@ -1070,5 +1073,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

@@ -113,8 +113,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/appbooking/src/main/java/com/modular/booking/activity/utils/GridSelectActivity.java

@@ -63,7 +63,7 @@ public class GridSelectActivity extends OABaseActivity{
                }
            }
         }
-        LogUtil.d("GridSelectActivity","models:"+JSON.toJSONString(menuModels));
+        LogUtil.prinlnLongMsg("GridSelectActivity","models:"+JSON.toJSONString(menuModels));
         itemAdapter = new ItemRoomsSelectAdapter(mContext, menuModels);
         gvTopic.setAdapter(itemAdapter);
     }

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/PlatContactAddPeopleActivity.java

@@ -21,6 +21,7 @@ import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
+import com.core.widget.view.Activity.SelectActivity;
 import com.uas.appcontact.R;
 
 import java.util.ArrayList;
@@ -150,7 +151,7 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
             formBeaan.add(selectBean);
         }
 
-        Intent intent = new Intent("com.modular.common.SelectActivity");
+        Intent intent = new Intent(ct, SelectActivity.class);
         intent.putExtra("type", 2);
         intent.putExtra("title", getString(R.string.select_jobs));
         intent.putParcelableArrayListExtra("data", formBeaan);
@@ -165,7 +166,7 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
             selectBean.setName(mDepartment[i]);
             formBeaan.add(selectBean);
         }
-        Intent intent = new Intent("com.modular.common.SelectActivity");
+        Intent intent = new Intent(ct,SelectActivity.class);
         intent.putExtra("type", 2);
         intent.putExtra("title", getString(R.string.select_department));
         intent.putParcelableArrayListExtra("data", formBeaan);
@@ -208,7 +209,7 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
     }
 
     private void saveRequest() {
-        if (!CommonUtil.isReleaseVersion()){
+        if (!CommonUtil.isNetWorkConnected(ct)){
             ToastMessage(getString(R.string.networks_out));
             return;
         }

app_modular/appme/src/main/AndroidManifest.xml

@@ -77,5 +77,7 @@
             />
         <activity android:name=".settings.activity.TableSetActivity"/>
         <activity android:name=".settings.activity.TableListActivity"/>
+        <activity android:name=".settings.activity.FindWagePWActivity"
+            android:label="修改查询密码"/>
     </application>
 </manifest>

app_modular/appme/src/main/java/com/uas/appme/settings/activity/CheckWagesActivity.java

@@ -1,17 +1,42 @@
 package com.uas.appme.settings.activity;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.text.InputType;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.PopupWindow;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import com.alibaba.fastjson.JSON;
 import com.andreabaccega.widget.FormEditText;
+import com.baidu.cyberplayer.utils.G;
+import com.common.LogUtil;
+import com.common.config.BaseConfig;
 import com.common.data.DateFormatUtil;
-import com.common.data.ListUtils;
+import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
+import com.common.system.DisplayUtil;
+import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.utils.CommonUtil;
 import com.core.utils.time.wheel.DatePicker;
+import com.iflytek.cloud.thirdparty.V;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
 
 import java.util.Calendar;
@@ -31,11 +56,107 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
     private String myearmonth = DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyyMM");//默认当前月
     private String checkYear;
     private String checkMonth;
+    private TextView mTel;
+    private String master;
+    private EditText inputPSEt;
+    private ImageView eye_im;
+    private Boolean canSeePW = false;
+    private String emcode;
+    private TextView seconds_tv;
+    private long SecondT = 59;
+    private boolean isRun = false;
+    private Handler timeHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            if (msg.what==1212) {
+                SecondT--;
+                seconds_tv.setText(SecondT+"");
+                if (SecondT==0) {
+                    seconds_tv.setVisibility(View.INVISIBLE);
+                    mWagesCodeBtn.setVisibility(View.VISIBLE);
+                    isRun = false;
+                }
+                Log.i("HttpLogs",SecondT+"");
+            }
+        }
+    };
+
+    /**
+     * 开启倒计时
+     */
+    private void startRun() {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                // TODO Auto-generated method stub
+                while (isRun) {
+                    try {
+                        Thread.sleep(1000); // sleep 1000ms
+                        Message message = Message.obtain();
+                        message.what = 1212;
+                        timeHandler.sendMessage(message);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }).start();
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         initView();
+        checkIsHavePassword();//查询是设置过查询密码
+    }
+
+    private void checkIsHavePassword() {
+        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("mobile/salary/checkPassword.action")
+                .add("phone",mTel.getText().toString())
+                .add("emcode",emcode)
+                .add("em_uu",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
+                .add("master",master)
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                LogUtil.prinlnLongMsg("checkPassword", o.toString()+"");
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                if (o.toString().contains("success") && !JSON.parseObject(o.toString()).getBoolean("success"))
+                    showSetPWW();
+
+            }
+        }));
+    }
+
+    //设置查询密码PP
+    private PopupWindow popupWindow = null;
+    private void showSetPWW() {
+        // 一个自定义的布局，作为显示的内容
+        View contentView = LayoutInflater.from(ct).inflate(
+                R.layout.set_wage_password, null);
+        contentView.findViewById(R.id.cancel_tv).setOnClickListener(this);
+        contentView.findViewById(R.id.sure_btn).setOnClickListener(this);
+        eye_im = (ImageView) contentView.findViewById(R.id.eye_im);
+        eye_im.setOnClickListener(this);
+        inputPSEt = (EditText)contentView.findViewById(R.id.input_ps_et);
+
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        int w_screen = dm.widthPixels;
+        int h_screen = dm.heightPixels;
+        w_screen = DisplayUtil.dip2px(this, 300);
+        h_screen = DisplayUtil.dip2px(this, 200);
+        popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
+        popupWindow.setTouchable(true);
+        popupWindow.setOutsideTouchable(false);
+        // 如果不设置PopupWindow的背景，无论是点击外部区域还是Back键都无法dismiss弹框
+        popupWindow.setBackgroundDrawable(getResources().getDrawable(com.uas.appworks.R.drawable.pop_round_bg));
+        // 设置好参数之后再show
+        popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
+        setbg(0.4f);
     }
 
     private void initView() {
@@ -43,15 +164,22 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
         getSupportActionBar().setTitle("工资条查询");
 
         mWagesDate = (TextView) findViewById(R.id.wages_date);
-        mWagesPhoneEt = (FormEditText) findViewById(R.id.wages_phone_et);
         mWagesPasswordEt = (FormEditText) findViewById(R.id.wages_password_et);
         mWagesCodeEt = (FormEditText) findViewById(R.id.wages_code_et);
         mWagesCodeBtn = (Button) findViewById(R.id.wages_code_btn);
         mCheckBtn = (Button) findViewById(R.id.check_btn);
-
+        mTel = (TextView) findViewById(R.id.wages_phone_tv);
+        findViewById(R.id.forget_password_btn).setOnClickListener(this);
         mWagesDate.setOnClickListener(this);
         mWagesCodeBtn.setOnClickListener(this);
         mCheckBtn.setOnClickListener(this);
+        seconds_tv = (TextView)findViewById(R.id.seconds_tv);
+
+        mTel.setText(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"user_phone"));
+        master = CommonUtil.getSharedPreferences(ct, "erp_master");
+//        emcode = MyApplication.getInstance().getLoginUserId();
+        emcode = "U0747";
+
     }
 
     @Override
@@ -73,16 +201,152 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                 }
             });
             picker.show();
-        }else if (id == R.id.wages_code_btn){
+        }else if (id == R.id.wages_code_btn){//获取验证码
+            if (!CommonUtil.isNetWorkConnected(ct)){
+                ToastMessage(getString(R.string.common_notlinknet));
+                return;
+            }
+            HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+            httpClient.Api().send(new HttpClient.Builder()
+                    .url("mobile/salary/verificationCode.action")
+//                    .header("Cookie","JSESSIONID="+CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"))
+                    .add("phone",mTel.getText().toString())
+                    .method(Method.POST)
+                    .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+                @Override
+                public void onResponse(Object o) {
+                    LogUtil.prinlnLongMsg("verificationCode", o.toString()+"");
+                    if (!JSONUtil.validate(o.toString()) || o == null) return;
+                    if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")) {
+                        Toast.makeText(ct,"短信发送成功,请在一分钟内完成输入查询",Toast.LENGTH_LONG).show();
+                        mWagesCodeBtn.setVisibility(View.INVISIBLE);
+                        seconds_tv.setVisibility(View.VISIBLE);
+                        mWagesCodeEt.setText(JSON.parseObject(o.toString()).getString("vecode")+"");
+                        isRun = true;
+                        startRun();
+                    }
 
+                }
+            }));
         }else if (id == R.id.check_btn){
             if (StringUtil.isEmpty(checkYear) || StringUtil.isEmpty(checkMonth)){
                 ToastMessage("请输入查询日期");
                 return;
-            }else
-                startActivity(new Intent(this,WagesDetailsActivity.class)
-                .putExtra("checkYear",checkYear)
-                .putExtra("checkMonth",checkMonth));
+            }else if (StringUtil.isEmpty(mWagesCodeEt.getText().toString())){
+                ToastMessage("请输入验证码");
+                return;
+            }else if (StringUtil.isEmpty(mWagesPasswordEt.getText().toString())){
+                ToastMessage("请输入查询密码");
+                return;
+            }
+            searchWage();
+        }else if (id == R.id.cancel_tv){
+            popupWindow.dismiss();
+        }else if (id == R.id.sure_btn){
+            if (StringUtil.isEmpty(inputPSEt.getText().toString())){
+                ToastMessage("请输入查询密码");
+                return;
+            }
+            if (inputPSEt.getText().toString().length()<6){
+                ToastMessage("请设置至少6位数查询密码");
+                return;
+            }
+            doSavePW();
+        }else if (id == R.id.forget_password_btn){//忘记密码
+            startActivity(new Intent(ct,FindWagePWActivity.class));
+        }else if (id == R.id.eye_im){
+            if (canSeePW){
+                canSeePW = false;
+                inputPSEt.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                eye_im.setImageResource(R.drawable.icon_unshow);
+            }else {
+                canSeePW = true;
+                inputPSEt.setInputType(InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
+                eye_im.setImageResource(R.drawable.icon_show);
+            }
+        }
+    }
+
+    private void doSavePW() {
+        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("mobile/salary/changePassword.action")
+                .add("emcode", emcode)
+                .add("password",inputPSEt.getText().toString())
+                .add("phone",mTel.getText().toString())
+                .add("em_uu",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
+                .add("master",master)
+                .method(Method.POST)
+                .header("Cookie","JSESSIONID="+CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"))
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                LogUtil.prinlnLongMsg("changePassword", o.toString()+"");
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+
+                if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")){
+                    Toast.makeText(ct, "设置密码成功", Toast.LENGTH_LONG).show();
+                    popupWindow.dismiss();
+                }
+
+            }
+        }));
+    }
+
+    private void searchWage() {
+        //        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("mobile/salary/getEmSalary.action")
+                .add("emcode", emcode)
+                .add("password",mWagesPasswordEt.getText().toString())
+                .add("phone",mTel.getText().toString())
+                .add("vecode",mWagesCodeEt.getText().toString())
+                .add("date",checkYear+"-"+checkMonth)
+                .add("master",master)
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                LogUtil.prinlnLongMsg("getEmSalary", o.toString()+"");
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")){
+                    startActivity(new Intent(ct,WagesDetailsActivity.class)
+                            .putExtra("checkYear",checkYear)
+                            .putExtra("checkMonth",checkMonth)
+                            .putExtra("WageDatas",o.toString()));
+                }else if (o.toString().contains("reason")){
+                    ToastMessage(JSON.parseObject(o.toString()).getString("reason"));
+                }
+
+            }
+        }));
+    }
+    private void setbg(float alpha) {
+        setBackgroundAlpha(this, alpha);
+        if (popupWindow == null) return;
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                setBackgroundAlpha(CheckWagesActivity.this, 1f);
+            }
+        });
+    }
+
+    /**
+     * 设置页面的透明度
+     * 兼容华为手机（在个别华为手机上 设置透明度会不成功）
+     *
+     * @param bgAlpha 透明度   1表示不透明
+     */
+    public void setBackgroundAlpha(Activity activity, float bgAlpha) {
+        WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+        lp.alpha = bgAlpha;
+        if (bgAlpha == 1) {
+            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//不移除该Flag的话,在有视频的页面上的视频会出现黑屏的bug
+        } else {
+            activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//此行代码主要是解决在华为手机上半透明效果无效的bug
         }
+        activity.getWindow().setAttributes(lp);
     }
 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/FindWagePWActivity.java

@@ -0,0 +1,195 @@
+package com.uas.appme.settings.activity;
+
+import android.os.Bundle;
+import android.text.InputType;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
+import com.common.config.BaseConfig;
+import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.utils.CommonUtil;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.uas.appme.R;
+
+/**
+ * Created by FANGlh on 2017/12/11.
+ * function:
+ */
+
+public class FindWagePWActivity extends BaseActivity implements View.OnClickListener {
+    private LinearLayout mStep1Ll;
+    private EditText mPhoneEt;
+    private TextView mClearphoneTv;
+    private Button mNext1Btn;
+    private LinearLayout mStep2Ll;
+    private TextView mTelTv;
+    private EditText mCodeEt;
+    private Button mNext2Btn;
+    private LinearLayout mStep3Ll;
+    private EditText mSetpwEt;
+    private ImageView mEyeTv;
+    private Button mNext3Btn;
+    private Boolean canSeePW  = false;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.wage_forgetps);
+
+        initView();
+    }
+
+    private void initView() {
+
+        mStep1Ll = (LinearLayout) findViewById(R.id.step1_ll);
+        mPhoneEt = (EditText) findViewById(R.id.phone_et);
+        mClearphoneTv = (TextView) findViewById(R.id.clearphone_tv);
+        mNext1Btn = (Button) findViewById(R.id.next1_btn);
+        mStep2Ll = (LinearLayout) findViewById(R.id.step2_ll);
+        mTelTv = (TextView) findViewById(R.id.tel_tv);
+        mCodeEt = (EditText) findViewById(R.id.code_et);
+        mNext2Btn = (Button) findViewById(R.id.next2_btn);
+        mStep3Ll = (LinearLayout) findViewById(R.id.step3_ll);
+        mSetpwEt = (EditText) findViewById(R.id.setpw_et);
+        mEyeTv = (ImageView) findViewById(R.id.eye_tv);
+        mNext3Btn = (Button) findViewById(R.id.next3_btn);
+
+        mNext1Btn.setOnClickListener(this);
+        mNext2Btn.setOnClickListener(this);
+        mNext3Btn.setOnClickListener(this);
+        mEyeTv.setOnClickListener(this);
+        mClearphoneTv.setOnClickListener(this);
+
+        showStepView(1);
+    }
+
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+
+        if (id == R.id.next1_btn){
+            if (StringUtil.isEmpty(mPhoneEt.getText().toString())){
+                ToastMessage("请输入手机号");
+                return;
+            }
+            mTelTv.setText(mPhoneEt.getText().toString());
+            HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+            httpClient.Api().send(new HttpClient.Builder()
+                    .url("mobile/salary/verificationCode.action")
+//                    .header("Cookie","JSESSIONID="+CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"))
+                    .add("phone",mPhoneEt.getText().toString())
+                    .method(Method.POST)
+                    .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+                @Override
+                public void onResponse(Object o) {
+                    LogUtil.prinlnLongMsg("verificationCode", o.toString()+"");
+                    if (!JSONUtil.validate(o.toString()) || o == null) return;
+                    if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")){
+                        Toast.makeText(ct,"短信发送成功,请在一分钟内完成输入验证",Toast.LENGTH_LONG).show();
+                        mCodeEt.setText(JSON.parseObject(o.toString()).getString("vecode")+"");
+                        showStepView(2);
+                    }
+
+                }
+            }));
+        }else if (id == R.id.next2_btn){
+            if (StringUtil.isEmpty(mCodeEt.getText().toString())){
+                ToastMessage("请输入验证码");
+                return;
+            }
+            showStepView(3);
+        }else if (id == R.id.next3_btn){
+            if (StringUtil.isEmpty(mSetpwEt.getText().toString())){
+                ToastMessage("请输入新密码");
+                return;
+            }
+            if (mSetpwEt.getText().toString().length()<6){
+                ToastMessage("请设置至少6位数查询密码");
+                return;
+            }
+                doChangePW();
+        }else if (id == R.id.eye_tv){
+            if (canSeePW){
+                canSeePW = false;
+                mSetpwEt.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                mEyeTv.setImageResource(R.drawable.icon_unshow);
+            }else {
+                canSeePW = true;
+                mSetpwEt.setInputType(InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
+                mEyeTv.setImageResource(R.drawable.icon_show);
+            }
+        }else if (id == R.id.clearphone_tv){
+
+        }
+    }
+
+    private void doChangePW() {
+        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("mobile/salary/changePassword.action")
+                .add("emcode", "U0747")
+                .add("password",mSetpwEt.getText().toString())
+                .add("phone",mPhoneEt.getText().toString())
+                .add("em_uu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
+                .add("master",CommonUtil.getSharedPreferences(ct, "erp_master"))
+                .header("Cookie","JSESSIONID="+CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"))
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                LogUtil.prinlnLongMsg("changePassword", o.toString()+"");
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+
+                if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")){
+                    Toast.makeText(ct, "设置密码成功", Toast.LENGTH_LONG).show();
+                    finish();
+                }
+
+            }
+        }));
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void showStepView(int step){
+       switch (step){
+           case 1:
+               mStep1Ll.setVisibility(View.VISIBLE);
+               mStep2Ll.setVisibility(View.GONE);
+               mStep3Ll.setVisibility(View.GONE);
+               break;
+           case 2:
+               mStep1Ll.setVisibility(View.GONE);
+               mStep2Ll.setVisibility(View.VISIBLE);
+               mStep3Ll.setVisibility(View.GONE);
+               break;
+           case 3:
+               mStep1Ll.setVisibility(View.GONE);
+               mStep2Ll.setVisibility(View.GONE);
+               mStep3Ll.setVisibility(View.VISIBLE);
+               break;
+       }
+    }
+}

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingActivity.java

@@ -379,7 +379,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
     private void doSave() {
         if (mUserNameTv.testValidity() && mUserSexTv.testValidity()
-                && mUserTelTv.testValidity()){
+                && mUserTelTv.testValidity() && mUserEmailTv.testValidity()){
             if (!StringUtil.isEmpty(mUserEmailTv.getText().toString())) {
                 if (mUserEmailTv.getText().toString().contains("@")){
                     saveRequest();
@@ -409,9 +409,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         params.put("sm_email",mUserEmailTv.getText().toString());
         LogUtil.prinlnLongMsg("appPersonSet",JSONUtil.map2JSON(params));
 
-        HttpClient httpClient =
-//                new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
-                    new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appPersonSet")
                 .add("map", JSONUtil.map2JSON(params))
@@ -459,18 +457,15 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
     }
 
     private void jumpTo() {
-        /*Map<String,Object> formStoreMap = new HashMap<>();
+      /*  Map<String,Object> formStoreMap = new HashMap<>();
         formStoreMap.put("userName",mUserNameTv.getText().toString());
         formStoreMap.put("userSex","男".equals(mUserSexTv.getText().toString()) ? "M" : "F");
         formStoreMap.put("userTel",mUserTelTv.getText().toString());
         formStoreMap.put("userEmail",mUserEmailTv.getText().toString());
 
-        HttpClient httpClient =
-//                new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
-                new HttpClient.Builder("http://uas.ubtob.com/")
-                        .isDebug(true).build(true);
+       HttpClient httpClient = new HttpClient.Builder("http://192.168.253.192:8088/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
-                .url("mobile/adduser/user")
+                .url("platform-b2b/mobile/adduser/user \n")
                 .add("formStore", JSONUtil.map2JSON(formStoreMap))
                 .add("dept",mUserDepartmentEv.getText().toString())
                 .add("role",mUserJobTv.getText().toString())
@@ -503,7 +498,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
             }
         }));*/
 
-        if (!StringUtil.isEmpty(sm_id)){
+       if (!StringUtil.isEmpty(sm_id)){
             Toast.makeText(ct,getString(R.string.update_success),Toast.LENGTH_LONG).show();
             setResult(20);
         }else {
@@ -587,6 +582,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
     private int sendM = 0;
     private void sendMessages( final String modeid, final String name, final String phone) {
+        sendM++;
         StringJsonObjectRequest<AddAttentionResult> request = new StringJsonObjectRequest<AddAttentionResult>(
                 Request.Method.POST, "http://message.ubtob.com/sms/send", new Response.ErrorListener() {
             @Override
@@ -596,10 +592,8 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         }, new StringJsonObjectRequest.Listener<AddAttentionResult>() {
             @Override
             public void onResponse(ObjectResult<AddAttentionResult> result) {
-                sendM++;
                 if (sendM == 2){
                     Toast.makeText(ct,"短信发送成功",Toast.LENGTH_LONG).show();
-                    jumpTo();
                 }
             }
         }, AddAttentionResult.class, null) {
@@ -619,6 +613,9 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
             }
         };
         MyApplication.getInstance().getFastVolley().addDefaultRequest("Volley", request);
+
+        if (sendM == 2)
+            jumpTo();
     }
 
     private void showSelectSexDialog() {

app_modular/appme/src/main/java/com/uas/appme/settings/activity/WagesDetailsActivity.java

@@ -4,32 +4,51 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.Handler;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.Toast;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
-import com.core.app.Constants;
-import com.core.app.MyApplication;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
+import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
+import com.lidroid.xutils.HttpUtils;
+import com.lidroid.xutils.exception.HttpException;
+import com.lidroid.xutils.http.RequestParams;
+import com.lidroid.xutils.http.ResponseInfo;
+import com.lidroid.xutils.http.callback.RequestCallBack;
+import com.lidroid.xutils.http.client.HttpRequest;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
+import com.uas.appme.settings.adapter.WagesDetailsAdapter;
 import com.uas.appme.settings.handwritedemo.LinePathView;
+import com.uas.appworks.OA.erp.model.KVMode;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 
 /**
  * Created by FANGlh on 2017/11/10.
@@ -43,44 +62,98 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     private PopupWindow setWindow = null;//
     private LinePathView pathView;
     public static String plainpath= Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "sign.png";
+    private ArrayList<KVMode> kvModeList;
+    private JSONObject salaryObject;
+    private WagesDetailsAdapter myAdapter;
+    private String sl_id = null;
+    private Boolean platform;
+    private ImageView clear_im;
+    private String master;
+    private String emcode;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.wages_details_activity);
+        platform = ApiUtils.getApiModel() instanceof ApiPlatform;
         initView();
 
     }
 
-    private void initData() {
-        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
-        httpClient.Api().send(new HttpClient.Builder()
-                .url("mobile/salary/getEmSalary.action")
-                .add("emcode", MyApplication.getInstance().getLoginUserId())
-                .add("date",checkYear+checkMonth)
-                .method(Method.POST)
-                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
-            @Override
-            public void onResponse(Object o) {
-                if (!JSONUtil.validate(o.toString()) || o == null) return;
-                LogUtil.prinlnLongMsg("getEmSalary", o.toString()+"");
 
-            }
-        }));
+    private void showDatas(String result) {
+        try {
+            JSONObject salaryObject = JSON.parseObject(result).getJSONObject("salary");
+            if (salaryObject != null){
+                JSONArray configsArray = salaryObject.getJSONArray("configs");
+                JSONObject dataObject = salaryObject.getJSONObject("data");
+                sl_id = dataObject.getString("sl_id");
+                if (!ListUtils.isEmpty(configsArray) && dataObject != null){
+                    for (int i = 0; i < configsArray.size(); i++) {
+                        String key = configsArray.getJSONObject(i).getString("Caption");
+                        String field = configsArray.getJSONObject(i).getString("Field");
+                        if (!StringUtil.isEmpty(key) && !StringUtil.isEmpty(field)){
+                            String value = dataObject.getString(field);
+                            if(!StringUtil.isEmpty(value)){
+                                KVMode kvMode = new KVMode(key,value);
+                                kvModeList.add(kvMode);
+                            }
+                        }
+
+                        if (i == configsArray.size() -1){
+                            myAdapter.setModeList(kvModeList);
+                            myAdapter.notifyDataSetChanged();
+                            LogUtil.prinlnLongMsg("fanglh",JSON.toJSONString(kvModeList));
+                        }
+                    }
+                }else
+                    mEmptyLayout.showEmpty();
+            }else
+                mEmptyLayout.showEmpty();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
+    private EmptyLayout mEmptyLayout;
     private void initView() {
+        //        emcode = MyApplication.getInstance().getLoginUserId();
+        emcode = "U0747";
+        master = CommonUtil.getSharedPreferences(ct, "erp_master");
         checkYear = getIntent().getStringExtra("checkYear");
         checkMonth = getIntent().getStringExtra("checkMonth");
         String title = checkYear + "年" + checkMonth + "月"+"工资";
         if (!StringUtil.isEmpty(checkYear) && !StringUtil.isEmpty(checkMonth))
-            initData();
         getSupportActionBar().setTitle(title);
 
         mWagesLv = (MyListView) findViewById(R.id.wages_lv);
         mBtnSignature = (Button) findViewById(R.id.btn_signature); mBtnSignature.setOnClickListener(this);
-    }
+        kvModeList = new ArrayList<>();
+        myAdapter = new WagesDetailsAdapter(this);
+
+        //设置适配器
+        mWagesLv.setAdapter(myAdapter);
 
+        mEmptyLayout = new EmptyLayout(this, mWagesLv);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
+        mEmptyLayout.setShowLoadingButton(false);
+//        findViewById(R.id.h_sign_tv).setOnClickListener(this);
+
+        String result = getIntent().getStringExtra("WageDatas");
+        showDatas(result);
+
+    }
+//    @Override
+//    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+//        if(resultCode==101 && requestCode == 101){
+//            BitmapFactory.Options options = new BitmapFactory.Options();
+//            options.inSampleSize = 2;
+//            Bitmap bm = BitmapFactory.decodeFile(plainpath, options);
+//            s_image.setImageBitmap(bm);
+//        }
+//
+//    }
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.btn_signature){
@@ -91,11 +164,11 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             pathView.clear();
             closePopupWindow();
         }
-        /*else if (v.getId() == R.id.hscreen_btn){
-            startActivityForResult(new Intent(this, LandscapeActivity.class)
-                    .putExtra("signCode",001)
-                    , 101);
-        }*/
+//        else if (v.getId() == R.id.h_sign_tv){
+//            startActivityForResult(new Intent(this, LandscapeActivity.class)
+//                            .putExtra("signCode",001)
+//                    , 101);
+//        }
         else if (v.getId() == R.id.submit_btn){
             if (pathView.getTouched())
             {
@@ -103,8 +176,9 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     pathView.save(plainpath,false,10);  //将图片路径保存到plainpath中，并获取Bimap对象
                     BitmapFactory.Options options = new BitmapFactory.Options();
                     options.inSampleSize = 2;
-                    Bitmap pathBm = BitmapFactory.decodeFile(plainpath, options);
-                    doSubmit(pathBm);
+                    Bitmap pathBm = BitmapFactory.decodeFile(plainpath);
+//                    doSubmit(pathBm,plainpath);
+                    doNewSubmit( pathBm, plainpath);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
@@ -114,25 +188,66 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         }
     }
 
-    /*  @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-         if(requestCode==101 && resultCode == 102){
-             BitmapFactory.Options options = new BitmapFactory.Options();
-             options.inSampleSize = 2;
-             Bitmap pathBm = BitmapFactory.decodeFile(plainpath, options);
-         }
+    private void doNewSubmit(Bitmap pathBm, String plainpath) {
+        String url = "http://192.168.253.58:8080/ERP/"+"mobile/salary/salaryBack.action";
+        byte[] ppp = getBitmapByte(pathBm);
+        RequestParams params = new RequestParams();
+        params.addBodyParameter("emcode", emcode);
+        params.addBodyParameter("sl_id",sl_id);
+        params.addBodyParameter("result","true");
+        params.addQueryStringParameter("master", master);
+        params.addBodyParameter("msg","");
+        params.addBodyParameter("img",new File(plainpath));
+        final HttpUtils http = new HttpUtils();
+        Log.i("urlparams",url+params+"");
 
-     }*/
-    private void doSubmit(Bitmap pathBm) {
-        Log.i("fanglh",plainpath+","+pathBm);
+        http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
+            @Override
+            public void onStart() {
+                ViewUtil.ToastMessage(ct, getString(R.string.sending_picture)+"...");
+            }
+            @Override
+            public void onSuccess(ResponseInfo<String> responseInfo) {
+                ViewUtil.ToastMessage(ct, getString(R.string.Uploaded_successfully));
+                Log.i("doNewSubmit",JSON.parseObject(responseInfo.result).toJSONString());
+                if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
+                    Toast.makeText(ct,"提交成功",Toast.LENGTH_LONG).show();
+                    closePopupWindow();
+                }
+                progressDialog.dismiss();
+                Toast.makeText(ct,getString(R.string.fangkui_success),Toast.LENGTH_LONG).show();
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+//                        finish();
+                    }
+                },1000);
+            }
+
+            @Override
+            public void onFailure(HttpException error, String msg) {
+                ViewUtil.ToastMessage(ct, getString(R.string.common_save_failed) + msg);
+                Log.i("doNewSubmit",error+","+msg);
+                progressDialog.dismiss();
+            }
+        });
+    }
 
-        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+    private void doSubmit(Bitmap pathBm,String plainpath) {
+        byte[] ppp = getBitmapByte(pathBm);
+        Log.i("fanglh",plainpath+","+pathBm+",ppp="+ppp);
+        clear_im.setImageBitmap(pathBm);
+//        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("mobile/salary/salaryBack.action")
-                .add("emcode", MyApplication.getInstance().getLoginUserId())
-                .add("sl_id","sl_id")
+                .header("img","img="+ppp)
+                .add("emcode", emcode)
+                .add("sl_id",sl_id)
                 .add("result",true)
-                .add("img","img")
+                .add("img", ppp)
+                .add("master", master)
+                .add("msg","")
                 .method(Method.POST)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
@@ -141,8 +256,19 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 LogUtil.prinlnLongMsg("salaryBack", o.toString()+"");
             }
         }));
-    }
 
+    }
+    private byte[] getBitmapByte(Bitmap bitmap){   //将bitmap转化为二进制字节流
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.JPEG, 100, out);
+        try {
+            out.flush();
+            out.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return out.toByteArray();
+    }
     private void showSiganWindow() {
         if (setWindow == null) initPopupWindow();
         setWindow.showAtLocation(getWindow().getDecorView().
@@ -157,6 +283,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         viewContext.findViewById(R.id.clear_im).setOnClickListener(this);
         viewContext.findViewById(R.id.cancel_tv).setOnClickListener(this);
 //        viewContext.findViewById(R.id.hscreen_btn).setOnClickListener(this);
+        clear_im = (ImageView) viewContext.findViewById(R.id.clear_im);
 
         pathView = (LinePathView) viewContext.findViewById(R.id.sigature_view);
         pathView.setPaintWidth(5);

app_modular/appme/src/main/java/com/uas/appme/settings/adapter/WagesDetailsAdapter.java

@@ -0,0 +1,65 @@
+package com.uas.appme.settings.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.common.data.ListUtils;
+import com.uas.appme.R;
+import com.uas.appworks.OA.erp.model.KVMode;
+
+import java.util.List;
+
+/**
+ * Created by FANGlh on 2017/11/29.
+ * function:
+ */
+
+public class WagesDetailsAdapter extends BaseAdapter {
+    private List<KVMode> modeList;
+    private Context mContext;
+
+    public WagesDetailsAdapter(Context mContext){
+        this.mContext = mContext;
+    }
+    public List<KVMode> getModeList() {
+        return modeList;
+    }
+    public void setModeList(List<KVMode> modeList) {
+        this.modeList = modeList;
+    }
+    @Override
+    public int getCount() {
+        return ListUtils.isEmpty(modeList) ? 0 : modeList.size();
+    }
+    @Override
+    public Object getItem(int position) {
+        return modeList.get(position);
+    }
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        WagesHolder wHolder;
+        if (convertView == null) {
+            wHolder = new WagesHolder();
+            convertView = View.inflate(mContext, R.layout.item_comkey_value, null);
+            wHolder.key = (TextView) convertView.findViewById(R.id.item_comdoc_am_list_tv);
+            wHolder.value = (TextView) convertView.findViewById(R.id.item_comdoc_am_value_tv);
+            convertView.setTag(wHolder);
+        } else {
+            wHolder = (WagesHolder) convertView.getTag();
+        }
+        wHolder.key.setText(modeList.get(position).getKey()+"");
+        wHolder.value.setText(modeList.get(position).getValue()+"");
+        return convertView;
+    }
+
+    class WagesHolder{
+        TextView key,value;
+    }
+}

app_modular/appme/src/main/res/layout/check_wages_activity.xml

@@ -9,15 +9,15 @@
         android:id="@+id/wages_date"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:text="2017年11月"
         android:gravity="center_vertical"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:drawableRight="@drawable/oa_next"
-        android:textSize="15sp"/>
+        android:textSize="15sp"
+        android:hint="请选择查询日期"/>
     <View
         android:layout_width="match_parent"
-        android:layout_height="2px"
+        android:layout_height="1px"
         android:background="@color/item_line" />
     <com.andreabaccega.widget.FormEditText
         android:id="@+id/wages_phone_et"
@@ -32,28 +32,61 @@
         android:gravity="center_vertical"
         android:inputType="number"
         android:maxLength="11"
+        android:visibility="gone"
         />
+
     <View
     android:layout_width="match_parent"
-    android:layout_height="2px"
+    android:layout_height="1px"
     android:background="@color/item_line" />
-    <com.andreabaccega.widget.FormEditText
-        android:id="@+id/wages_password_et"
+
+    <TextView
+        android:id="@+id/wages_phone_tv"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:textColor="@color/dark_dark_grey"
-        android:padding="10dp"
-        android:layout_centerVertical="true"
-        android:background="@null"
-        android:hint="请输入查询密码"
-        android:textSize="15sp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:drawableRight="@drawable/oa_next"
         android:gravity="center_vertical"
-        android:inputType="textPassword"
-        />
+        android:textSize="15sp" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/item_line" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp">
+        <com.andreabaccega.widget.FormEditText
+            android:id="@+id/wages_password_et"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:textColor="@color/dark_dark_grey"
+            android:padding="10dp"
+            android:layout_centerVertical="true"
+            android:background="@null"
+            android:hint="请输入查询密码"
+            android:textSize="15sp"
+            android:gravity="center_vertical"
+            android:inputType="textPassword"
+            />
+
+        <Button
+            android:id="@+id/forget_password_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:padding="10dp"
+            android:text="忘记密码"
+            android:textColor="@color/blue"
+            android:textSize="@dimen/text_main"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="10dp"
+            android:background="@color/white"
+            />
+    </RelativeLayout>
 
     <View
     android:layout_width="match_parent"
-    android:layout_height="2px"
+    android:layout_height="1px"
     android:background="@color/item_line" />
 
     <RelativeLayout
@@ -72,6 +105,7 @@
             android:textSize="15sp"
             android:gravity="center_vertical"
             android:maxLength="6"
+            android:inputType="number"
             />
         <Button
             android:id="@+id/wages_code_btn"
@@ -84,11 +118,29 @@
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
             android:background="@color/white"
+            android:visibility="visible"
+            />
+
+
+        <TextView
+            android:id="@+id/seconds_tv"
+            android:padding="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="59"
+            android:textColor="@color/red"
+            android:textSize="16sp"
+            android:layout_toLeftOf="@+id/wages_code_btn"
+            android:gravity="center_vertical"
+            android:maxLength="6"
+            android:visibility="gone"
+            android:layout_marginTop="5dp"
             />
+
     </RelativeLayout>
     <View
         android:layout_width="match_parent"
-        android:layout_height="2px"
+        android:layout_height="1px"
         android:background="@color/item_line" />
 
     <Button

app_modular/appme/src/main/res/layout/item_comkey_value.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/item_comdoc_am_list_tv"
+        android:layout_marginTop="5dp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="开始时间："
+        android:layout_marginRight="10dp"
+        android:textColor="#6E6E6E"
+        />
+
+    <TextView
+        android:id="@+id/item_comdoc_am_value_tv"
+        android:layout_marginTop="5dp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="2"
+        android:text="2016-11-25-21:22"
+        android:textColor="@color/done_approval"/>
+
+</LinearLayout>

app_modular/appme/src/main/res/layout/set_wage_password.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dp"
+    >
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="首次使用，请设置密码"
+            android:textSize="16sp"
+            />
+
+        <ImageView
+            android:id="@+id/cancel_tv"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:textSize="20sp"
+            android:src="@drawable/icon_del"
+            android:layout_alignParentRight="true"
+            />
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_marginTop="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp">
+
+        <EditText
+            android:id="@+id/input_ps_et"
+            android:background="@null"
+            android:layout_width="250dp"
+            android:layout_height="wrap_content"
+            android:hint="请输入查询密码(限20位)"
+            android:textSize="16sp"
+            android:maxLength="20"
+            android:inputType="textPassword"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
+        <ImageView
+            android:id="@+id/eye_im"
+            android:src="@drawable/icon_unshow"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_alignParentRight="true"
+          />
+
+    </RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/item_line" />
+   <Button
+       android:layout_marginTop="10dp"
+       android:id="@+id/sure_btn"
+       android:text="确认"
+       android:layout_gravity="center_horizontal"
+       android:layout_width="80dp"
+       android:layout_height="40dp"
+       android:background="@drawable/bg_bule_btn"
+       android:gravity="center"
+       />
+</LinearLayout>

app_modular/appme/src/main/res/layout/sigature_pop.xml

@@ -16,65 +16,82 @@
             android:textColor="@color/black"
             android:textSize="16sp"
             />
+
         <TextView
             android:id="@+id/cancel_tv"
             android:layout_alignParentRight="true"
-            android:layout_width="100dp"
+            android:layout_width="50dp"
             android:layout_height="wrap_content"
             android:text="取消"
             android:textColor="@color/LightBlue"
             android:textSize="16sp"
             android:gravity="right"
             />
+        <TextView
+            android:id="@+id/h_sign_tv"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:text="横屏签名"
+            android:textColor="@color/LightBlue"
+            android:textSize="16sp"
+            android:gravity="right"
+            android:layout_alignParentTop="true"
+            android:layout_toLeftOf="@id/cancel_tv"
+            android:visibility="gone"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:background="@color/white">
+
+            <Button
+                android:id="@+id/hscreen_btn"
+                android:layout_width="80dp"
+                android:layout_height="35dp"
+                android:layout_alignBottom="@+id/clear_im"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
+                android:background="@drawable/bg"
+                android:text="横屏签名"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/clear_im"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_alignParentRight="true"
+                android:layout_margin="10dp"
+                android:background="@color/white"
+                android:src="@drawable/icon_shuaxin" />
+
+            <View
+                android:id="@+id/view3"
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:layout_below="@+id/clear_im"
+                android:layout_marginTop="5dp"
+                android:background="@color/item_line" />
+
+            <com.uas.appme.settings.handwritedemo.LinePathView
+                android:id="@+id/sigature_view"
+                android:layout_width="match_parent"
+                android:layout_height="250dp"
+                android:layout_below="@+id/view3"
+                android:layout_gravity="center_horizontal"
+                android:background="@color/white" />
+
+        </RelativeLayout>
     </RelativeLayout>
     <View
         android:layout_marginTop="5dp"
         android:layout_width="match_parent"
         android:layout_height="2px"
         android:background="@color/item_line" />
-    <RelativeLayout
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="300dp"
-        android:background="@color/white">
-        <Button
-            android:id="@+id/hscreen_btn"
-            android:layout_width="80dp"
-            android:layout_height="35dp"
-            android:text="横屏签名"
-            android:background="@drawable/bg"
-            android:layout_alignBottom="@+id/clear_im"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_marginLeft="10dp"
-            android:layout_marginStart="10dp"
-            android:visibility="gone"/>
-        <ImageView
-            android:id="@+id/clear_im"
-            android:layout_alignParentRight="true"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:src="@drawable/common_header_boy"
-            android:layout_margin="10dp"
-            android:background="@color/white"/>
-        <View
-            android:id="@+id/view3"
-            android:layout_below="@+id/clear_im"
-            android:layout_marginTop="5dp"
-            android:layout_width="match_parent"
-            android:layout_height="2px"
-            android:background="@color/item_line" />
-        <com.uas.appme.settings.handwritedemo.LinePathView
-            android:id="@+id/sigature_view"
-            android:layout_width="match_parent"
-            android:layout_height="250dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_below="@+id/view3"
-            android:background="@color/white"
-            />
-    </RelativeLayout>
 
     <TextView
         android:gravity="center"
@@ -82,6 +99,7 @@
         android:text="签名区域"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:padding="10dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"/>
     <Button

app_modular/appme/src/main/res/layout/wage_forgetps.xml

@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="20dp">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <LinearLayout
+                android:id="@+id/step1_ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="visible">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="请输入手机号"
+                    android:textSize="20sp"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:layout_marginTop="30dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="手机号码"/>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <EditText
+                        android:id="@+id/phone_et"
+                        android:background="@null"
+                        android:layout_width="250dp"
+                        android:layout_height="wrap_content"
+                        android:hint="请输入手机号"
+                        android:padding="20dp"
+                        android:textSize="16sp"
+                        android:maxLength="11"
+                        android:inputType="number"
+                        android:textColor="@color/black"
+                        android:layout_alignParentTop="true"
+                        />
+                    <TextView
+                        android:id="@+id/clearphone_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="X"
+                        android:layout_alignParentRight="true"
+                        android:padding="20dp"
+                        android:textSize="20sp"
+                        />
+                </RelativeLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:background="@color/item_line" />
+                <Button
+                    android:id="@+id/next1_btn"
+                    android:layout_marginTop="20dp"
+                    android:text="下一步"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp"
+                    android:background="@drawable/bg_bule_btn"
+                    android:gravity="center"
+                    />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/step2_ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="visible">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="请输入验证码"
+                    android:textSize="20sp"
+                    android:textColor="@color/black"/>
+                <LinearLayout
+                    android:layout_marginTop="10dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="验证码已发送至手机："/>
+                    <TextView
+                        android:id="@+id/tel_tv"
+                        android:layout_marginLeft="10dp"
+                        android:textColor="@color/titleBlue"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="18812345678"/>
+                </LinearLayout>
+                <EditText
+                    android:layout_marginTop="20dp"
+                    android:id="@+id/code_et"
+                    android:background="@null"
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:hint="请输入验证码"
+                    android:padding="20dp"
+                    android:textSize="16sp"
+                    android:maxLength="11"
+                    android:inputType="number"
+                    android:textColor="@color/black"
+                    android:layout_alignParentTop="true"
+
+                    />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:background="@color/item_line" />
+                <Button
+                    android:id="@+id/next2_btn"
+                    android:layout_marginTop="20dp"
+                    android:text="下一步"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp"
+                    android:background="@drawable/bg_bule_btn"
+                    android:gravity="center"
+                    />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/step3_ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="visible">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="请设置密码"
+                    android:textSize="20sp"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:layout_marginTop="30dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="密码"/>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <EditText
+                        android:id="@+id/setpw_et"
+                        android:background="@null"
+                        android:layout_width="250dp"
+                        android:layout_height="wrap_content"
+                        android:hint="请输入新密码(限6-20位)"
+                        android:padding="20dp"
+                        android:textSize="16sp"
+                        android:maxLength="15"
+                        android:inputType="textPassword"
+                        android:textColor="@color/black"/>
+                    <ImageView
+                        android:id="@+id/eye_tv"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_alignParentRight="true"
+                        android:textSize="20sp"
+                        android:src="@drawable/icon_unshow"
+                        />
+                </RelativeLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_marginTop="5dp"
+                    android:layout_marginLeft="10dp"
+                    android:textColor="@color/titleBlue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="需6-20位字符"/>
+                <Button
+                    android:id="@+id/next3_btn"
+                    android:layout_marginTop="20dp"
+                    android:text="下一步"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp"
+                    android:background="@drawable/bg_bule_btn"
+                    android:gravity="center"
+                    />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>

app_modular/appme/src/main/res/layout/wages_details_activity.xml

@@ -5,7 +5,8 @@
     android:orientation="vertical">
     <TextView
         android:background="@color/white"
-        android:layout_margin="10dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="公告：本月工资发放内容包括了上个月的餐补，请大家查看明细"/>
@@ -29,20 +30,31 @@
 
                 android:id="@+id/wages_lv"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="10dp"
                 android:background="@color/white">
             </com.core.widget.MyListView>
-            <Button
-                android:id="@+id/btn_signature"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:background="@drawable/bg_bule_btn"
-                android:padding="10dp"
-                android:text="签字"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_main"
-                />
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btn_signature"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_bule_btn"
+                    android:padding="10dp"
+                    android:text="签字"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/text_main"
+                    android:layout_weight="1"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="30dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="30dp"
+                    /></LinearLayout>
         </LinearLayout>
    </com.core.widget.CustomerScrollView>
 

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/MessagePresenter.java

@@ -14,7 +14,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
-import com.common.config.BaseConfig;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
@@ -52,7 +51,6 @@ import com.modular.appmessages.activity.ProcessMsgActivity;
 import com.modular.appmessages.activity.RealTimeFormActivity;
 import com.modular.appmessages.activity.Subscription2Activity;
 import com.modular.appmessages.activity.UUHelperActivity;
-import com.modular.appmessages.activity.UUSportActivity;
 import com.modular.appmessages.db.SubsDao;
 import com.modular.appmessages.model.MessageHeader;
 import com.modular.appmessages.model.SubMessage;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/KVMode.java

@@ -0,0 +1,32 @@
+package com.uas.appworks.OA.erp.model;
+
+/**
+ * Created by FANGlh on 2017/11/29.
+ * function:
+ */
+
+public class KVMode {
+    private String key;
+    private String value;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public KVMode(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+}

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>