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

WeiChat/src/main/AndroidManifest.xml

@@ -123,6 +123,7 @@
         <!-- 启动页面 -->
         <activity
             android:name=".ui.SplashActivity"
+            android:hardwareAccelerated="true"
             android:icon="@drawable/uuu">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -280,9 +281,9 @@
             android:configChanges="keyboardHidden|orientation"
             android:hardwareAccelerated="true"
             android:label="@string/app_name"
-            android:theme="@style/MainBaseTheme"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
+            android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="stateUnspecified|adjustNothing">
             <intent-filter>
                 <action android:name="com.modular.main.MainActivity" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/SplashActivity.java

@@ -66,6 +66,7 @@ public class SplashActivity extends BaseActivity {
     private long mStartTimeMs;// 记录进入该界面时间，保证至少在该界面停留3秒
     private boolean mConfigReady = false;// 配置获取成功
     private GifDrawable mGifDrawable;
+    private boolean mAnimationCompleted = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -78,10 +79,12 @@ public class SplashActivity extends BaseActivity {
         try {
             mGifDrawable = new GifDrawable(getAssets(), "gif_splash_welcome.gif");
             mGifDrawable.setLoopCount(1);
-            mGifDrawable.setSpeed(1.4f);
+            mGifDrawable.setSpeed(1f);
             mGifDrawable.addAnimationListener(new AnimationListener() {
                 @Override
                 public void onAnimationCompleted(int loopNumber) {
+                    Log.d("gifdrawable", "AnimationCompleted");
+                    mAnimationCompleted = true;
                     if (isJumpable) {
                         jump();
                     }
@@ -178,8 +181,8 @@ public class SplashActivity extends BaseActivity {
         if (isDestroyed()) {
             return;
         }
-        boolean animationCompleted = mGifDrawable.isAnimationCompleted();
-        if (!animationCompleted) {
+        Log.d("gifdrawablejump", "animation->" + mAnimationCompleted);
+        if (!mAnimationCompleted) {
             return;
         }
 
@@ -278,8 +281,8 @@ public class SplashActivity extends BaseActivity {
                     } else {
                         PreferenceUtils.putString(TimeStatisticsActivity.Login_In, nowtime);
                     }
-                    boolean animationCompleted = mGifDrawable.isAnimationCompleted();
-                    if (animationCompleted) {
+                    Log.d("gifdrawableim", "animation->" + mAnimationCompleted);
+                    if (mAnimationCompleted) {
                         trun2NextPage(1);
                     }
                 } else {// 登录失败

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorkPlatFragment.java

@@ -10,6 +10,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -63,8 +64,9 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
     private String mUserId, mCompanyName, mMaster;
     private Resources mResources;
     private RefreshLayout mRefreshLayout;
-    private ImageView mHeaderImageView, mFuncImageView;
+    private ImageView mHeaderImageView, mFuncImageView, mHeaderWordImageView;
     private Toolbar mToolbar;
+    private RelativeLayout mHeaderRelativeLayout;
     private int mHeaderHeight;
 
     @Override
@@ -84,12 +86,14 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
             mWorkMenuListView = $(R.id.work_menu_lv);
             mRefreshLayout = $(R.id.fragment_work_refreshLayout);
             mHeaderImageView = $(R.id.work_plat_main_header_iv);
+            mHeaderRelativeLayout = $(R.id.work_plat_main_header_rl);
+            mHeaderWordImageView = $(R.id.work_plat_main_header_word_iv);
             mMasterTextView = $(R.id.work_plat_master_name_tv);
             mFuncImageView = $(R.id.work_plat_func_set_iv);
             mToolbar = $(R.id.work_plat_main_toolbar);
             StatusBarUtil.setPaddingSmart(mContext, mToolbar);
 
-            ViewGroup.LayoutParams layoutParams = mHeaderImageView.getLayoutParams();
+            ViewGroup.LayoutParams layoutParams = mHeaderRelativeLayout.getLayoutParams();
             mHeaderHeight = layoutParams.height;
 
             View setItem = LayoutInflater.from(mContext).inflate(R.layout.layout_work_plat_set, null);
@@ -156,18 +160,22 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
                 public void onHeaderPulling(RefreshHeader header, float percent, int offset, int headerHeight, int extendHeight) {
                     Log.d("工作台下拉", "offset->" + offset + "||percent->" + percent + "||headerHeight->" + headerHeight + "||extendHeight->" + extendHeight);
 
-                    ViewGroup.LayoutParams layoutParams = mHeaderImageView.getLayoutParams();
+                    ViewGroup.LayoutParams layoutParams = mHeaderRelativeLayout.getLayoutParams();
                     layoutParams.height = (int) (mHeaderHeight * (1 + percent));
-                    mHeaderImageView.setLayoutParams(layoutParams);
+                    mHeaderRelativeLayout.setLayoutParams(layoutParams);
+
+                    mHeaderWordImageView.setAlpha(percent > 1f ? 1f : percent);
                 }
 
                 @Override
                 public void onHeaderReleasing(RefreshHeader header, float percent, int offset, int headerHeight, int extendHeight) {
                     Log.d("工作台释放", "offset->" + offset + "||percent->" + percent + "||headerHeight->" + headerHeight + "||extendHeight->" + extendHeight);
 
-                    ViewGroup.LayoutParams layoutParams = mHeaderImageView.getLayoutParams();
+                    ViewGroup.LayoutParams layoutParams = mHeaderRelativeLayout.getLayoutParams();
                     layoutParams.height = (int) (mHeaderHeight * (1 + percent));
-                    mHeaderImageView.setLayoutParams(layoutParams);
+                    mHeaderRelativeLayout.setLayoutParams(layoutParams);
+
+                    mHeaderWordImageView.setAlpha(percent > 1f ? 1f : percent);
                 }
 
                 @Override
@@ -177,7 +185,8 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
 
                 @Override
                 public void onHeaderFinish(RefreshHeader header, boolean success) {
-                    mHeaderImageView.requestLayout();
+                    mHeaderRelativeLayout.requestLayout();
+                    mHeaderWordImageView.requestLayout();
                 }
 
                 @Override

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

@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/normal_bg"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/copy_right_tv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="5dp"
-        android:gravity="center"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
-        android:text="@string/about_us_copyright"
-        android:textColor="@color/dark_dark_grey"
-        android:textSize="@dimen/SmallerTextSize" />
-
-    <TextView
-        android:id="@+id/company_tv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/copy_right_tv"
-        android:layout_marginBottom="5dp"
-        android:gravity="center"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
-        android:text="@string/about_us_company"
-        android:textColor="@color/dark_dark_grey"
-        android:textSize="@dimen/SmallerTextSize" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/company_tv"
-        android:orientation="vertical" >
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="40dp"
-            android:contentDescription="@string/app_name"
-            android:src="@drawable/uuu" />
-
-        <TextView
-            android:id="@+id/version_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="10dp"
-            android:gravity="center"
-            android:textColor="@color/grgray"
-            android:textSize="@dimen/NormalTextSize" />
-        <View
-            android:layout_marginTop="20dp"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <RelativeLayout
-            android:id="@+id/me_name"
-            style="@style/IMTbleLine"
-            android:background="@drawable/selector_me_menu_item_bg">
-
-            <TextView
-                android:id="@+id/tv_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:gravity="center"
-                android:text="@string/about_remark"
-                android:textColor="@color/grgray"
-                android:textSize="16sp" />
-            <TextView
-                android:id="@+id/tv_name_value"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/iv_name"
-                android:layout_toRightOf="@+id/tv_name"
-                android:textColor="@color/dark_dark_grey" />
-            <ImageView
-                android:id="@+id/iv_name"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <RelativeLayout
-            android:id="@+id/me_function"
-            style="@style/IMTbleLine"
-            android:background="@drawable/selector_me_menu_item_bg">
-
-            <TextView
-                android:id="@+id/tv_function"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:gravity="center"
-                android:text="@string/about_function"
-                android:textColor="@color/grgray"
-                android:textSize="16sp" />
-            <TextView
-                android:id="@+id/tv_function_value"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/iv_function"
-                android:layout_toRightOf="@+id/tv_function"
-                android:textColor="@color/dark_dark_grey" />
-            <ImageView
-                android:id="@+id/iv_function"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <RelativeLayout
-            android:id="@+id/me_QRcode"
-            style="@style/IMTbleLine"
-            android:background="@drawable/selector_me_menu_item_bg">
-
-            <TextView
-                android:id="@+id/tv_QRcode"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:gravity="center"
-                android:text="@string/about_qcode"
-                android:textColor="@color/grgray"
-                android:textSize="16sp"/>
-            <TextView
-                android:id="@+id/tv_QRcode_value"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/iv_QRcode"
-                android:layout_toRightOf="@+id/tv_QRcode"
-                android:textColor="@color/dark_grey" />
-            <ImageView
-                android:id="@+id/iv_QRcode"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-    </LinearLayout>
-
-</RelativeLayout>

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

@@ -1,46 +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="match_parent"
-    android:orientation="vertical"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingSetActivity">
-      <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:padding="20dp"
-          android:orientation="horizontal">
-          <TextView
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content" 
-              android:layout_gravity="center_vertical"
-              android:text="@string/booking_times"/>
-          <TextView
-              android:id="@+id/tv_startTime"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_vertical"
-              style="@style/crm_business_btn"
-              android:text="00:00"/>
-          <TextView
-              android:id="@+id/tv_endTime"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_vertical"
-              style="@style/crm_business_btn"
-              android:text="23:59"/>
-      </LinearLayout>  
-    
-    <Button
-            android:id="@+id/submit_btn"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:background="@drawable/bg_bule_btn"
-            android:padding="10dp"
-            android:text="@string/app_button_commit"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_main" />
-</LinearLayout>

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

@@ -1,129 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#EBE9EA">
-
-    <ScrollView
-        android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-       >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_alignTop="@+id/reimbursement_title_fet"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true">
-
-            <EditText
-                android:id="@+id/text_edit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/full_edit_bg"
-                android:gravity="top"
-                android:hint="@string/please_unput_yourP"
-                android:inputType="textMultiLine"
-                android:minHeight="150dp"
-                android:padding="10dp"
-                android:textColor="@color/black"
-                android:textColorHint="@color/grey"
-                android:textSize="16sp"
-                android:maxLength="400"/>
-
-            <TextView
-                android:id="@+id/select_img_prompt_tv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="3dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="10dp"
-                android:shadowColor="@color/white"
-                android:shadowRadius="1"
-                android:text="@string/circle_select_image"
-                android:textColor="@color/gray"
-                android:textSize="14sp"
-                android:visibility="gone" />
-
-            <LinearLayout
-                android:visibility="visible"
-                android:id="@+id/select_img_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/white"
-                android:padding="10dp">
-
-                <com.core.widget.view.MyGridView
-                    android:id="@+id/grid_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:horizontalSpacing="3dp"
-                    android:listSelector="#00000000"
-                    android:numColumns="4"
-                    android:stretchMode="columnWidth"
-                    android:verticalSpacing="3dp" >
-                </com.core.widget.view.MyGridView>
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="20px"
-                android:background="@color/item_line"
-                android:visibility="gone" />
-
-            <LinearLayout
-                android:id="@+id/display_rl"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:clickable="true"
-                android:orientation="horizontal"
-                android:padding="10dp"
-                android:visibility="gone">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:text="联系电话"
-                    android:layout_marginRight="5dp"
-                    android:textColor="@color/text_hine"
-                   />
-
-                <TextView
-                    android:id="@+id/display_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="15814742959" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_marginTop="10dp"
-                android:id="@+id/bottom_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/display_rl"
-                android:background="#EBE9EA"
-                android:baselineAligned="false"
-                android:orientation="vertical"
-                android:padding="10dp">
-
-                <Button
-                    android:id="@+id/release_btn"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/bg_bule_btn"
-                    android:padding="10dp"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/text_main"
-                    android:text="@string/common_save_button" />
-            </LinearLayout>
-        </LinearLayout>
-
-    </ScrollView>
-</RelativeLayout>

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

@@ -1,120 +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="match_parent"
-    android:orientation="vertical"
-    tools:context=".ui.erp.activity.oa.AlarmaActivity">
-
-    <RelativeLayout
-        android:id="@+id/auto_rl"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:padding="10dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@string/auto_mission"
-            android:textSize="14sp" />
-
-        <com.core.widget.view.SwitchView
-            android:id="@+id/auto_sv"
-            android:layout_width="40dp"
-            android:layout_height="25dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true" />
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="@color/item_line" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="@color/item_line" />
-
-    <RelativeLayout
-        android:id="@+id/distance_rl"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:background="@drawable/selector_me_menu_item_bg"
-        android:padding="10dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@string/effective_range"
-            android:textSize="14sp" />
-
-
-        <TextView
-            android:id="@+id/distance_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:drawableRight="@drawable/oa_next"
-            android:textColor="@color/text_color"
-            android:textSize="14sp" />
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="@color/item_line" />
-
-    <RelativeLayout
-        android:id="@+id/time_rl"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:background="@drawable/selector_me_menu_item_bg"
-        android:padding="10dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@string/reserve_time"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/time_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:drawableRight="@drawable/oa_next"
-            android:textColor="@color/text_color"
-            android:textSize="14sp" />
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="@color/item_line" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:padding="10dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@string/neer_submit_able"
-            android:textSize="14sp" />
-
-        <com.core.widget.view.SwitchView
-            android:id="@+id/needprocess_sv"
-            android:layout_width="40dp"
-            android:layout_height="25dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true" />
-    </RelativeLayout>
-</LinearLayout>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/oa_bg"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MyRuleSetActivity">
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:background="@color/oa_bg"
+             tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MyRuleSetActivity">
 
     <RelativeLayout
         android:id="@+id/empty_rl"
@@ -35,7 +35,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="@dimen/item_height_min"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="12dp"
             android:background="@color/white"
             android:paddingLeft="10dp"
             android:paddingRight="10dp">
@@ -62,34 +62,15 @@
                 android:ellipsize="end"
                 android:gravity="right|center_vertical"
                 android:lines="1"
-                android:textColor="@color/text_hine"
+                android:textColor="#999999"
                 android:textSize="@dimen/text_hine" />
         </RelativeLayout>
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/item_height_min"
-            android:layout_marginTop="10dp"
-            android:background="@color/white"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:gravity="center_vertical"
-                android:text="@string/Set_Scheduling"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-        </RelativeLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="@dimen/item_height_min"
-            android:layout_marginTop="2px"
+            android:layout_marginTop="12dp"
             android:background="@color/white"
             android:paddingLeft="10dp"
             android:paddingRight="10dp">
@@ -112,7 +93,7 @@
                 android:layout_alignParentRight="true"
                 android:gravity="center_vertical"
                 android:text="@string/Normal_frequency"
-                android:textColor="@color/text_hine"
+                android:textColor="#999999"
                 android:textSize="@dimen/text_hine" />
         </RelativeLayout>
 
@@ -146,7 +127,7 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical|right"
                 android:lines="1"
-                android:textColor="@color/text_hine"
+                android:textColor="#999999"
                 android:textSize="@dimen/text_hine" />
         </RelativeLayout>
 
@@ -175,7 +156,7 @@
                 android:layout_height="match_parent"
                 android:layout_alignParentRight="true"
                 android:gravity="center_vertical"
-                android:textColor="@color/text_hine"
+                android:textColor="#999999"
                 android:textSize="@dimen/text_hine" />
         </RelativeLayout>
 
@@ -183,11 +164,12 @@
             android:id="@+id/click_tv"
             android:layout_width="match_parent"
             android:layout_height="@dimen/item_height_min"
-            android:layout_marginTop="2px"
+            android:layout_marginTop="12dp"
             android:background="@color/white"
-            android:gravity="center_vertical"
+            android:gravity="center"
             android:paddingLeft="10dp"
+            android:textSize="15sp"
             android:text="@string/MyAttendanceRules_legalHoliday"
-            android:textColor="@color/titleBlue" />
+            android:textColor="#1084D1" />
     </LinearLayout>
 </FrameLayout>

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

@@ -1,571 +0,0 @@
-<?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:background="@drawable/bg_main"
-    android:orientation="vertical">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="none"
-        android:paddingLeft="5dp"
-        android:paddingRight="10dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-
-            <!--公司-->
-            <RelativeLayout
-                android:id="@+id/rl_uas_website"
-                style="@style/IMTbleLine"
-                android:visibility="gone">
-
-                <TextView
-                    android:id="@+id/uas_website_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/uas_website_address"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/uas_website_tv"
-                    style="@style/IMTbleLine_TextValue"
-                    android:layout_toLeftOf="@+id/uas_website_arrow_img"
-                    android:layout_toRightOf="@+id/uas_website_text"
-                    android:textColor="@color/dark_dark_grey"
-                    android:textSize="12sp" />
-
-                <ImageView
-                    android:id="@+id/uas_website_arrow_img"
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/speech_recognition_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg"
-                android:visibility="gone">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="语音识别"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/new_step_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg"
-                android:visibility="gone">
-
-                <View
-                    android:id="@+id/view2"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:layout_alignParentBottom="true"
-                    android:background="@color/item_line" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="计步助手"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/uu_step_rl"
-                style="@style/IMTbleLine1"
-                android:background="@drawable/selector_me_menu_item_bg"
-                android:visibility="visible">
-
-                <View
-                    android:id="@+id/view3"
-                    android:layout_alignParentBottom="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-
-                <TextView
-                    android:id="@+id/uu_step_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/set_sport"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:id="@+id/uu_step_im"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toRightOf="@+id/uu_step_text"
-                    android:src="@drawable/uu_step"
-                    android:visibility="gone" />
-
-                <com.core.widget.view.SwitchView
-                    android:id="@+id/uu_step_reply"
-                    android:layout_width="40dp"
-                    android:layout_height="25dp"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true" />
-
-                <TextView
-                    android:id="@+id/tv_menu_setting"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
-                    android:layout_alignTop="@+id/tv_oa"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="5dp"
-                    android:layout_toLeftOf="@id/uu_step_reply"
-                    android:background="@drawable/hongdian"
-                    android:textColor="@android:color/white"
-                    android:textSize="10.0dip" />
-
-            </RelativeLayout>
-
-            <!--设置关闭推送-->
-            <RelativeLayout
-                android:id="@+id/close_push_rl"
-                style="@style/IMTbleLine1"
-                android:background="@drawable/selector_me_menu_item_bg">
-
-                <View
-                    android:id="@+id/view4"
-                    android:layout_alignParentBottom="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-
-                <TextView
-                    android:id="@+id/push_setting_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/set_push"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-                <com.core.widget.view.SwitchView
-                    android:id="@+id/cb_task_reply"
-                    android:layout_width="40dp"
-                    android:layout_height="25dp"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginBottom="17dp" />
-            </RelativeLayout>
-            <RelativeLayout
-                android:id="@+id/businessmen_setting_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
-                <View
-                    android:layout_alignParentBottom="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/business_setting"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-                <ImageView
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-                <TextView
-                    android:id="@+id/businessmen_setting_new"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
-                    android:layout_alignTop="@+id/tv_oa"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:layout_alignParentRight="true"
-                    android:background="@drawable/hongdian"
-                    android:textColor="@android:color/white"
-                    android:textSize="10.0dip" />
-            </RelativeLayout>
-            <RelativeLayout
-                android:id="@+id/sign_in_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
-
-                <View
-                    android:layout_alignParentBottom="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/set_sigin"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-                <ImageView
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-                <TextView
-                    android:id="@+id/tv_sign_new"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
-                    android:layout_alignTop="@+id/tv_oa"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:layout_alignParentRight="true"
-                    android:background="@drawable/hongdian"
-                    android:textColor="@android:color/white"
-                    android:textSize="10.0dip" />
-
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/sign_out_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
-                <View
-                    android:layout_alignParentBottom="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/activity_mission_set"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-                <ImageView
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-                <TextView
-                    android:id="@+id/tv_signauto_new"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
-                    android:layout_alignTop="@+id/tv_oa"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:layout_alignParentRight="true"
-                    android:background="@drawable/hongdian"
-                    android:textColor="@android:color/white"
-                    android:textSize="10.0dip" />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/booking_set_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
-                <View
-                    android:layout_alignParentBottom="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/booking_time_set"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-                <ImageView
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-                <TextView
-                    android:id="@+id/tv_booking_new"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
-                    android:layout_alignTop="@+id/tv_oa"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:layout_alignParentRight="true"
-                    android:background="@drawable/hongdian"
-                    android:textColor="@android:color/white"
-                    android:textSize="10.0dip" />
-            </RelativeLayout>
-            <!--清除缓存-->
-
-            <RelativeLayout
-                android:id="@+id/clear_cache_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
-                <View
-                    android:layout_alignParentBottom="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:id="@+id/cache_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/set_clear"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/cache_tv"
-                    style="@style/IMTbleLine_TextValue"
-                    android:layout_toLeftOf="@+id/cache_arrow_img"
-                    android:layout_toRightOf="@+id/cache_text"
-                    android:textColor="@color/dark_dark_grey" />
-
-                <ImageView
-                    android:id="@+id/cache_arrow_img"
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/use_help_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/Rated_suggest"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-                <TextView
-                    android:id="@+id/tv_help_new"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
-                    android:layout_alignTop="@+id/tv_oa"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:layout_alignParentRight="true"
-                    android:background="@drawable/hongdian"
-                    android:textColor="@android:color/white"
-                    android:textSize="10.0dip" />
-                <ImageView
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
-
-
-            <RelativeLayout
-                android:id="@+id/language_us_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/set_language"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-                <TextView
-                    android:id="@+id/tv_language_new"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
-                    android:layout_alignTop="@+id/tv_oa"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:layout_alignParentRight="true"
-                    android:background="@drawable/hongdian"
-                    android:textColor="@android:color/white"
-                    android:textSize="10.0dip" />
-
-                <ImageView
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:background="@color/item_line" />
-            <RelativeLayout
-
-                android:id="@+id/about_us_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
-                <View
-                    android:layout_alignParentBottom="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/set_about"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/share_rl"
-                style="@style/IMTbleLine"
-                android:visibility="gone">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text=" 分    享"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
-
-
-            <RelativeLayout
-                android:id="@+id/rl_app_update"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg"
-                android:clickable="true">
-                <View
-                    android:layout_alignParentBottom="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:id="@+id/version_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/set_version"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/version_value"
-                    style="@style/IMTbleLine_TextValue"
-                    android:layout_toLeftOf="@+id/version_arrow_img"
-                    android:layout_toRightOf="@+id/version_text"
-                    android:textColor="@color/dark_dark_grey" />
-
-                <ImageView
-                    android:id="@+id/version_arrow_img"
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
-
-            <Button
-                android:id="@+id/exit_btn"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginBottom="50dp"
-                android:layout_marginTop="30dp"
-                android:background="@drawable/bg_bule_btn"
-                android:padding="10dp"
-                android:text="@string/set_login_out"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>

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

@@ -8,12 +8,26 @@
     android:background="#e9f0f5"
     android:orientation="vertical">
 
-    <ImageView
-        android:id="@+id/work_plat_main_header_iv"
+    <RelativeLayout
+        android:id="@+id/work_plat_main_header_rl"
         android:layout_width="match_parent"
-        android:layout_height="120dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_work_header_bg" />
+        android:layout_height="120dp">
+
+        <ImageView
+            android:id="@+id/work_plat_main_header_iv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_work_header_bg" />
+
+        <ImageView
+            android:id="@+id/work_plat_main_header_word_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:alpha="0"
+            android:src="@drawable/ic_workplat_header_word" />
+    </RelativeLayout>
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -1,78 +0,0 @@
-<?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="wrap_content"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/share_2code"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/share_2code"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid" />
-
-    <TextView
-        android:id="@+id/change_style"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/change_style"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid" />
-
-    <TextView
-        android:id="@+id/save_to_MBphone"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/save_to_MBphone"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid" />
-
-    <TextView
-        android:id="@+id/scan_2dcode"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/scan_2dcode"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:background="@color/black_gray" />
-
-    <TextView
-        android:id="@+id/cancel_tv"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/common_cancel"
-        android:textColor="@color/red"
-        android:textSize="15sp" />
-
-</LinearLayout>

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

@@ -8,8 +8,8 @@
     android:layout_height="wrap_content"
     app:cardBackgroundColor="@color/white"
     app:cardCornerRadius="6dp"
-    app:cardElevation="4dp"
-    app:cardMaxElevation="4dp"
+    app:cardElevation="3dp"
+    app:cardMaxElevation="3dp"
     app:cardPreventCornerOverlap="true"
     app:cardUseCompatPadding="true">
 

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

@@ -1,65 +0,0 @@
-<?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="wrap_content"
-    android:orientation="vertical"
-    android:background="@color/white">
-
-    <TextView
-        android:id="@+id/basic_info_set_remark_name"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:text="@string/set_remark_name"
-        android:textColor="@color/black"
-        android:textSize="15sp"/>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid"/>
-    <TextView
-        android:id="@+id/basic_info_remove_blacklist"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:text="@string/remove_blacklist"
-        android:textColor="@color/black"
-        android:textSize="15sp"/>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid"/>
-    <TextView
-        android:id="@+id/basic_info_add_blacklist"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:textColor="@color/black"
-        android:text="@string/add_blacklist"
-        android:textSize="15sp"/>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid"/>
-    <TextView
-        android:id="@+id/basic_info_cancel_attention"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:textColor="@color/black"
-        android:text="@string/cancel_attention"
-        android:textSize="15sp"/>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid"/>
-    <TextView
-        android:id="@+id/basic_info_delete_all"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:text="@string/delete_all"
-        android:textColor="@color/red"
-        android:textSize="15sp"/>
-
-</LinearLayout>

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

@@ -1,44 +0,0 @@
-<?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:background="@color/white"
-    android:paddingTop="10dp"
-    android:paddingBottom="10dp">
-
-    <TextView
-        android:id="@+id/head_take_picture"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:gravity="center"
-        android:textColor="@color/black"
-        android:textSize="16sp"
-        android:text="@string/common_camera"/>
-    <View
-        style="@style/app_line_gray_1dp"
-        />
-
-    <TextView
-        android:id="@+id/head_select_photos"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:gravity="center"
-        android:text="@string/select_form_phoneablum"
-        android:textColor="@color/black"
-        android:textSize="16sp" />
-
-    <View
-        style="@style/app_line_gray_1dp"
-        android:layout_height="3dp"
-        />
-
-    <TextView
-        android:id="@+id/head_cancel"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:gravity="center"
-        android:text="@string/common_cancel"
-        android:textColor="@color/black"
-        android:textSize="16sp" />
-</LinearLayout>

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

@@ -1,78 +0,0 @@
-<?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="wrap_content"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/super_setting_tv"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/super_setting"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid" />
-
-    <TextView
-        android:id="@+id/work_setting_tv"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/work_setting"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid" />
-
-    <TextView
-        android:id="@+id/office_addr_setting_tv"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/office_addr_setting"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid" />
-
-    <TextView
-        android:id="@+id/my_rule_setting_tv"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/my_rule_setting"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:background="@color/black_gray" />
-
-    <TextView
-        android:id="@+id/cancel_tv"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/common_cancel"
-        android:textColor="@color/red"
-        android:textSize="15sp" />
-
-</LinearLayout>

app_core/common/src/main/res/drawable/selector_common_pop_bottom_item.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_common_pop_bottom_item_pressed" android:state_checked="true" />
+    <item android:drawable="@drawable/shape_common_pop_bottom_item_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_common_pop_bottom_item_pressed" android:state_selected="true" />
+    <item android:drawable="@drawable/shape_common_pop_bottom_item_normal" />
+</selector>

app_core/common/src/main/res/drawable/selector_common_pop_cancel_item.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_common_pop_cancel_item_pressed" android:state_checked="true" />
+    <item android:drawable="@drawable/shape_common_pop_cancel_item_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_common_pop_cancel_item_pressed" android:state_selected="true" />
+    <item android:drawable="@drawable/shape_common_pop_cancel_item_normal" />
+</selector>

app_core/common/src/main/res/drawable/selector_common_pop_item.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/common_pop_item_pressed" android:state_checked="true" />
+    <item android:drawable="@color/common_pop_item_pressed" android:state_pressed="true" />
+    <item android:drawable="@color/common_pop_item_pressed" android:state_selected="true" />
+    <item android:drawable="@color/common_pop_item_normal" />
+</selector>

app_core/common/src/main/res/drawable/selector_common_pop_single_item.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_common_pop_item_pressed" android:state_checked="true" />
+    <item android:drawable="@drawable/shape_common_pop_item_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_common_pop_item_pressed" android:state_selected="true" />
+    <item android:drawable="@drawable/shape_common_pop_item_normal" />
+</selector>

app_core/common/src/main/res/drawable/selector_common_pop_top_item.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_common_pop_top_item_pressed" android:state_checked="true" />
+    <item android:drawable="@drawable/shape_common_pop_top_item_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_common_pop_top_item_pressed" android:state_selected="true" />
+    <item android:drawable="@drawable/shape_common_pop_top_item_normal" />
+</selector>

app_core/common/src/main/res/drawable/shape_common_pop_bottom_item_normal.xml

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

app_core/common/src/main/res/drawable/shape_common_pop_bottom_item_pressed.xml

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

app_core/common/src/main/res/drawable/shape_common_pop_cancel_item_normal.xml

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

app_core/common/src/main/res/drawable/shape_common_pop_cancel_item_pressed.xml

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

app_core/common/src/main/res/drawable/shape_common_pop_item_normal.xml

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

app_core/common/src/main/res/drawable/shape_common_pop_item_pressed.xml

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

app_core/common/src/main/res/drawable/shape_common_pop_option_item.xml

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

app_core/common/src/main/res/drawable/shape_common_pop_top_item_normal.xml

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

app_core/common/src/main/res/drawable/shape_common_pop_top_item_pressed.xml

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

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/normal_bg"
-    android:orientation="vertical" >
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/normal_bg"
+                android:orientation="vertical">
 
     <TextView
         android:id="@+id/copy_right_tv"
@@ -35,13 +35,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/company_tv"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="40dp"
+            android:layout_marginTop="42dp"
             android:contentDescription="@string/app_name"
             android:src="@drawable/uuu" />
 
@@ -53,16 +53,17 @@
             android:layout_marginTop="10dp"
             android:gravity="center"
             android:textColor="@color/grgray"
-            android:textSize="@dimen/NormalTextSize" />
+            android:textSize="14sp" />
+
         <View
-            android:layout_marginTop="20dp"
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
+            android:layout_marginTop="20dp"
             android:background="@color/item_line" />
+
         <RelativeLayout
             android:id="@+id/me_name"
-            style="@style/IMTbleLine"
-            android:background="@drawable/selector_me_menu_item_bg">
+            style="@style/commonSettingItem">
 
             <TextView
                 android:id="@+id/tv_name"
@@ -72,13 +73,15 @@
                 android:gravity="center"
                 android:text="@string/about_remark"
                 android:textColor="@color/grgray"
-                android:textSize="16sp" />
+                android:textSize="@dimen/commonSettingItemTextSize" />
+
             <TextView
                 android:id="@+id/tv_name_value"
                 style="@style/IMTbleLine_TextValue"
                 android:layout_toLeftOf="@+id/iv_name"
                 android:layout_toRightOf="@+id/tv_name"
                 android:textColor="@color/dark_dark_grey" />
+
             <ImageView
                 android:id="@+id/iv_name"
                 android:layout_width="@dimen/next_width"
@@ -89,14 +92,15 @@
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
             android:background="@color/item_line" />
+
         <RelativeLayout
             android:id="@+id/me_function"
-            style="@style/IMTbleLine"
-            android:background="@drawable/selector_me_menu_item_bg">
+            style="@style/commonSettingItem">
 
             <TextView
                 android:id="@+id/tv_function"
@@ -106,13 +110,15 @@
                 android:gravity="center"
                 android:text="@string/about_function"
                 android:textColor="@color/grgray"
-                android:textSize="16sp" />
+                android:textSize="@dimen/commonSettingItemTextSize" />
+
             <TextView
                 android:id="@+id/tv_function_value"
                 style="@style/IMTbleLine_TextValue"
                 android:layout_toLeftOf="@+id/iv_function"
                 android:layout_toRightOf="@+id/tv_function"
                 android:textColor="@color/dark_dark_grey" />
+
             <ImageView
                 android:id="@+id/iv_function"
                 android:layout_width="@dimen/next_width"
@@ -123,14 +129,16 @@
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
             android:background="@color/item_line" />
+
         <RelativeLayout
             android:id="@+id/me_QRcode"
-            style="@style/IMTbleLine"
-            android:background="@drawable/selector_me_menu_item_bg">
+            style="@style/commonSettingItem"
+            android:layout_height="100dp">
 
             <TextView
                 android:id="@+id/tv_QRcode"
@@ -140,23 +148,25 @@
                 android:gravity="center"
                 android:text="@string/about_qcode"
                 android:textColor="@color/grgray"
-                android:textSize="16sp"/>
+                android:textSize="@dimen/commonSettingItemTextSize" />
+
             <TextView
                 android:id="@+id/tv_QRcode_value"
                 style="@style/IMTbleLine_TextValue"
                 android:layout_toLeftOf="@+id/iv_QRcode"
                 android:layout_toRightOf="@+id/tv_QRcode"
                 android:textColor="@color/dark_grey" />
+
             <ImageView
                 android:id="@+id/iv_QRcode"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
+                android:layout_width="76dp"
+                android:layout_height="76dp"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
+                android:contentDescription="@string/app_name"
+                android:src="@drawable/ic_uu_scan_code" />
         </RelativeLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"

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

@@ -1,46 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
-    android:orientation="vertical"
-    >
-      <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:padding="20dp"
-          android:orientation="horizontal">
-          <TextView
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content" 
-              android:layout_gravity="center_vertical"
-              android:text="@string/booking_times"/>
-          <TextView
-              android:id="@+id/tv_startTime"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_vertical"
-              style="@style/crm_business_btn"
-              android:text="00:00"/>
-          <TextView
-              android:id="@+id/tv_endTime"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_vertical"
-              style="@style/crm_business_btn"
-              android:text="23:59"/>
-      </LinearLayout>  
-    
-    <Button
-            android:id="@+id/submit_btn"
-            android:layout_width="match_parent"
+    android:background="@color/oa_bg"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        style="@style/commonSettingItem"
+        android:layout_marginTop="12dp">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:gravity="center"
+            android:text="@string/taskdetail_startime"
+            android:textColor="@color/grgray"
+            android:textSize="@dimen/commonSettingItemTextSize" />
+
+        <TextView
+            android:id="@+id/tv_startTime"
+            style="@style/IMTbleLine_TextValue"
+            android:layout_toLeftOf="@+id/iv_name"
+            android:layout_toRightOf="@+id/tv_name"
+            android:textColor="@color/dark_dark_grey"
+            tools:text="08:00" />
+
+        <ImageView
+            android:id="@+id/iv_name"
+            android:layout_width="@dimen/next_width"
+            android:layout_height="@dimen/next_height"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+
+            android:background="@drawable/oa_next"
+            android:contentDescription="@string/app_name" />
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/item_line" />
+
+    <RelativeLayout
+        style="@style/commonSettingItem">
+
+        <TextView
+            android:id="@+id/tv_function"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:background="@drawable/bg_bule_btn"
-            android:padding="10dp"
-            android:text="@string/app_button_commit"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_main" />
+            android:layout_centerVertical="true"
+            android:gravity="center"
+            android:text="@string/taskdetail_endtime"
+            android:textColor="@color/grgray"
+            android:textSize="@dimen/commonSettingItemTextSize" />
+
+        <TextView
+            android:id="@+id/tv_endTime"
+            style="@style/IMTbleLine_TextValue"
+            android:layout_toLeftOf="@+id/iv_function"
+            android:layout_toRightOf="@+id/tv_function"
+            android:textColor="@color/dark_dark_grey"
+            tools:text="20:00" />
+
+        <ImageView
+            android:id="@+id/iv_function"
+            android:layout_width="@dimen/next_width"
+            android:layout_height="@dimen/next_height"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/oa_next"
+            android:contentDescription="@string/app_name" />
+    </RelativeLayout>
+
+    <Button
+        android:id="@+id/submit_btn"
+        style="@style/commonButtonStyle"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="40dp"
+        android:text="@string/app_button_commit" />
 </LinearLayout>

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

@@ -1,37 +1,60 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#EBE9EA">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#EBE9EA">
 
     <ScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-       >
+        >
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_alignTop="@+id/reimbursement_title_fet"
             android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true">
+            android:layout_alignParentStart="true"
+            android:layout_alignTop="@+id/reimbursement_title_fet"
+            android:orientation="vertical">
 
-            <EditText
-                android:id="@+id/text_edit"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:background="@drawable/full_edit_bg"
-                android:gravity="top"
-                android:hint="@string/please_unput_yourP"
-                android:inputType="textMultiLine"
-                android:minHeight="150dp"
-                android:padding="10dp"
-                android:textColor="@color/black"
-                android:textColorHint="@color/grey"
-                android:textSize="16sp"
-                android:maxLength="400"/>
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:src="@drawable/ic_feedback_input"
+                    android:layout_marginLeft="10dp"/>
+
+                <EditText
+                    android:id="@+id/text_edit"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:gravity="top"
+                    android:hint="@string/please_unput_yourP"
+                    android:inputType="textMultiLine"
+                    android:maxLength="400"
+                    android:minHeight="120dp"
+                    android:padding="10dp"
+                    android:textColor="@color/black"
+                    android:textColorHint="@color/grey"
+                    android:textSize="13sp" />
+
+                <ImageView
+                    android:id="@+id/feedback_voice_iv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="10dp"
+                    android:src="@drawable/ic_feedback_voice" />
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/select_img_prompt_tv"
@@ -48,12 +71,12 @@
                 android:visibility="gone" />
 
             <LinearLayout
-                android:visibility="visible"
                 android:id="@+id/select_img_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
-                android:padding="10dp">
+                android:padding="10dp"
+                android:visibility="visible">
 
                 <com.core.widget.view.MyGridView
                     android:id="@+id/grid_view"
@@ -85,11 +108,11 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginRight="5dp"
                     android:gravity="center"
                     android:text="联系电话"
-                    android:layout_marginRight="5dp"
                     android:textColor="@color/text_hine"
-                   />
+                    />
 
                 <TextView
                     android:id="@+id/display_tv"
@@ -100,11 +123,11 @@
             </LinearLayout>
 
             <LinearLayout
-                android:layout_marginTop="10dp"
                 android:id="@+id/bottom_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/display_rl"
+                android:layout_marginTop="20dp"
                 android:background="#EBE9EA"
                 android:baselineAligned="false"
                 android:orientation="vertical"
@@ -112,17 +135,11 @@
 
                 <Button
                     android:id="@+id/release_btn"
+                    style="@style/commonButtonStyle"
                     android:layout_marginLeft="20dp"
                     android:layout_marginRight="20dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/bg_bule_btn"
-                    android:padding="10dp"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/text_main"
                     android:text="@string/common_save_button" />
             </LinearLayout>
         </LinearLayout>
-
     </ScrollView>
 </RelativeLayout>

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

@@ -1,213 +1,219 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/activity_holidays"
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/oa_bg"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.AppCompatTextView
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:gravity="center"
-        android:textColor="@color/titleBlue"
-        android:textSize="20sp"
-        android:text="2018年放假时间安排"/>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
+    android:scaleType="fitStart"
+    android:src="@drawable/ic_holiday_plan"></ImageView>
+    <!--<LinearLayout android:id="@+id/activity_holidays"
+                  xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:background="@color/oa_bg"
+                  android:orientation="vertical">
+
+        <android.support.v7.widget.AppCompatTextView
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="80dp"
+            android:gravity="center"
+            android:text="2018年放假时间安排"
+            android:textColor="@color/titleBlue"
+            android:textSize="20sp" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/white"
-                android:orientation="vertical"
-                android:paddingBottom="6dp"
-                android:paddingLeft="5dp"
-                android:paddingTop="10dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/MyAttendanceRules_newYearsDay"
-                    android:textColor="@color/titleBlue"
-                    android:textSize="@dimen/text_main" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="@string/holiday_date1"
-                    android:textColor="@color/text_hine"
-                    android:textSize="@dimen/text_hine" />
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2px"
-                android:background="@color/white"
-                android:orientation="vertical"
-                android:paddingBottom="6dp"
-                android:paddingLeft="5dp"
-                android:paddingTop="10dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/MyAttendanceRules_SpringFestival"
-                    android:textColor="@color/titleBlue"
-                    android:textSize="@dimen/text_main" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="@string/holiday_date2"
-                    android:textColor="@color/text_hine"
-                    android:textSize="@dimen/text_hine" />
-            </LinearLayout>
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2px"
-                android:background="@color/white"
-                android:orientation="vertical"
-                android:paddingBottom="6dp"
-                android:paddingLeft="5dp"
-                android:paddingTop="10dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/MyAttendanceRules_QingmingFestival"
-                    android:textColor="@color/titleBlue"
-                    android:textSize="@dimen/text_main" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="@string/holiday_date3"
-                    android:textColor="@color/text_hine"
-                    android:textSize="@dimen/text_hine" />
-            </LinearLayout>
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2px"
-                android:background="@color/white"
-                android:orientation="vertical"
-                android:paddingBottom="6dp"
-                android:paddingLeft="5dp"
-                android:paddingTop="10dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/MyAttendanceRules_LaborDay"
-                    android:textColor="@color/titleBlue"
-                    android:textSize="@dimen/text_main" />
-
-                <TextView
-                    android:layout_width="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingBottom="6dp"
+                    android:paddingLeft="5dp"
+                    android:paddingTop="10dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/MyAttendanceRules_newYearsDay"
+                        android:textColor="@color/titleBlue"
+                        android:textSize="@dimen/text_main" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="@string/holiday_date1"
+                        android:textColor="@color/text_hine"
+                        android:textSize="@dimen/text_hine" />
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="@string/holiday_date4"
-                    android:textColor="@color/text_hine"
-                    android:textSize="@dimen/text_hine" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2px"
-                android:background="@color/white"
-                android:orientation="vertical"
-                android:paddingBottom="6dp"
-                android:paddingLeft="5dp"
-                android:paddingTop="10dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_marginTop="2px"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingBottom="6dp"
+                    android:paddingLeft="5dp"
+                    android:paddingTop="10dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/MyAttendanceRules_SpringFestival"
+                        android:textColor="@color/titleBlue"
+                        android:textSize="@dimen/text_main" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="@string/holiday_date2"
+                        android:textColor="@color/text_hine"
+                        android:textSize="@dimen/text_hine" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/MyAttendanceRules_TheDragonBoatFestival"
-                    android:textColor="@color/titleBlue"
-                    android:textSize="@dimen/text_main" />
-
-                <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_marginTop="2px"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingBottom="6dp"
+                    android:paddingLeft="5dp"
+                    android:paddingTop="10dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/MyAttendanceRules_QingmingFestival"
+                        android:textColor="@color/titleBlue"
+                        android:textSize="@dimen/text_main" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="@string/holiday_date3"
+                        android:textColor="@color/text_hine"
+                        android:textSize="@dimen/text_hine" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="@string/holiday_date5"
-                    android:textColor="@color/text_hine"
-                    android:textSize="@dimen/text_hine" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2px"
-                android:background="@color/white"
-                android:orientation="vertical"
-                android:paddingBottom="6dp"
-                android:paddingLeft="5dp"
-                android:paddingTop="10dp">
-
-                <TextView
-                    android:id="@+id/zq_and_gq1"
-                    android:layout_width="wrap_content"
+                    android:layout_marginTop="2px"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingBottom="6dp"
+                    android:paddingLeft="5dp"
+                    android:paddingTop="10dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/MyAttendanceRules_LaborDay"
+                        android:textColor="@color/titleBlue"
+                        android:textSize="@dimen/text_main" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="@string/holiday_date4"
+                        android:textColor="@color/text_hine"
+                        android:textSize="@dimen/text_hine" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/MyAttendanceRules_MidAutumnFestival"
-                    android:textColor="@color/titleBlue"
-                    android:textSize="@dimen/text_main" />
-
-                <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_marginTop="2px"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingBottom="6dp"
+                    android:paddingLeft="5dp"
+                    android:paddingTop="10dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/MyAttendanceRules_TheDragonBoatFestival"
+                        android:textColor="@color/titleBlue"
+                        android:textSize="@dimen/text_main" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="@string/holiday_date5"
+                        android:textColor="@color/text_hine"
+                        android:textSize="@dimen/text_hine" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="@string/holiday_date6"
-                    android:textColor="@color/text_hine"
-                    android:textSize="@dimen/text_hine" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2px"
-                android:background="@color/white"
-                android:orientation="vertical"
-                android:paddingBottom="6dp"
-                android:paddingLeft="5dp"
-                android:paddingTop="10dp">
-
-                <TextView
-                    android:id="@+id/zq_and_gq"
-                    android:layout_width="wrap_content"
+                    android:layout_marginTop="2px"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingBottom="6dp"
+                    android:paddingLeft="5dp"
+                    android:paddingTop="10dp">
+
+                    <TextView
+                        android:id="@+id/zq_and_gq1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/MyAttendanceRules_MidAutumnFestival"
+                        android:textColor="@color/titleBlue"
+                        android:textSize="@dimen/text_main" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="@string/holiday_date6"
+                        android:textColor="@color/text_hine"
+                        android:textSize="@dimen/text_hine" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/MyAttendanceRules_nationalDay"
-                    android:textColor="@color/titleBlue"
-                    android:textSize="@dimen/text_main" />
+                    android:layout_marginTop="2px"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:paddingBottom="6dp"
+                    android:paddingLeft="5dp"
+                    android:paddingTop="10dp">
+
+                    <TextView
+                        android:id="@+id/zq_and_gq"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/MyAttendanceRules_nationalDay"
+                        android:textColor="@color/titleBlue"
+                        android:textSize="@dimen/text_main" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="@string/holiday_date7"
+                        android:textColor="@color/text_hine"
+                        android:textSize="@dimen/text_hine" />
+                </LinearLayout>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="@string/holiday_date7"
-                    android:textColor="@color/text_hine"
-                    android:textSize="@dimen/text_hine" />
             </LinearLayout>
+        </ScrollView>
 
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
+    </LinearLayout>-->

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

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
-    android:orientation="vertical"
-    tools:context=".ui.erp.activity.oa.AlarmaActivity">
+    android:background="@color/oa_bg"
+    android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/auto_rl"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:padding="10dp">
+        style="@style/commonSettingItem"
+        android:layout_marginTop="12dp">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:text="@string/auto_mission"
-            android:textSize="14sp" />
+            android:textSize="@dimen/commonSettingItemTextSize" />
 
         <com.core.widget.view.SwitchView
             android:id="@+id/auto_sv"
@@ -27,11 +27,6 @@
             android:layout_centerVertical="true" />
     </RelativeLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="@color/item_line" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
@@ -39,17 +34,15 @@
 
     <RelativeLayout
         android:id="@+id/distance_rl"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:background="@drawable/selector_me_menu_item_bg"
-        android:padding="10dp">
+        style="@style/commonSettingItem"
+        android:layout_marginTop="12dp">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:text="@string/effective_range"
-            android:textSize="14sp" />
+            android:textSize="@dimen/commonSettingItemTextSize" />
 
 
         <TextView
@@ -70,17 +63,14 @@
 
     <RelativeLayout
         android:id="@+id/time_rl"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:background="@drawable/selector_me_menu_item_bg"
-        android:padding="10dp">
+        style="@style/commonSettingItem">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:text="@string/reserve_time"
-            android:textSize="14sp" />
+            android:textSize="@dimen/commonSettingItemTextSize" />
 
         <TextView
             android:id="@+id/time_tv"
@@ -99,16 +89,15 @@
         android:background="@color/item_line" />
 
     <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:padding="10dp">
+        style="@style/commonSettingItem"
+        android:layout_marginTop="12dp">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:text="@string/neer_submit_able"
-            android:textSize="14sp" />
+            android:textSize="@dimen/commonSettingItemTextSize" />
 
         <com.core.widget.view.SwitchView
             android:id="@+id/needprocess_sv"

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/oa_bg"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MyRuleSetActivity">
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:background="@color/oa_bg"
+             tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MyRuleSetActivity">
 
     <RelativeLayout
         android:id="@+id/empty_rl"
@@ -35,7 +35,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="@dimen/item_height_min"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="12dp"
             android:background="@color/white"
             android:paddingLeft="10dp"
             android:paddingRight="10dp">
@@ -62,34 +62,15 @@
                 android:ellipsize="end"
                 android:gravity="right|center_vertical"
                 android:lines="1"
-                android:textColor="@color/text_hine"
+                android:textColor="#999999"
                 android:textSize="@dimen/text_hine" />
         </RelativeLayout>
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/item_height_min"
-            android:layout_marginTop="10dp"
-            android:background="@color/white"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:gravity="center_vertical"
-                android:text="@string/Set_Scheduling"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-        </RelativeLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="@dimen/item_height_min"
-            android:layout_marginTop="2px"
+            android:layout_marginTop="12dp"
             android:background="@color/white"
             android:paddingLeft="10dp"
             android:paddingRight="10dp">
@@ -112,7 +93,7 @@
                 android:layout_alignParentRight="true"
                 android:gravity="center_vertical"
                 android:text="@string/Normal_frequency"
-                android:textColor="@color/text_hine"
+                android:textColor="#999999"
                 android:textSize="@dimen/text_hine" />
         </RelativeLayout>
 
@@ -146,7 +127,7 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical|right"
                 android:lines="1"
-                android:textColor="@color/text_hine"
+                android:textColor="#999999"
                 android:textSize="@dimen/text_hine" />
         </RelativeLayout>
 
@@ -175,7 +156,7 @@
                 android:layout_height="match_parent"
                 android:layout_alignParentRight="true"
                 android:gravity="center_vertical"
-                android:textColor="@color/text_hine"
+                android:textColor="#999999"
                 android:textSize="@dimen/text_hine" />
         </RelativeLayout>
 
@@ -183,11 +164,12 @@
             android:id="@+id/click_tv"
             android:layout_width="match_parent"
             android:layout_height="@dimen/item_height_min"
-            android:layout_marginTop="2px"
+            android:layout_marginTop="12dp"
             android:background="@color/white"
-            android:gravity="center_vertical"
+            android:gravity="center"
             android:paddingLeft="10dp"
             android:text="@string/MyAttendanceRules_legalHoliday"
-            android:textColor="@color/titleBlue" />
+            android:textColor="#1084D1"
+            android:textSize="15sp" />
     </LinearLayout>
 </FrameLayout>

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

@@ -1,16 +1,14 @@
 <?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:background="@drawable/bg_main"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="@color/oa_bg"
+              android:orientation="vertical">
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scrollbars="none"
-        android:paddingLeft="5dp"
-        android:paddingRight="10dp">
+        android:scrollbars="none">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -37,6 +35,7 @@
                 <TextView
                     android:id="@+id/uas_website_tv"
                     style="@style/IMTbleLine_TextValue"
+                    android:layout_width="wrap_content"
                     android:layout_toLeftOf="@+id/uas_website_arrow_img"
                     android:layout_toRightOf="@+id/uas_website_text"
                     android:textColor="@color/dark_dark_grey"
@@ -112,15 +111,15 @@
 
             <RelativeLayout
                 android:id="@+id/uu_step_rl"
-                style="@style/IMTbleLine1"
-                android:background="@drawable/selector_me_menu_item_bg"
+                style="@style/commonSettingItem"
+                android:layout_marginTop="12dp"
                 android:visibility="visible">
 
                 <View
                     android:id="@+id/view3"
-                    android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
+                    android:layout_alignParentBottom="true"
                     android:background="@color/item_line" />
 
                 <TextView
@@ -131,7 +130,7 @@
                     android:gravity="center"
                     android:text="@string/set_sport"
                     android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/commonSettingItemTextSize" />
 
                 <ImageView
                     android:id="@+id/uu_step_im"
@@ -166,14 +165,13 @@
             <!--设置关闭推送-->
             <RelativeLayout
                 android:id="@+id/close_push_rl"
-                style="@style/IMTbleLine1"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
 
                 <View
                     android:id="@+id/view4"
-                    android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
+                    android:layout_alignParentBottom="true"
                     android:background="@color/item_line" />
 
                 <TextView
@@ -184,25 +182,27 @@
                     android:gravity="center"
                     android:text="@string/set_push"
                     android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/commonSettingItemTextSize" />
+
                 <com.core.widget.view.SwitchView
                     android:id="@+id/cb_task_reply"
                     android:layout_width="40dp"
                     android:layout_height="25dp"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
-                    android:layout_marginBottom="17dp" />
+                    android:layout_centerVertical="true" />
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/businessmen_setting_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem"
+                android:layout_marginTop="12dp">
+
                 <View
-                    android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
+                    android:layout_alignParentBottom="true"
                     android:background="@color/item_line" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -210,7 +210,8 @@
                     android:gravity="center"
                     android:text="@string/business_setting"
                     android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/commonSettingItemTextSize" />
+
                 <ImageView
                     android:layout_width="@dimen/next_width"
                     android:layout_height="@dimen/next_height"
@@ -218,27 +219,28 @@
                     android:layout_centerVertical="true"
                     android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
+
                 <TextView
                     android:id="@+id/businessmen_setting_new"
                     android:layout_width="10dp"
                     android:layout_height="10dp"
+                    android:layout_alignParentRight="true"
                     android:layout_alignTop="@+id/tv_oa"
                     android:layout_centerVertical="true"
                     android:layout_marginRight="10dp"
-                    android:layout_alignParentRight="true"
                     android:background="@drawable/hongdian"
                     android:textColor="@android:color/white"
                     android:textSize="10.0dip" />
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/sign_in_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
 
                 <View
-                    android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
+                    android:layout_alignParentBottom="true"
                     android:background="@color/item_line" />
 
                 <TextView
@@ -248,7 +250,8 @@
                     android:gravity="center"
                     android:text="@string/set_sigin"
                     android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/commonSettingItemTextSize" />
+
                 <ImageView
                     android:layout_width="@dimen/next_width"
                     android:layout_height="@dimen/next_height"
@@ -256,14 +259,15 @@
                     android:layout_centerVertical="true"
                     android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
+
                 <TextView
                     android:id="@+id/tv_sign_new"
                     android:layout_width="10dp"
                     android:layout_height="10dp"
+                    android:layout_alignParentRight="true"
                     android:layout_alignTop="@+id/tv_oa"
                     android:layout_centerVertical="true"
                     android:layout_marginRight="10dp"
-                    android:layout_alignParentRight="true"
                     android:background="@drawable/hongdian"
                     android:textColor="@android:color/white"
                     android:textSize="10.0dip" />
@@ -273,13 +277,14 @@
 
             <RelativeLayout
                 android:id="@+id/sign_out_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
+
                 <View
-                    android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
+                    android:layout_alignParentBottom="true"
                     android:background="@color/item_line" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -287,7 +292,8 @@
                     android:gravity="center"
                     android:text="@string/activity_mission_set"
                     android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/commonSettingItemTextSize" />
+
                 <ImageView
                     android:layout_width="@dimen/next_width"
                     android:layout_height="@dimen/next_height"
@@ -295,14 +301,15 @@
                     android:layout_centerVertical="true"
                     android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
+
                 <TextView
                     android:id="@+id/tv_signauto_new"
                     android:layout_width="10dp"
                     android:layout_height="10dp"
+                    android:layout_alignParentRight="true"
                     android:layout_alignTop="@+id/tv_oa"
                     android:layout_centerVertical="true"
                     android:layout_marginRight="10dp"
-                    android:layout_alignParentRight="true"
                     android:background="@drawable/hongdian"
                     android:textColor="@android:color/white"
                     android:textSize="10.0dip" />
@@ -310,13 +317,14 @@
 
             <RelativeLayout
                 android:id="@+id/booking_set_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
+
                 <View
-                    android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
+                    android:layout_alignParentBottom="true"
                     android:background="@color/item_line" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -324,7 +332,8 @@
                     android:gravity="center"
                     android:text="@string/booking_time_set"
                     android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/commonSettingItemTextSize" />
+
                 <ImageView
                     android:layout_width="@dimen/next_width"
                     android:layout_height="@dimen/next_height"
@@ -332,14 +341,15 @@
                     android:layout_centerVertical="true"
                     android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
+
                 <TextView
                     android:id="@+id/tv_booking_new"
                     android:layout_width="10dp"
                     android:layout_height="10dp"
+                    android:layout_alignParentRight="true"
                     android:layout_alignTop="@+id/tv_oa"
                     android:layout_centerVertical="true"
                     android:layout_marginRight="10dp"
-                    android:layout_alignParentRight="true"
                     android:background="@drawable/hongdian"
                     android:textColor="@android:color/white"
                     android:textSize="10.0dip" />
@@ -348,13 +358,15 @@
 
             <RelativeLayout
                 android:id="@+id/clear_cache_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem"
+                android:layout_marginTop="12dp">
+
                 <View
-                    android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
+                    android:layout_alignParentBottom="true"
                     android:background="@color/item_line" />
+
                 <TextView
                     android:id="@+id/cache_text"
                     android:layout_width="wrap_content"
@@ -363,7 +375,7 @@
                     android:gravity="center"
                     android:text="@string/set_clear"
                     android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/commonSettingItemTextSize" />
 
                 <TextView
                     android:id="@+id/cache_tv"
@@ -385,8 +397,7 @@
 
             <RelativeLayout
                 android:id="@+id/use_help_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -395,53 +406,16 @@
                     android:gravity="center"
                     android:text="@string/Rated_suggest"
                     android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/commonSettingItemTextSize" />
+
                 <TextView
                     android:id="@+id/tv_help_new"
                     android:layout_width="10dp"
                     android:layout_height="10dp"
-                    android:layout_alignTop="@+id/tv_oa"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:layout_alignParentRight="true"
-                    android:background="@drawable/hongdian"
-                    android:textColor="@android:color/white"
-                    android:textSize="10.0dip" />
-                <ImageView
-                    android:layout_width="@dimen/next_width"
-                    android:layout_height="@dimen/next_height"
                     android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-
-                    android:background="@drawable/oa_next"
-                    android:contentDescription="@string/app_name" />
-            </RelativeLayout>
-
-
-            <RelativeLayout
-                android:id="@+id/language_us_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/set_language"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-                <TextView
-                    android:id="@+id/tv_language_new"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
                     android:layout_alignTop="@+id/tv_oa"
                     android:layout_centerVertical="true"
                     android:layout_marginRight="10dp"
-                    android:layout_alignParentRight="true"
                     android:background="@drawable/hongdian"
                     android:textColor="@android:color/white"
                     android:textSize="10.0dip" />
@@ -460,16 +434,18 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"
                 android:background="@color/item_line" />
+
             <RelativeLayout
 
                 android:id="@+id/about_us_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
+
                 <View
-                    android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
+                    android:layout_alignParentBottom="true"
                     android:background="@color/item_line" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -477,7 +453,7 @@
                     android:gravity="center"
                     android:text="@string/set_about"
                     android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/commonSettingItemTextSize" />
 
                 <ImageView
                     android:layout_width="@dimen/next_width"
@@ -516,14 +492,15 @@
 
             <RelativeLayout
                 android:id="@+id/rl_app_update"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg"
+                style="@style/commonSettingItem"
                 android:clickable="true">
+
                 <View
-                    android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
+                    android:layout_alignParentBottom="true"
                     android:background="@color/item_line" />
+
                 <TextView
                     android:id="@+id/version_text"
                     android:layout_width="wrap_content"
@@ -532,7 +509,7 @@
                     android:gravity="center"
                     android:text="@string/set_version"
                     android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/commonSettingItemTextSize" />
 
                 <TextView
                     android:id="@+id/version_value"
@@ -552,19 +529,51 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-            <Button
+
+            <RelativeLayout
+                android:id="@+id/language_us_rl"
+                style="@style/commonSettingItem"
+                android:layout_marginTop="12dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/set_language"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/commonSettingItemTextSize" />
+
+                <TextView
+                    android:id="@+id/tv_language_new"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignTop="@+id/tv_oa"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:background="@drawable/hongdian"
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip" />
+
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <TextView
                 android:id="@+id/exit_btn"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginBottom="50dp"
+                style="@style/commonSettingItem"
+                android:layout_marginBottom="40dp"
                 android:layout_marginTop="30dp"
-                android:background="@drawable/bg_bule_btn"
-                android:padding="10dp"
+                android:gravity="center"
                 android:text="@string/set_login_out"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
+                android:textColor="@color/red" />
         </LinearLayout>
     </ScrollView>
 

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

@@ -14,8 +14,7 @@
             android:orientation="vertical">
             <RelativeLayout
                 android:id="@+id/image_setting_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
                 <View
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
@@ -79,8 +78,7 @@
             </RelativeLayout>
             <RelativeLayout
                 android:id="@+id/people_setting_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
                 <View
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
@@ -105,8 +103,7 @@
 
             <RelativeLayout
                 android:id="@+id/batchplace_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
                 <View
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
@@ -168,8 +165,7 @@
 
             <RelativeLayout
                 android:id="@+id/employeerest_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
                 <View
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
@@ -195,8 +191,7 @@
 
             <RelativeLayout
                 android:id="@+id/companyrest_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
                 <View
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
@@ -221,8 +216,7 @@
 
             <RelativeLayout
                 android:id="@+id/business_hours_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
                 <View
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
@@ -247,8 +241,7 @@
             </RelativeLayout>
             <RelativeLayout
                 android:id="@+id/booking_timetype_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                style="@style/commonSettingItem">
                 <View
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
@@ -327,8 +320,7 @@
             </RelativeLayout>
             <RelativeLayout
                 android:id="@+id/business_introduction_rl"
-                style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg"
+                style="@style/commonSettingItem"
                 android:layout_alignParentTop="true"
                 android:layout_centerHorizontal="true">
                 <View

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

@@ -1,19 +1,13 @@
 <?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="wrap_content"
-    android:background="@color/white"
-    android:orientation="vertical">
+<LinearLayout
+    style="@style/commonPopView"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView
         android:id="@+id/share_2code"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
+        style="@style/commonPopItemTop"
         android:text="@string/share_2code"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
+        />
 
     <View
         android:layout_width="match_parent"
@@ -22,13 +16,9 @@
 
     <TextView
         android:id="@+id/change_style"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
+        style="@style/commonPopItem"
         android:text="@string/change_style"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
+        />
 
     <View
         android:layout_width="match_parent"
@@ -37,13 +27,9 @@
 
     <TextView
         android:id="@+id/save_to_MBphone"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
+        style="@style/commonPopItem"
         android:text="@string/save_to_MBphone"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
+        />
 
     <View
         android:layout_width="match_parent"
@@ -52,27 +38,14 @@
 
     <TextView
         android:id="@+id/scan_2dcode"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
+        style="@style/commonPopItemBottom"
         android:text="@string/scan_2dcode"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:background="@color/black_gray" />
+        />
 
     <TextView
         android:id="@+id/cancel_tv"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
+        style="@style/commonPopCancelItem"
         android:text="@string/common_cancel"
-        android:textColor="@color/red"
-        android:textSize="15sp" />
+        />
 
 </LinearLayout>

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

@@ -14,15 +14,15 @@
 
     <FrameLayout
         android:id="@+id/float_layout"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
         android:src="@drawable/circle_add_float_view_bg"
         android:layout_gravity="center">
 
         <ImageView
             android:id="@+id/icon_image_view"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
+            android:layout_width="30dp"
+            android:layout_height="50dp"
             android:layout_gravity="top|center_horizontal"
             android:paddingTop="20dp"
             android:contentDescription="@string/app_name"

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

@@ -1,65 +1,57 @@
 <?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="wrap_content"
-    android:orientation="vertical"
-    android:background="@color/white">
+<LinearLayout
+    style="@style/commonPopView"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
 
     <TextView
         android:id="@+id/basic_info_set_remark_name"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
+        style="@style/commonPopItemTop"
         android:text="@string/set_remark_name"
-        android:textColor="@color/black"
-        android:textSize="15sp"/>
+        />
+
     <View
         android:layout_width="match_parent"
         android:layout_height="0.3dp"
-        android:background="@color/button_invalid"/>
+        android:background="@color/button_invalid" />
+
     <TextView
         android:id="@+id/basic_info_remove_blacklist"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
+        style="@style/commonPopItem"
         android:text="@string/remove_blacklist"
-        android:textColor="@color/black"
-        android:textSize="15sp"/>
+        />
+
     <View
         android:layout_width="match_parent"
         android:layout_height="0.3dp"
-        android:background="@color/button_invalid"/>
+        android:background="@color/button_invalid" />
+
     <TextView
         android:id="@+id/basic_info_add_blacklist"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:textColor="@color/black"
+        style="@style/commonPopItem"
         android:text="@string/add_blacklist"
-        android:textSize="15sp"/>
+        />
+
     <View
         android:layout_width="match_parent"
         android:layout_height="0.3dp"
-        android:background="@color/button_invalid"/>
+        android:background="@color/button_invalid" />
+
     <TextView
         android:id="@+id/basic_info_cancel_attention"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:textColor="@color/black"
+        style="@style/commonPopItemBottom"
         android:text="@string/cancel_attention"
-        android:textSize="15sp"/>
+        />
+
     <View
         android:layout_width="match_parent"
         android:layout_height="0.3dp"
-        android:background="@color/button_invalid"/>
+        android:background="@color/button_invalid" />
+
     <TextView
         android:id="@+id/basic_info_delete_all"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
+        style="@style/commonPopCancelItem"
         android:text="@string/delete_all"
-        android:textColor="@color/red"
-        android:textSize="15sp"/>
+        />
 
 </LinearLayout>

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

@@ -1,44 +1,27 @@
 <?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:background="@color/white"
-    android:paddingTop="10dp"
-    android:paddingBottom="10dp">
+<LinearLayout
+    style="@style/commonPopView"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView
         android:id="@+id/head_take_picture"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:gravity="center"
-        android:textColor="@color/black"
-        android:textSize="16sp"
-        android:text="@string/common_camera"/>
+        style="@style/commonPopItemTop"
+        android:text="@string/common_camera"
+        />
+
     <View
         style="@style/app_line_gray_1dp"
         />
 
     <TextView
         android:id="@+id/head_select_photos"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:gravity="center"
+        style="@style/commonPopItemBottom"
         android:text="@string/select_form_phoneablum"
-        android:textColor="@color/black"
-        android:textSize="16sp" />
-
-    <View
-        style="@style/app_line_gray_1dp"
-        android:layout_height="3dp"
         />
 
     <TextView
         android:id="@+id/head_cancel"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:gravity="center"
+        style="@style/commonPopCancelItem"
         android:text="@string/common_cancel"
-        android:textColor="@color/black"
-        android:textSize="16sp" />
+        />
 </LinearLayout>

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

@@ -1,78 +1,62 @@
 <?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="wrap_content"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/super_setting_tv"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/super_setting"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid" />
-
-    <TextView
-        android:id="@+id/work_setting_tv"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/work_setting"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid" />
-
-    <TextView
-        android:id="@+id/office_addr_setting_tv"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/office_addr_setting"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid" />
-
-    <TextView
-        android:id="@+id/my_rule_setting_tv"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
-        android:text="@string/my_rule_setting"
-        android:textColor="@color/text_main"
-        android:textSize="15sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:background="@color/black_gray" />
+<LinearLayout
+    style="@style/commonPopView"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_common_pop_option_item"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/super_setting_tv"
+            style="@style/commonPopItemTop"
+            android:text="@string/super_setting"
+            />
+
+        <View
+            android:id="@+id/super_setting_line"
+            android:layout_width="match_parent"
+            android:layout_height="0.3dp"
+            android:background="@color/button_invalid" />
+
+        <TextView
+            android:id="@+id/work_setting_tv"
+            style="@style/commonPopItem"
+            android:text="@string/work_setting"
+            />
+
+        <View
+            android:id="@+id/work_setting_line"
+            android:layout_width="match_parent"
+            android:layout_height="0.3dp"
+            android:background="@color/button_invalid" />
+
+        <TextView
+            android:id="@+id/office_addr_setting_tv"
+            style="@style/commonPopItem"
+            android:text="@string/office_addr_setting"
+            />
+
+        <View
+            android:id="@+id/office_addr_setting_line"
+            android:layout_width="match_parent"
+            android:layout_height="0.3dp"
+            android:background="@color/button_invalid" />
+
+        <TextView
+            android:id="@+id/my_rule_setting_tv"
+            style="@style/commonPopSingleItem"
+            android:text="@string/my_rule_setting"
+            />
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/cancel_tv"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/text_click_bg"
-        android:gravity="center"
+        style="@style/commonPopCancelItem"
         android:text="@string/common_cancel"
-        android:textColor="@color/red"
-        android:textSize="15sp" />
+        />
 
 </LinearLayout>

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -888,7 +888,7 @@
     <string name="set_about">关于UU互联</string>
     <string name="set_version">当前版本</string>
     <string name="set_login_out">退出登录</string>
-    <string name="set_language">切换语言</string>
+    <string name="set_language">语言设置</string>
     <!--更新版本检测-->
     <string name="update_load">当前版本</string>
     <string name="update_msg">已经是最新版,不需要更新</string>
@@ -1379,7 +1379,7 @@
     <string name="Rated_UU">为UU评分</string>
     <string name="Rated_notice1">请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!</string>
     <string name="Rated_now">现在去评分</string>
-    <string name="Rated_suggest">问题反馈</string>
+    <string name="Rated_suggest">用户反馈</string>
     <string name="Rated_next">以后再说</string>
     <string name="fangkui_success">提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
     <string name="Uploaded_successfully">上传成功</string>
@@ -1428,7 +1428,7 @@
     <string name="SchedulingTime_SelectBestWorking6">提前6小时</string>
     <string name="SchedulingTime_SelectBestWorking7">提前7小时</string>
     <string name="ParticipatingPerson_selectedPerson2">个人员</string>
-    <string name="rule_name">规则名称</string>
+    <string name="rule_name">班次名称</string>
     <string name="Set_Scheduling">排班</string>
     <string name="Scheduling_type">排班类型</string>
     <string name="Normal_frequency">正常班次</string>

app_core/common/src/main/res/values-zh-rTW/strings.xml

@@ -860,7 +860,7 @@
     <string name="set_about">關於UU互聯</string>
     <string name="set_version">當前版本</string>
     <string name="set_login_out">登出</string>
-    <string name="set_language">切換語言</string>
+    <string name="set_language">語言設置</string>
     <!--更新版本检测-->
     <!--  <string name="update_load">当前版本</string>-->
     <string name="update_msg">已經是最新版，不需要更新</string>
@@ -1376,7 +1376,7 @@
     <string name="Rated_UU">為UU評分</string>
     <string name="Rated_notice1">請您為UU評一個分數吧，只需要花費您很少的時間，感謝您的支持!</string>
     <string name="Rated_now">現在去評分</string>
-    <string name="Rated_suggest">問題反饋</string>
+    <string name="Rated_suggest">用戶反饋</string>
     <string name="Rated_next">下次再​​說</string>
     <string name="fangkui_success">提交成功,我們會在第一時間查看您的問題,謝謝您的配合！</string>
     <string name="Uploaded_successfully">上傳成功</string>
@@ -1424,7 +1424,7 @@
     <string name="SchedulingTime_SelectBestWorking6">提前6小時</string>
     <string name="SchedulingTime_SelectBestWorking7">提前7小時</string>
     <string name="ParticipatingPerson_selectedPerson2">個人員</string>
-    <string name="rule_name">規則名稱</string>
+    <string name="rule_name">班次名稱</string>
     <string name="Set_Scheduling">排班</string>
     <string name="Scheduling_type">排班類型</string>
     <string name="Normal_frequency">正常班次</string>

app_core/common/src/main/res/values/colors.xml

@@ -348,4 +348,7 @@
     <color name="b2b_btn_todo">#00ff00</color>
     <color name="b2b_btn_done">#62B1CB</color>
     <color name="b2b_btn_end">#AAAAAA</color>
+
+    <color name="common_pop_item_normal">#CCFFFFFF</color>
+    <color name="common_pop_item_pressed">#D8D8D8</color>
 </resources>

app_core/common/src/main/res/values/dimens.xml

@@ -66,4 +66,9 @@
 
     <dimen name="folder_cover_size">72dp</dimen>
     <dimen name="recyclerview_fast_scroller_width">16dp</dimen>
+
+    <dimen name="commonSettingItemHeight">40dp</dimen>
+    <dimen name="commonSettingItemPaddingL">10dp</dimen>
+    <dimen name="commonSettingItemPaddingR">10dp</dimen>
+    <dimen name="commonSettingItemTextSize">14sp</dimen>
 </resources>

app_core/common/src/main/res/values/strings.xml

@@ -1554,7 +1554,7 @@
     <string name="select_client">选择客户</string>
     <string name="work_business_find">优软商城</string>
     <string name="app_trytoget_outplan">获取外勤计划失败</string>
-    <string name="set_language">切换语言</string>
+    <string name="set_language">语言设置</string>
     <string name="select_form_phoneablum">从手机相册选择</string>
     <string name="please_unput_yourP">请输入您的问题...(400字以内)</string>
     <string name="Business_license_number">营业执照号</string>
@@ -1574,7 +1574,7 @@
     <string name="Rated_UU">为UU评分</string>
     <string name="Rated_notice1">请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!</string>
     <string name="Rated_now">现在去评分</string>
-    <string name="Rated_suggest">问题反馈</string>
+    <string name="Rated_suggest">用户反馈</string>
     <string name="Rated_next">下次再说</string>
     <string name="fangkui_success">"提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
     <string name="Uploaded_successfully">上传成功</string>
@@ -1633,7 +1633,7 @@
     <string name="SchedulingTime_SelectBestWorking6">提前6小时</string>
     <string name="SchedulingTime_SelectBestWorking7">提前7小时</string>
     <string name="ParticipatingPerson_selectedPerson2">个人员</string>
-    <string name="rule_name">规则名称</string>
+    <string name="rule_name">班次名称</string>
     <string name="Set_Scheduling">排班</string>
     <string name="Scheduling_type">排班类型</string>
     <string name="Normal_frequency">正常班次</string>

app_core/common/src/main/res/values/styles.xml

@@ -1288,4 +1288,59 @@
         <item name="android:textColor">@color/text_normal</item>
     </style>
 
+    <!--新的通用按钮样式-->
+    <style name="commonButtonStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">42dp</item>
+        <item name="android:background">@drawable/selector_confirm_bg</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <!--新的通用弹出框条目背景-->
+    <style name="commonPopView">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@color/transparent</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:padding">10dp</item>
+    </style>
+
+    <style name="commonPopItem">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">45dp</item>
+        <item name="android:background">@drawable/selector_common_pop_item</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@color/main_text_color</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+
+    <style name="commonPopItemTop" parent="commonPopItem">
+        <item name="android:background">@drawable/selector_common_pop_top_item</item>
+    </style>
+
+    <style name="commonPopItemBottom" parent="commonPopItem">
+        <item name="android:background">@drawable/selector_common_pop_bottom_item</item>
+    </style>
+
+    <style name="commonPopCancelItem" parent="commonPopItem">
+        <item name="android:background">@drawable/selector_common_pop_cancel_item</item>
+        <item name="android:textColor">@color/red</item>
+        <item name="android:layout_marginTop">10dp</item>
+    </style>
+
+    <style name="commonPopSingleItem" parent="commonPopItem">
+        <item name="android:background">@drawable/selector_common_pop_single_item</item>
+    </style>
+
+    <!--设置页面通用item-->
+
+    <style name="commonSettingItem">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/commonSettingItemHeight</item>
+        <item name="android:paddingLeft">@dimen/commonSettingItemPaddingL</item>
+        <item name="android:paddingRight">@dimen/commonSettingItemPaddingR</item>
+        <item name="android:background">@drawable/selector_me_menu_item_bg</item>
+    </style>
 </resources>

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

@@ -98,6 +98,7 @@ public class HttpRequest {
                 if (t != null) {
                     String result = t.toString();
                     try {
+                        Log.e("exceptionInfo", result);
                         JSONObject resultObject = JSON.parseObject(result);
                         failMsg = resultObject.getString("exceptionInfo");
                         if (TextUtils.isEmpty(failMsg) || "(null)".equals(failMsg) || "null".equals(failMsg)) {
@@ -107,7 +108,7 @@ public class HttpRequest {
                             }
                         }
                     } catch (Exception e) {
-                        Log.e("exceptionInfo", result);
+                        Log.e("exceptionInfoE", result);
                         if (result.length() < 40) {
                             failMsg = result;
                         }

app_modular/applogin/src/main/java/com/modular/login/activity/LoginActivity.java

@@ -5,9 +5,12 @@ import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -44,8 +47,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     private EditText mPhoneNumberEdit;
     private EditText mPasswordEdit;
 
-    private TextView tv_register;
-    private TextView tv_findPwd;
+    private TextView tv_register, tv_findPwd, mLoginButton;
+    private View mToastHead;
+    private FrameLayout mToastLayout;
 
 
     @Override
@@ -86,11 +90,16 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
 
     private void initView() {
+        mToastHead = findViewById(R.id.login_toast_head);
+        mToastLayout = findViewById(R.id.login_toast_fl);
+        StatusBarUtil.setPaddingSmart(this, mToastHead);
+
         mPhoneNumberEdit = (EditText) findViewById(R.id.phone_numer_edit);
         mPasswordEdit = (EditText) findViewById(R.id.password_edit);
         mHeader = (CircleImageView) findViewById(R.id.iv_head);
         tv_findPwd = (TextView) findViewById(R.id.tv_findPwd);
         tv_register = (TextView) findViewById(R.id.tv_register);
+        mLoginButton = findViewById(R.id.login_btn);
         if (CommonUtil.getSharedPreferences(this, "user_phone") != null && CommonUtil.getSharedPreferences(this, "user_phone").length() > 0) {
             mPhoneNumberEdit.setText(CommonUtil.getSharedPreferences(this, "user_phone"));
 
@@ -101,14 +110,41 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
         }
         //登陆账号
-        findViewById(R.id.login_btn).setOnClickListener(this);
+        mLoginButton.setOnClickListener(this);
         tv_findPwd.setOnClickListener(this);
         tv_register.setOnClickListener(this);
         if (!StringUtil.isEmpty(MyApplication.getInstance().mLoginUser.getUserId())) {
             AvatarHelper.getInstance().display(MyApplication.getInstance().mLoginUser.getUserId(), mHeader, true, true);
         }
+
+        mPhoneNumberEdit.addTextChangedListener(new MyTextWatcher());
+        mPasswordEdit.addTextChangedListener(new MyTextWatcher());
     }
 
+    class MyTextWatcher implements TextWatcher {
+
+        @Override
+        public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+        }
+
+        @Override
+        public void afterTextChanged(Editable editable) {
+            String phone = mPhoneNumberEdit.getText().toString().trim();
+            String password = mPasswordEdit.getText().toString();
+
+            if (TextUtils.isEmpty(phone) || TextUtils.isEmpty(password)) {
+                mLoginButton.setEnabled(false);
+            } else {
+                mLoginButton.setEnabled(true);
+            }
+        }
+    }
 
     @Override
     public void onClick(View v) {
@@ -126,14 +162,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
     private void login() {
         final String phoneNumber = mPhoneNumberEdit.getText().toString().trim();
-        final String password = mPasswordEdit.getText().toString().trim();
+        final String password = mPasswordEdit.getText().toString();
         PreferenceUtils.putString(this, PASS_WORDS, password);
         if (TextUtils.isEmpty(phoneNumber)) {
-            ToastMessage(getString(R.string.login_account_empty));
+            ToastUtil.showToast(this, R.string.login_account_empty, mToastLayout);
             return;
         }
         if (TextUtils.isEmpty(password)) {
-            ToastMessage(getString(R.string.login_pwd_empty));
+            ToastUtil.showToast(this, R.string.login_pwd_empty, mToastLayout);
             return;
         }
         // 加密之后的密码
@@ -169,7 +205,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                     @Override
                     public void onErrorResponse(VolleyError arg0) {
                         ProgressDialogUtil.dismiss(dialog);
-                        ToastUtil.showErrorNet(mContext);
+                        ToastUtil.showToast(mContext, R.string.net_exception, mToastLayout);
                     }
                 }, new StringJsonObjectRequest.Listener<LoginRegisterResult>() {
 
@@ -178,7 +214,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 LogUtil.d("HttpLogs", "IM login:" + JSON.toJSONString(result));
                 if (result == null) {
                     ProgressDialogUtil.dismiss(dialog);
-                    ToastUtil.showErrorData(mContext);
+                    ToastUtil.showToast(mContext, R.string.data_exception, mToastLayout);
                     return;
                 }
                 boolean success = false;
@@ -189,7 +225,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                     login_manage(phoneNumber, password);
                 } else {
                     String message = TextUtils.isEmpty(result.getResultMsg()) ? getString(R.string.login_failed) : result.getResultMsg();
-                    ToastUtil.showToast(mContext, message);
+                    ToastUtil.showToast(mContext, message, mToastLayout);
                 }
                 ProgressDialogUtil.dismiss(dialog);
             }

app_modular/applogin/src/main/java/com/modular/login/activity/ModifyPasswordPhoneActivity.java

@@ -170,8 +170,8 @@ public class ModifyPasswordPhoneActivity extends BaseMVPActivity<SimplePresenter
         } else if (i == R.id.modify_password_phone_confirm_tv) {
             String phone = mPhoneEditText.getText().toString().trim();
             if (!TextUtils.isEmpty(phone) && phone.matches(REGEXP_MOBILE_CONTINENT)) {
-                String password1 = mPasswordEditText.getText().toString().trim();
-                String password2 = mPasswordConfirmEditText.getText().toString().trim();
+                String password1 = mPasswordEditText.getText().toString();
+                String password2 = mPasswordConfirmEditText.getText().toString();
                 String codeToken = CommonUtil.getSharedPreferences(this, Constants.CACHE.MODIFY_PASSWORD_VERIFY_CODE);
                 if (password1 != null && password1.equals(password2)) {
                     String verifyCode = mCodeEditText.getText().toString().trim();
@@ -217,8 +217,8 @@ public class ModifyPasswordPhoneActivity extends BaseMVPActivity<SimplePresenter
     private void isConfirmEnable() {
         String phone = mPhoneEditText.getText().toString().trim();
         String code = mCodeEditText.getText().toString().trim();
-        String password1 = mPasswordEditText.getText().toString().trim();
-        String password2 = mPasswordConfirmEditText.getText().toString().trim();
+        String password1 = mPasswordEditText.getText().toString();
+        String password2 = mPasswordConfirmEditText.getText().toString();
 
         if (TextUtils.isEmpty(phone) || TextUtils.isEmpty(code)) {
             mPasswordLinearLayout.setEnabled(false);

app_modular/applogin/src/main/res/layout/activity_login.xml

@@ -7,101 +7,126 @@
     android:background="@drawable/ic_login_background"
     android:fillViewport="true">
 
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:padding="30dp">
-
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/iv_head"
-            android:layout_width="70dp"
-            android:layout_height="70dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="20dp"
-            android:layout_marginTop="60dp"
-            android:src="@drawable/ic_login_default_header"
-            app:civ_border_color="@color/white"
-            app:civ_border_width="1dp" />
+        android:layout_height="match_parent">
 
-        <LinearLayout
-            android:id="@+id/ll_content"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/iv_head"
-            android:layout_marginBottom="10dp"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:padding="30dp">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:background="@drawable/shape_login_editext"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="30dp"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_login_username" />
-
-                <com.core.widget.ClearEditText
-                    android:id="@+id/phone_numer_edit"
-                    style="@style/IMLineEditText"
-                    android:hint="@string/phone_number"
-                    android:inputType="phone"
-                    android:paddingLeft="10dp"
-                    android:textColor="@color/white" />
-            </LinearLayout>
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/iv_head"
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="20dp"
+                android:layout_marginTop="60dp"
+                android:background="@color/transparent"
+                android:src="@drawable/ic_login_default_header"
+                app:civ_border_color="@color/white"
+                app:civ_border_width="1dp" />
 
             <LinearLayout
+                android:id="@+id/ll_content"
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginTop="8dp"
-                android:background="@drawable/shape_login_editext"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="30dp"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_login_password" />
-
-                <com.core.widget.ClearEditText
-                    android:id="@+id/password_edit"
-                    style="@style/IMLineEditPass"
-                    android:hint="@string/rpassword"
-                    android:paddingLeft="10dp"
-                    android:textColor="@color/white" />
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/iv_head"
+                android:layout_marginBottom="10dp"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:background="@drawable/shape_login_editext"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_login_username" />
+
+                    <com.core.widget.ClearEditText
+                        android:id="@+id/phone_numer_edit"
+                        style="@style/IMLineEditText"
+                        android:hint="@string/phone_number"
+                        android:inputType="phone"
+                        android:paddingLeft="10dp"
+                        android:textColor="@color/white"
+                        android:textColorHint="@color/white" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="8dp"
+                    android:background="@drawable/shape_login_editext"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_login_password" />
+
+                    <com.core.widget.ClearEditText
+                        android:id="@+id/password_edit"
+                        style="@style/IMLineEditPass"
+                        android:hint="@string/rpassword"
+                        android:paddingLeft="10dp"
+                        android:textColor="@color/white"
+                        android:textColorHint="@color/white" />
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/login_btn"
+                    style="@style/commonButtonStyle"
+                    android:layout_marginTop="20dp"
+                    android:enabled="false"
+                    android:text="@string/login_button"
+                    />
             </LinearLayout>
 
             <TextView
-                android:id="@+id/login_btn"
-                android:layout_width="match_parent"
-                android:layout_height="42dp"
-                android:layout_marginTop="20dp"
-                android:background="@drawable/selector_confirm_bg"
-                android:gravity="center"
-                android:text="@string/login_button"
-                android:textColor="@color/white"
-                android:textSize="14sp" />
-        </LinearLayout>
+                android:id="@+id/tv_findPwd"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/ll_content"
+                android:text="@string/login_losspwd"
+                android:textColor="#AADAFB" />
 
-        <TextView
-            android:id="@+id/tv_findPwd"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/ll_content"
-            android:text="@string/login_losspwd"
-            android:textColor="#AADAFB" />
+            <TextView
+                android:id="@+id/tv_register"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/ll_content"
+                android:text="@string/login_register"
+                android:textColor="#AADAFB" />
+
+        </RelativeLayout>
 
-        <TextView
-            android:id="@+id/tv_register"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_below="@+id/ll_content"
-            android:text="@string/login_register"
-            android:textColor="#AADAFB" />
-    </RelativeLayout>
+            android:orientation="vertical">
+
+            <View
+                android:id="@+id/login_toast_head"
+                android:layout_width="match_parent"
+                android:layout_height="1dp" />
+
+            <FrameLayout
+                android:id="@+id/login_toast_fl"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+            </FrameLayout>
+        </LinearLayout>
+    </FrameLayout>
+
 </ScrollView>

app_modular/applogin/src/main/res/layout/activity_modify_password_email.xml

@@ -25,14 +25,10 @@
 
     <TextView
         android:id="@+id/modify_password_email_btn"
-        android:layout_width="match_parent"
-        android:layout_height="42dp"
+        style="@style/commonButtonStyle"
         android:layout_marginLeft="30dp"
         android:layout_marginRight="30dp"
         android:layout_marginTop="60dp"
-        android:background="@drawable/selector_confirm_bg"
-        android:gravity="center"
         android:text="发送验证请求"
-        android:textColor="@color/white"
-        android:textSize="14sp" />
+        />
 </LinearLayout>

app_modular/applogin/src/main/res/layout/activity_modify_password_email_verify.xml

@@ -70,13 +70,9 @@
 
     <TextView
         android:id="@+id/modify_password_email_confirm_tv"
-        android:layout_width="match_parent"
-        android:layout_height="42dp"
-        android:layout_marginTop="40dp"
-        android:background="@drawable/selector_confirm_bg"
+        style="@style/commonButtonStyle"
         android:enabled="false"
-        android:gravity="center"
         android:text="@string/next_step"
-        android:textColor="@color/white"
-        android:textSize="14sp" />
+        android:layout_marginTop="40dp"
+        />
 </LinearLayout>

app_modular/applogin/src/main/res/layout/activity_modify_password_phone.xml

@@ -145,15 +145,11 @@
 
         <TextView
             android:id="@+id/modify_password_phone_confirm_tv"
-            android:layout_width="match_parent"
-            android:layout_height="42dp"
+            style="@style/commonButtonStyle"
             android:layout_marginTop="20dp"
-            android:background="@drawable/selector_confirm_bg"
             android:enabled="false"
-            android:gravity="center"
             android:text="@string/app_dialog_ok"
-            android:textColor="@color/white"
-            android:textSize="14sp" />
+            />
     </LinearLayout>
 
     <LinearLayout

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

@@ -113,7 +113,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case http_commit:
-                    if (msg.getData() != null){
+                    if (msg.getData() != null) {
                         String word_result = msg.getData().getString("result");
                         Log.i(word_result, word_result);
                         //{"cb_id":14590,"success":true,"cb_code":"2017060066"}
@@ -122,8 +122,8 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                                     && JSON.parseObject(word_result).getBoolean("success")) {
                                 cb_id = JSON.parseObject(word_result).getInteger("cb_id");
                                 cb_code = JSON.parseObject(word_result).getString("cb_code");
-                                Log.i("cb_id,cb_code",+cb_id+","+cb_code);
-                                Toast.makeText(ct,getString(R.string.fangkui_success),Toast.LENGTH_LONG).show();
+                                Log.i("cb_id,cb_code", +cb_id + "," + cb_code);
+                                Toast.makeText(ct, getString(R.string.fangkui_success), Toast.LENGTH_LONG).show();
                                 finish();
                             }
                         } catch (Exception e) {
@@ -136,28 +136,28 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                     cb_code = JSON.parseObject(msg.getData().getString("result")).getString("code");
                     progressDialog.dismiss();
                     break;
-                case  common_id_request:
-                    if (msg.getData() != null){
+                case common_id_request:
+                    if (msg.getData() != null) {
                         String resultStr = msg.getData().getString("result");
                         JSONObject resultJsonObject = JSON.parseObject(resultStr);
                         cb_id = resultJsonObject.getInteger("id");
-                        Log.i("resultStr",resultStr+"");
+                        Log.i("resultStr", resultStr + "");
                     }
                     break;
 
                 case update_ID:
-                    if (msg.getData() != null){
+                    if (msg.getData() != null) {
                         String updateID_result = msg.getData().getString("result");
                         Log.i("updateID_result", updateID_result);
                         progressDialog.dismiss();
                         release_btn.setEnabled(true);
-                        Toast.makeText(ct,getString(R.string.fangkui_success),Toast.LENGTH_LONG).show();
-                       new Handler().postDelayed(new Runnable() {
-                           @Override
-                           public void run() {
-                               finish();
-                           }
-                       },1000);
+                        Toast.makeText(ct, getString(R.string.fangkui_success), Toast.LENGTH_LONG).show();
+                        new Handler().postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                finish();
+                            }
+                        }, 1000);
                     }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
@@ -173,17 +173,17 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
     private void doUpdateId(String update) {
         String url = "http://218.18.115.198:8888/ERP/common/attach/change.action";
-        Map<String,Object> params = new HashMap<>();
-        params.put("caller","Commentsback_mobile");
-        params.put("table","Commentsback_mobile");
-        params.put("update","cb_attch = '"+update+"'");
-        params.put("condition","cb_id = '"+cb_id+"'");
-        params.put("type","添加附件");
+        Map<String, Object> params = new HashMap<>();
+        params.put("caller", "Commentsback_mobile");
+        params.put("table", "Commentsback_mobile");
+        params.put("update", "cb_attch = '" + update + "'");
+        params.put("condition", "cb_id = '" + cb_id + "'");
+        params.put("type", "添加附件");
         params.put("master", "USOFTSYS");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        if (platform){
+        if (platform) {
             headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
-        }else {
+        } else {
             headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         }
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, update_ID, null, null, "post");
@@ -241,7 +241,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 if (viewType == 1) {
                     if (PermissionUtil.lacksPermissions(ct, Manifest.permission.CAMERA)) {
 //                        ToastUtil.showToast(ct, com.uas.appworks.R.string.not_camera_permission);
-                        PermissionUtil.requestPermission(FeedbackActivity.this,PermissionUtil.DEFAULT_REQUEST,Manifest.permission.CAMERA);
+                        PermissionUtil.requestPermission(FeedbackActivity.this, PermissionUtil.DEFAULT_REQUEST, Manifest.permission.CAMERA);
                     } else {
                         showSelectPictureDialog();//添加
                     }
@@ -253,7 +253,15 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 }
             }
         });
-        if (!platform){
+
+        findViewById(R.id.feedback_voice_iv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                CommonUtil.getVoiceText(FeedbackActivity.this, mTextEdit, null);
+            }
+        });
+
+        if (!platform) {
 //            getCode();
         }
 
@@ -275,9 +283,10 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, Constants.HTTP_SUCCESS_INIT, null, null, "post");
     }
+
     private void getPlatCode() {
 //        String url = CommonUtil.getAppBaseUrl(ct) + "common/getCodeString.action";
-        String url =" http://218.18.115.198:8888/ERP/common/getCodeString.action";
+        String url = " http://218.18.115.198:8888/ERP/common/getCodeString.action";
         Map<String, Object> params = new HashMap<>();
 //        params.put("emuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "b2b_uu"));
 //        params.put("enuu", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu());
@@ -324,8 +333,8 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                             try {
                                 takePhoto();
                             } catch (Exception e) {
-                                String message=e.getMessage();
-                                if (!StringUtil.isEmpty(message)&&message.contains("Permission")){
+                                String message = e.getMessage();
+                                if (!StringUtil.isEmpty(message) && message.contains("Permission")) {
                                     ToastUtil.showToast(ct, com.uas.appworks.R.string.not_system_permission);
                                 }
                             }
@@ -339,26 +348,27 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
     }
 
     private void takePhoto() {
-        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this,MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
+        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
         CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
     }
 
     private int Max_Size = 3;
+
     private void selectPhoto() {
 //        CameraUtil.pickImageSimple(this, REQUEST_CODE_PICK_PHOTO);
         Intent intent = new Intent();
-        intent.putExtra("MAX_SIZE",Max_Size);
-        intent.putExtra("CURRENT_SIZE",mPhotoList == null ? 0 : mPhotoList.size());
-        intent.setClass(ct,ImgFileListActivity.class);
-        startActivityForResult(intent,0x01);
+        intent.putExtra("MAX_SIZE", Max_Size);
+        intent.putExtra("CURRENT_SIZE", mPhotoList == null ? 0 : mPhotoList.size());
+        intent.setClass(ct, ImgFileListActivity.class);
+        startActivityForResult(intent, 0x01);
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == 0x01 && resultCode == 0x02 && data != null){
+        if (requestCode == 0x01 && resultCode == 0x02 && data != null) {
             mPhotoList.addAll(data.getStringArrayListExtra("files"));
-            Log.i("files0x01",data.getStringArrayListExtra("files").toString());
-            Log.i("mPhotoList",mPhotoList.toString());
+            Log.i("files0x01", data.getStringArrayListExtra("files").toString());
+            Log.i("mPhotoList", mPhotoList.toString());
             doImageFiltering(mPhotoList);
 //            mAdapter.notifyDataSetInvalidated();
         }
@@ -387,21 +397,23 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
     /**
      * 某些图片路径获取失败处理方案
+     *
      * @param mPhotoList
      */
     private void doImageFiltering(ArrayList<String> mPhotoList) {
         for (int i = 0; i < mPhotoList.size(); i++) {
             File file = new File(mPhotoList.get(i).toString());
-            if (!file.isFile() ){
+            if (!file.isFile()) {
 //                mPhotoList.remove(i);
-                Toast.makeText(ct,"第"+ (i+1)+"张图片格式不对，可能会上传失败，建议更换",Toast.LENGTH_LONG).show();
+                Toast.makeText(ct, "第" + (i + 1) + "张图片格式不对，可能会上传失败，建议更换", Toast.LENGTH_LONG).show();
             }
 
-            if (i == mPhotoList.size() -1){
+            if (i == mPhotoList.size() - 1) {
                 mAdapter.notifyDataSetInvalidated();
             }
         }
     }
+
     // 发布一条说说
     public void sendShuoshuo() {
         Map<String, String> params = new HashMap<String, String>();
@@ -475,15 +487,16 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
     @Override
     public void onClick(View view) {
-        if (view.getId() == R.id.release_btn){
-            if (ListUtils.isEmpty(mPhotoList)){
+        if (view.getId() == R.id.release_btn) {
+            if (ListUtils.isEmpty(mPhotoList)) {
                 ToastMessage(getString(R.string.please_add_image));
-            }else {
+            } else {
                 newSendWord();
             }
             LogUtil.prinlnLongMsg("mPhotoList", JSON.toJSONString(mPhotoList) + "hi");
         }
     }
+
     private void sendWord() {
         if (!StringUtil.isEmpty(mTextEdit.getText().toString())) {
             String url = "http://192.168.253.252:8080/ERP/mobile/Commentsback_mobile.action";
@@ -496,7 +509,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                     " \"cb_company\":\"" + CommonUtil.getSharedPreferences(ct, "erp_commpany") + "\",\n" +
                     " \"cb_whichsys\":\"" + CommonUtil.getSharedPreferences(ct, "erp_master") + "\",\n" +
                     " \"cb_kind\":\"问题\",\n" +
-                    " \"cb_text\":\"" + mTextEdit.getText().toString() + "（来自ANDROID）"+"\",\n" +
+                    " \"cb_text\":\"" + mTextEdit.getText().toString() + "（来自ANDROID）" + "\",\n" +
                     " \"cb_date\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss") + "\",\n" +
                     " \"cb_person\":\"" + emname + "\",\n" +
                     " \"cb_tel\":\"" + MyApplication.getInstance().mLoginUser.getTelephone() + "\",\n" +
@@ -526,7 +539,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                     " \"cb_company\":\"" + CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyName") + "\",\n" +
                     " \"cb_whichsys\":\"" + "USOFTSYS" + "\",\n" +
                     " \"cb_kind\":\"问题\",\n" +
-                    " \"cb_text\":\"" + mTextEdit.getText().toString()+"（来自ANDROID）" + "\",\n" +
+                    " \"cb_text\":\"" + mTextEdit.getText().toString() + "（来自ANDROID）" + "\",\n" +
                     " \"cb_date\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss") + "\",\n" +
                     " \"cb_person\":\"" + emname + "\",\n" +
                     " \"cb_tel\":\"" + MyApplication.getInstance().mLoginUser.getTelephone() + "\",\n" +
@@ -677,8 +690,8 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
 
     private void sendPicture() {
-        if (ListUtils.isEmpty(mPhotoList))  {
-            Toast.makeText(ct,getString(R.string.fangkui_success),Toast.LENGTH_LONG).show();
+        if (ListUtils.isEmpty(mPhotoList)) {
+            Toast.makeText(ct, getString(R.string.fangkui_success), Toast.LENGTH_LONG).show();
             finish();
         }
         for (int i = 0; i < mPhotoList.size(); i++) {
@@ -686,18 +699,20 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
             sendPictureRequest(path);
         }
     }
-    File[] files=null;
-    private void newSendWord(){
+
+    File[] files = null;
+
+    private void newSendWord() {
         if (!StringUtil.isEmpty(mTextEdit.getText().toString())) {
-                if (!ListUtils.isEmpty(mPhotoList)){
-                    files = new File[mPhotoList.size()];
-                        for (int i = 0; i < mPhotoList.size(); i++) {
-                            if (new File(mPhotoList.get(i)).isFile()){
-                                files[i] = ImageUtil.compressBitmapToFile(mPhotoList.get(i),100,360,480);// TODO 压缩
+            if (!ListUtils.isEmpty(mPhotoList)) {
+                files = new File[mPhotoList.size()];
+                for (int i = 0; i < mPhotoList.size(); i++) {
+                    if (new File(mPhotoList.get(i)).isFile()) {
+                        files[i] = ImageUtil.compressBitmapToFile(mPhotoList.get(i), 100, 360, 480);// TODO 压缩
 //                                files[i] = new File(mPhotoList.get(i));
-                            }
-                        }
+                    }
                 }
+            }
 
 //            String url = "http://192.168.253.252:8080/ERP/mobile/Commentsback_mobile.action";
             String url = "http://218.18.115.198:8888/ERP/mobile/Commentsback_mobile.action"; // 正式账号
@@ -712,79 +727,81 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                     " \"cb_company\":\"" + CommonUtil.getSharedPreferences(ct, "erp_commpany") + "\",\n" +
                     " \"cb_whichsys\":\"" + CommonUtil.getSharedPreferences(ct, "erp_master") + "\",\n" +
                     " \"cb_kind\":\"问题反馈\",\n" +
-                    " \"cb_text\":\"" + mTextEdit.getText().toString() + "（来自ANDROID）"+"\",\n" +
+                    " \"cb_text\":\"" + mTextEdit.getText().toString() + "（来自ANDROID）" + "\",\n" +
                     " \"cb_date\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss") + "\",\n" +
                     " \"cb_person\":\"" + emname + "\",\n" +
                     " \"cb_tel\":\"" + MyApplication.getInstance().mLoginUser.getTelephone() + "\",\n" +
                     "}\n";
             RequestParams params = new RequestParams();
-            params.addQueryStringParameter("master","USOFTSYS");
+            params.addQueryStringParameter("master", "USOFTSYS");
             if (!platform) {
                 params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-            }else  {
+            } else {
                 params.addHeader("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
             }
 
             params.addBodyParameter("formStore", formStore);
             params.addBodyParameter("type", "common");
             params.addBodyParameter("caller", "Commentsback_mobile");
-            if (files != null && files.length > 0){
+            if (files != null && files.length > 0) {
                 for (int i = 0; i < files.length; i++) {
-                    if (files[i] != null){
-                        params.addBodyParameter("img"+(i+1),files[i]);
+                    if (files[i] != null) {
+                        params.addBodyParameter("img" + (i + 1), files[i]);
                     }
                 }
             }
             final HttpUtils http = new HttpUtils();
-            Log.i("urlparams",url+params+"");
+            Log.i("urlparams", url + params + "");
             http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
                 @Override
                 public void onStart() {
                     progressDialog.show();
                     release_btn.setEnabled(false);
-                    ViewUtil.ToastMessage(ct, getString(R.string.sending_picture)+"...");
+                    ViewUtil.ToastMessage(ct, getString(R.string.sending_picture) + "...");
                 }
+
                 @Override
                 public void onSuccess(ResponseInfo<String> responseInfo) {
                     ViewUtil.ToastMessage(ct, getString(R.string.Uploaded_successfully));
                     release_btn.setEnabled(true);
-                    Log.i("newSendMes",JSON.parseObject(responseInfo.result).toJSONString());
+                    Log.i("newSendMes", JSON.parseObject(responseInfo.result).toJSONString());
                     if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
 
                     }
                     progressDialog.dismiss();
                     release_btn.setEnabled(true);
-                    Toast.makeText(ct,getString(R.string.fangkui_success),Toast.LENGTH_LONG).show();
+                    Toast.makeText(ct, getString(R.string.fangkui_success), Toast.LENGTH_LONG).show();
                     new Handler().postDelayed(new Runnable() {
                         @Override
                         public void run() {
                             finish();
                         }
-                    },1000);
+                    }, 1000);
                 }
 
                 @Override
                 public void onFailure(HttpException error, String msg) {
                     ViewUtil.ToastMessage(ct, getString(R.string.common_save_failed) + msg);
                     release_btn.setEnabled(true);
-                    Log.i("newSendMes",error+","+msg);
+                    Log.i("newSendMes", error + "," + msg);
                     progressDialog.dismiss();
                 }
             });
-        }else {
+        } else {
             ToastMessage(getString(R.string.suggest_hink));
         }
     }
+
     private void sendPictureRequest(String path) {
         if (StringUtil.isEmpty(path)) return;
-        if (!new File(path).isFile())return;
-        File file = ImageUtil.compressBitmapToFile(path,100,360,480);
+        if (!new File(path).isFile()) return;
+        File file = ImageUtil.compressBitmapToFile(path, 100, 360, 480);
         RequestParams params = new RequestParams();
-        if (platform){
+        if (platform) {
             params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
             params.addHeader("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
             params.addBodyParameter("em_code", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
-        }else {
+        } else {
             params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
             params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
             params.addBodyParameter("em_code", CommonUtil.getSharedPreferences(ct, "erp_username"));
@@ -792,21 +809,21 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
         params.addBodyParameter("type", "common");
         params.addBodyParameter("img", file == null ? new File(path) : file);
         String url = CommonUtil.getAppBaseUrl(ct) + "mobile/uploadEmployeeAttach.action";
-        Log.i("urlparams",url);
+        Log.i("urlparams", url);
         final HttpUtils http = new HttpUtils();
         http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
             @Override
             public void onStart() {
                 progressDialog.show();
-                ViewUtil.ToastMessage(ct, getString(R.string.sending_picture)+"...");
+                ViewUtil.ToastMessage(ct, getString(R.string.sending_picture) + "...");
             }
 
             @Override
             public void onLoading(long total, long current, boolean isUploading) {
                 if (isUploading) {
-                    if (sended_p == mPhotoList.size()){
+                    if (sended_p == mPhotoList.size()) {
                         release_btn.setEnabled(true);
-                        Toast.makeText(ct,getString(R.string.fangkui_success),Toast.LENGTH_LONG).show();
+                        Toast.makeText(ct, getString(R.string.fangkui_success), Toast.LENGTH_LONG).show();
                         finish();
                     }
                 } else {
@@ -818,10 +835,10 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
             public void onSuccess(ResponseInfo<String> responseInfo) {
                 ViewUtil.ToastMessage(ct, getString(R.string.Uploaded_successfully));
                 if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
-                    sended_p ++;
-                    update = update + getID(JSON.parseObject(responseInfo.result).getString("id"))+";";
-                    Log.i("update_cb_attch",update+"");
-                    if (sended_p == mPhotoList.size()){
+                    sended_p++;
+                    update = update + getID(JSON.parseObject(responseInfo.result).getString("id")) + ";";
+                    Log.i("update_cb_attch", update + "");
+                    if (sended_p == mPhotoList.size()) {
                         //TODO 更新附件ID接口
                         doUpdateId(update);
                     }

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

@@ -32,8 +32,7 @@ import java.util.ArrayList;
  * @desc:切换语言
  * @author：Arison on 2017/5/11
  */
-public class  SelectLanguageActivity extends BaseActivity {
-
+public class SelectLanguageActivity extends BaseActivity {
 
     private PullToRefreshListView mlist;
     private EmptyLayout mEmptyLayout;
@@ -50,7 +49,7 @@ public class  SelectLanguageActivity extends BaseActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.btn_save){
+        if (item.getItemId() == R.id.btn_save) {
             if (!TextUtils.isEmpty(currentLanguage)) {
                 switchLanguage(currentLanguage);
                 switchLanguageAction();
@@ -58,7 +57,7 @@ public class  SelectLanguageActivity extends BaseActivity {
                 switchLanguage("rCN");
                 switchLanguageAction();
             }
-        }else if (item.getItemId() == android.R.id.home){
+        } else if (item.getItemId() == android.R.id.home) {
             onBackPressed();
         }
         return true;
@@ -108,14 +107,14 @@ public class  SelectLanguageActivity extends BaseActivity {
     }
 
     private void initData() {
-        currentLanguage=   PreferenceUtils.getString(this, "language", "rCN");
+        currentLanguage = PreferenceUtils.getString(this, "language", "rCN");
         Business b = new Business();
         b.setName(getString(R.string.language_sys));
         b.setCode("sys");
         if (currentLanguage.equals("sys"))
             b.setIsChecked(true);
         mData.add(b);
-       
+
         b = new Business();
         b.setCode("rCN");
         b.setName(getString(R.string.language_rCN));
@@ -183,7 +182,7 @@ public class  SelectLanguageActivity extends BaseActivity {
             } else {
                 holder = (ViewHolder) convertView.getTag();
             }
-            
+
             holder.cb_left.setFocusable(false);
             holder.cb_left.setEnabled(false);
             holder.cb_left.setClickable(false);
@@ -201,7 +200,7 @@ public class  SelectLanguageActivity extends BaseActivity {
             }
             return convertView;
         }
-        
+
         class ViewHolder {
             SmoothCheckBox cb_left;
             TextView tv_business_name;
@@ -215,7 +214,7 @@ public class  SelectLanguageActivity extends BaseActivity {
         it.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         startActivity(it);
         overridePendingTransition(0, 0);
- //       System.exit(10);
+        //       System.exit(10);
 //        android.os.Process.killProcess(android.os.Process.myPid());
     }
 

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

@@ -17,7 +17,6 @@ import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
@@ -78,7 +77,7 @@ import java.util.List;
  */
 public class SettingActivity extends BaseActivity implements View.OnClickListener {
 
-    private Button mExitBtn;
+    private TextView mExitBtn;
     private TextView mCacheTv;
     private TextView uas_website_tv;
     private TextView tv_menu_setting;
@@ -152,7 +151,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         dialog = new ProgressDialog(this);
         dialog.setIndeterminate(true);
         share_rl = (RelativeLayout) findViewById(R.id.share_rl);
-        mExitBtn = (Button) findViewById(R.id.exit_btn);
+        mExitBtn = (TextView) findViewById(R.id.exit_btn);
         //share_rl.setVisibility(View.GONE);
         int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.BAIDU_PUSH);
 
@@ -298,7 +297,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                     if (o.toString().contains("result")) {
                         if (!CommonUtil.isReleaseVersion()) {
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
-                        }else if ("1".equals(JSON.parseObject(o.toString()).getString("result"))) {
+                        } else if ("1".equals(JSON.parseObject(o.toString()).getString("result"))) {
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
                         } else {
                             businessmen_setting_rl.setVisibility(View.GONE);
@@ -603,6 +602,9 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
             viewContext.findViewById(R.id.super_setting_tv).setVisibility(View.GONE);
             viewContext.findViewById(R.id.work_setting_tv).setVisibility(View.GONE);
             viewContext.findViewById(R.id.office_addr_setting_tv).setVisibility(View.GONE);
+            viewContext.findViewById(R.id.super_setting_line).setVisibility(View.GONE);
+            viewContext.findViewById(R.id.work_setting_line).setVisibility(View.GONE);
+            viewContext.findViewById(R.id.office_addr_setting_line).setVisibility(View.GONE);
         } else {
             viewContext.findViewById(R.id.super_setting_tv).setOnClickListener(this);
             viewContext.findViewById(R.id.work_setting_tv).setOnClickListener(this);

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

@@ -59,6 +59,7 @@ public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter
         mDoneFragment = new B2BBusinessListFragment();
 
         mAllFragment.setListType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
+        mAllFragment.setListState("");
         mDoneFragment.setListType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
         mDoneFragment.setListState("done");
 

app_modular/appworks/src/main/java/com/uas/appworks/fragment/B2BBusinessListFragment.java

@@ -267,6 +267,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
             params.put("keyword", mKeyWord);
         }
 
+        LogUtil.d("b2blistparams", params.toString());
         String host = new ApiPlatform().getBaseUrl();
         if (mListType == B2BBusinessListBean.PUBLIC_INQUIRY_LIST) {
             host = Constants.API_INQUIRY;