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

# Conflicts:
#	app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java
#	version.gradle

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

@@ -185,15 +185,51 @@
                     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_centerVertical="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="商家设置"
+                    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"
@@ -231,6 +267,8 @@
                     android:background="@drawable/hongdian"
                     android:textColor="@android:color/white"
                     android:textSize="10.0dip" />
+
+
             </RelativeLayout>
 
             <RelativeLayout
@@ -379,7 +417,7 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-          
+
             <RelativeLayout
                 android:id="@+id/language_us_rl"
                 style="@style/IMTbleLine"
@@ -417,7 +455,7 @@
                     android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
-            
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"

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

@@ -383,7 +383,11 @@ public class CommonUtil {
         Pattern p = Pattern.compile("(\\d+)");
         Matcher m = p.matcher(chche);
         if (m.find()) {
-            return Integer.parseInt(m.group(0));
+            try {
+                return Integer.parseInt(m.group(0));
+            } catch (NumberFormatException e) {
+                e.printStackTrace();
+            }
         }
         return -1;
     }

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

@@ -185,9 +185,51 @@
                     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="商家设置"
+                    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"
@@ -226,14 +268,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="10.0dip" />
 
-                <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
@@ -382,7 +417,7 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-          
+
             <RelativeLayout
                 android:id="@+id/language_us_rl"
                 style="@style/IMTbleLine"
@@ -420,7 +455,7 @@
                     android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
-            
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"

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

@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <RelativeLayout
+        android:id="@+id/image_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="形象照片"
+            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/image_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"
+            android:visibility="gone"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/keshi_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="科室设置"
+            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/people_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="人员设置"
+            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
+        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="员工休息日设置"
+            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/batchplace_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="服务/场地/房间批量设置"
+            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/employeerest_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="批量设置员工休息日"
+            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/companyrest_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="批量设置企业休息日"
+            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>
+
+</LinearLayout>

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

@@ -0,0 +1,50 @@
+<?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">
+
+    <ImageView
+        android:id="@+id/image_im"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:src="@drawable/common_header_boy"
+        android:layout_centerInParent="true"
+        />
+
+    <TextView
+        android:id="@+id/image_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="点击更换照片"
+        android:padding="10dp"
+        android:textColor="@color/blue"
+        android:textSize="18sp"
+        android:layout_above="@+id/image_im"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20dp"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:baselineAligned="false"
+        android:gravity="bottom"
+        android:orientation="vertical"
+        android:padding="10dp"
+        android:visibility="visible"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+
+        <Button
+            android:id="@+id/btn_save"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/bg_bule_btn"
+            android:padding="10dp"
+            android:text="@string/save"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_main" />
+    </LinearLayout>
+</RelativeLayout>

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

@@ -0,0 +1,229 @@
+<?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"
+    xmlns:whatever="http://schemas.android.com/tools"
+    android:background="@drawable/bg_main"
+    android:orientation="vertical">
+
+    <com.core.widget.CustomerScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <RelativeLayout
+                style="@style/IMTbleLine2"
+                android:minHeight="45dp"
+                android:background="@color/white">
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:id="@+id/name_tv"
+                    android:text="姓名"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/text_main"
+                    android:textSize="15sp"/>
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/user_name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/dark_dark_grey"
+                    android:padding="10dp"
+                    android:layout_toRightOf="@+id/name_tv"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@null"
+                    android:hint="@string/common_input"
+                    android:textSize="15sp"
+                    android:gravity="center_vertical|right"
+                    whatever:testType="regexp"
+                    whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]{1,12}+$"
+                    whatever:testErrorString="姓名只能为12个字符之内的中、英文"
+                    android:layout_marginLeft="10dp"/>
+            </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+            <RelativeLayout
+                style="@style/IMTbleLine2"
+                android:layout_height="50dp"
+                android:background="@color/white"
+                >
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:text="性别"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/text_main"
+                    android:textSize="15sp" />
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/user_sex_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/dark_dark_grey"
+                    android:padding="10dp"
+                    android:hint="请选择(必选)"
+                    android:layout_alignParentRight="true"
+                    android:gravity="center_vertical|right"
+                    android:background="@null"
+                    android:textSize="15sp"
+                    />
+            </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+            <RelativeLayout
+                android:id="@+id/ry_set_startTime"
+                style="@style/IMTbleLine2"
+                android:layout_height="50dp"
+                android:background="@color/white">
+
+
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:text="部门"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/text_main"
+                    android:textSize="15sp"/>
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/user_department_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/dark_dark_grey"
+                    android:padding="10dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@null"
+                    android:hint="请选择(必选)"
+                    android:textSize="15sp"
+                    android:gravity="center_vertical|right"
+                    android:text="医科"
+                    />
+            </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+            <RelativeLayout
+                style="@style/IMTbleLine2"
+                android:layout_height="50dp"
+                android:background="@color/white">
+
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:text="职位"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/text_main"
+                    android:textSize="15sp" />
+
+                <com.andreabaccega.widget.FormEditText
+                    xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/user_job_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/dark_dark_grey"
+                    android:padding="10dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@null"
+                    android:hint="请选择(必选)"
+                    android:textSize="15sp"
+                    android:gravity="center_vertical|right"
+                    android:text="医师"/>
+            </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+            <RelativeLayout
+                style="@style/IMTbleLine2"
+                android:layout_height="50dp"
+                android:background="@color/white">
+                <TextView
+                    android:id="@+id/tel_tv"
+                    style="@style/form_relative_left_text"
+                    android:text="号码"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/text_main"
+                    android:textSize="15sp"/>
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/user_tel_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/dark_dark_grey"
+                    android:padding="10dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@null"
+                    android:hint="@string/common_input"
+                    android:textSize="15sp"
+                    android:inputType="number"
+                    android:gravity="center_vertical|right"
+                    android:layout_toRightOf="@id/tel_tv"
+                    android:layout_marginLeft="5dp"
+                    android:maxLength="11"/>
+            </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+            <RelativeLayout
+                style="@style/IMTbleLine2"
+                android:minHeight="40dp"
+                android:background="@color/white">
+                <TextView
+                    android:id="@+id/email_tv"
+                    style="@style/form_relative_left_text"
+                    android:text="邮箱"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/text_main"
+                    android:textSize="15sp"/>
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/user_email_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/dark_dark_grey"
+                    android:padding="10dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@null"
+                    android:layout_toRightOf="@+id/email_tv"
+                    android:hint="@string/common_input"
+                    android:textSize="15sp"
+                    android:gravity="center_vertical|right"
+                    whatever:testType="regexp"
+                    whatever:customRegexp="^([\\w-])+(\\.\\w+)*@([\\w-])+((\\.\\w{2,3}){1,3})$"
+                    whatever:testErrorString="请输入正确的邮箱格式"
+                    android:maxLength="20"
+                    android:layout_marginLeft="10dp" />
+            </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+            <Button
+                android:id="@+id/btn_save"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="30dp"
+                android:background="@drawable/bg_bule_btn"
+                android:padding="10dp"
+                android:text="提交"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+        </LinearLayout>
+
+    </com.core.widget.CustomerScrollView>
+
+</LinearLayout>

app_core/message/src/main/java/com/me/message/imp/BaseToastImpl.java

@@ -12,8 +12,8 @@ import android.view.Gravity;
 import android.widget.Toast;
 
 import com.me.message.interfacepack.BaseToast;
+import com.me.message.supertoasts.R;
 import com.me.message.utils.Utils;
-import com.umano.message.supertoasts.R;
 
 /**
  * 暂时做成工具类，后面调整灵活切换，这里不设置颜色

app_modular/appme/src/main/AndroidManifest.xml

@@ -45,5 +45,16 @@
         <activity android:name=".pedometer.view.PersonalPageActivity"/>
         <activity android:name=".pedometer.view.ShareStepsActivity"
             android:label="分享"/>
+        <activity android:name=".settings.activity.BSettingActivity"
+            android:label="商家设置"/>
+        <activity android:name=".settings.activity.ImageSettingActivity"
+            android:label="形象照片"/>
+        <activity android:name=".settings.activity.PersonSettingActivity"
+            android:label="新增人员"
+            android:windowSoftInputMode="adjustPan"/>
+        <activity android:name=".settings.activity.PersonSettingListActivity"
+            android:label="@string/more"/>
+        <activity android:name=".settings.activity.BComSetRestActivity"
+            android:label="批量设置员工休息日"/>
     </application>
 </manifest>

app_modular/appme/src/main/java/com/uas/appme/settings/Constant/Constant.java

@@ -8,4 +8,5 @@ package com.uas.appme.settings.Constant;
 public class Constant {
     public static String BAIDU_PUSH = "BAIDUPUSH";
     public static String UU_STEP = "UUSTEP";
+    public static String BASE_BOOKING_SETTING_URL= "http://113.105.74.140:8092/";
 }

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

@@ -0,0 +1,148 @@
+package com.uas.appme.settings.activity;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
+import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.widget.MyListView;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.uas.appme.R;
+import com.uas.appme.settings.Constant.Constant;
+import com.uas.appme.settings.model.ComRestBean;
+import com.uas.appme.settings.model.PersonSetingBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by FANGlh on 2017/10/12.
+ * function:
+ */
+
+public class BComSetRestActivity extends BaseActivity implements View.OnClickListener{
+    private MyListView mComList;
+    private List<ComRestBean> mList;  //进行保存的员工休息数据列表
+    private PersonSetingBean mServicePersonList;  //获取商家服务人员
+    private int mList_size = 0;
+    private ComRestAdapter myAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.service_bcom_setting_activity);
+        initView();
+        initData();
+    }
+
+    private void initData() {
+
+        //获取商家服务人员
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appStoreman")
+                .add("companyid", 201)
+                .add("serviceid", MyApplication.getInstance().mLoginUser.getUserId())
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.GET)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                LogUtil.prinlnLongMsg("appStoreman", o.toString()+"");
+                try {
+                    mServicePersonList = JSON.parseObject(o.toString(),PersonSetingBean.class);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }));
+
+    }
+
+
+    private void initView() {
+        mList = new ArrayList<>();
+        mServicePersonList = new PersonSetingBean();
+        mComList = (MyListView) findViewById(R.id.com_list);
+        findViewById(R.id.add_new_rl).setOnClickListener(this);
+        myAdapter = new ComRestAdapter(this);
+        myAdapter.setModelList(mList);
+        mComList.setAdapter(myAdapter);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.add_new_rl){
+            mList_size++ ;
+            myAdapter.notifyDataSetChanged();
+        }else if (v.getId() == R.id.save_bt){
+
+        }
+    }
+
+    private class ComRestAdapter extends BaseAdapter{
+        private Context mContext;
+        private List<ComRestBean> modelList;
+
+        public List<ComRestBean> getModelList() {
+            return modelList;
+        }
+
+        public void setModelList(List<ComRestBean> modelList) {
+            this.modelList = modelList;
+        }
+
+        public ComRestAdapter(Context mContext){
+            this.mContext = mContext;
+        }
+        @Override
+        public int getCount() { return mList_size;
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            ViewHolder viewHolder = null;
+            if (convertView == null){
+                viewHolder = new ViewHolder();
+                convertView =  View.inflate(mContext, R.layout.com_rest_item,null);
+                viewHolder.name_tv = (TextView) convertView.findViewById(R.id.name_tv);
+                viewHolder.date_tv = (TextView) convertView.findViewById(R.id.date_tv);
+                convertView.setTag(viewHolder);
+            }else {
+                viewHolder = (ViewHolder) convertView.getTag();
+            }
+            if (!ListUtils.isEmpty(mList)){
+                viewHolder.name_tv.setText(mList.get(position).getSf_username()+"");
+                viewHolder.date_tv.setText(mList.get(position).getSf_date()+"");
+            }
+            return convertView;
+        }
+
+        class ViewHolder{
+            TextView name_tv;
+            TextView date_tv;
+        }
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.uas.appme.settings.activity;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.uas.appme.R;
+
+public class BRestActivity extends AppCompatActivity {
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_brest);
+	}
+}

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

@@ -0,0 +1,46 @@
+package com.uas.appme.settings.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import com.core.base.BaseActivity;
+import com.uas.appme.R;
+
+/**
+ * Created by FANGlh on 2017/10/10.
+ * function:
+ */
+
+public class BSettingActivity extends BaseActivity implements View.OnClickListener {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.bsetting_activity);
+        initView();
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.image_setting_rl){
+            startActivity(new Intent(this,ImageSettingActivity.class));
+        }else if (v.getId() == R.id.keshi_setting_rl){
+            
+        }else if (v.getId() == R.id.people_setting_rl){
+            startActivity(new Intent(this,PersonSettingListActivity.class));
+        }else if (v.getId() == R.id.employeerest_rl){
+            startActivity(new Intent(ct,BComSetRestActivity.class));
+        }else if (v.getId() == R.id.companyrest_rl){
+
+        }
+    }
+
+    private void initView() {
+        findViewById(R.id.image_setting_rl).setOnClickListener(this);
+        findViewById(R.id.keshi_setting_rl).setOnClickListener(this);
+        findViewById(R.id.people_setting_rl).setOnClickListener(this);
+        findViewById(R.id.employeerest_rl).setOnClickListener(this);
+        findViewById(R.id.companyrest_rl).setOnClickListener(this);
+    }
+}

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

@@ -0,0 +1,224 @@
+package com.uas.appme.settings.activity;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
+import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
+import com.common.data.StringUtil;
+import com.common.ui.CameraUtil;
+import com.common.ui.ProgressDialogUtil;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
+import com.core.utils.ToastUtil;
+import com.lidroid.xutils.HttpUtils;
+import com.lidroid.xutils.exception.HttpException;
+import com.lidroid.xutils.http.ResponseInfo;
+import com.lidroid.xutils.http.callback.RequestCallBack;
+import com.lidroid.xutils.http.client.HttpRequest;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.uas.appme.R;
+import com.uas.appme.settings.Constant.Constant;
+import com.umeng.socialize.utils.Log;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by FANGlh on 2017/10/10.
+ * function:
+ */
+
+public class ImageSettingActivity extends BaseActivity implements View.OnClickListener{
+    private ImageView mImageIm;
+    private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
+    private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
+    private static final int REQUEST_CODE_PICK_PHOTO = 2;//单选照片
+    private int Max_Size = 1;
+    private String photoselect=null;
+    private ProgressDialog mProgressDialog;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.image_setting_activity);
+
+        initView();
+    }
+
+    private void initView() {
+        mImageIm = (ImageView) findViewById(R.id.image_im);
+        findViewById(R.id.image_tv).setOnClickListener(this);
+        findViewById(R.id.btn_save).setOnClickListener(this);
+        mProgressDialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait));
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.image_tv){
+            showSelectPictureDialog();
+        }else if (v.getId() == R.id.btn_save){
+            doSaveImage();
+        }
+
+    }
+    private void doSaveImage() {
+        if (StringUtil.isEmpty(photoselect)) return;
+        File waterBitmapToFile=  new File(photoselect);
+        if (!waterBitmapToFile.isFile()){
+            return;
+        }else {
+            com.lidroid.xutils.http.RequestParams params = new com.lidroid.xutils.http.RequestParams();
+            params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
+            params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+            params.addBodyParameter("userid", MyApplication.getInstance().mLoginUser.getUserId());
+            params.addBodyParameter("file1", waterBitmapToFile);
+            String url = "http://113.105.74.140:8080/upload/UploadServlet";
+            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(com.uas.appworks.R.string.sending_picture)+"...");
+                }
+                @Override
+                public void onLoading(long total, long current, boolean isUploading) {
+                    if (isUploading) {
+                    } else {
+                    }
+                }
+
+                @Override
+                public void onSuccess(ResponseInfo<String> responseInfo) {
+                    if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
+                        LogUtil.prinlnLongMsg("UploadServlet", responseInfo.result + "");
+
+                        try {
+                            JSONObject object = JSON.parseObject(responseInfo.result);
+                            JSONObject dataobject = object.getJSONObject("data");
+                            if (dataobject == null) return;
+                            JSONArray imagearray = dataobject.getJSONArray("images");
+                            if (ListUtils.isEmpty(imagearray)) return;
+                            String oUrl = imagearray.getJSONObject(0).getString("oUrl");
+                            if (!StringUtil.isEmpty(oUrl))
+                                doUpdateUrl(oUrl);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    }
+                }
+
+                @Override
+                public void onFailure(HttpException error, String msg) {
+                    ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.common_save_failed) + msg);
+                    progressDialog.dismiss();
+                }
+            });
+        }
+    }
+
+    private void doUpdateUrl(String oUrl) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("sc_imageurl",oUrl);
+        params.put("sc_uu",201);
+//        params.put("sc_uu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_uu"));
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appStorurl")
+                .add("map",JSONUtil.map2JSON(params))
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                LogUtil.prinlnLongMsg("hi/appStorurl", o.toString()+"ddd");
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBoolean("result")){
+                    ToastMessage(getString(R.string.common_save_success));
+                    progressDialog.dismiss();
+                    finish();
+                }
+        }
+    }));
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == 0x01 && resultCode == 0x02 && data != null){  //新的多选方式
+            photoselect = data.getStringArrayListExtra("files").get(0);
+            mImageIm.setImageURI(Uri.fromFile(new File(photoselect)));
+            Log.i("files0x01",data.getStringArrayListExtra("files").toString());
+            Log.i("files0x01",photoselect);
+        }else if (requestCode == REQUEST_CODE_CAPTURE_PHOTO) {// 拍照返回
+            if (resultCode == Activity.RESULT_OK) {
+                if (mNewPhotoUri != null) {
+                    photoselect = mNewPhotoUri.getPath();
+                    mImageIm.setImageURI(mNewPhotoUri);
+                } else {
+                    ToastUtil.showToast(this, com.uas.appworks.R.string.c_take_picture_failed);
+                }
+            }
+        }else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 传统单选方式，选择一张图片,然后立即调用裁减
+            if (resultCode == Activity.RESULT_OK){
+                if (data != null && data.getData() != null){
+                    photoselect= CameraUtil.getImagePathFromUri(this, data.getData());
+                    mImageIm.setImageURI(Uri.fromFile(new File(photoselect)));
+                    Log.i("files0x01",photoselect);
+                }
+            }
+        }
+    }
+
+    private void showSelectPictureDialog() {
+        String[] items = new String[]{getString(com.uas.appworks.R.string.c_take_picture), getString(com.uas.appworks.R.string.c_photo_album)};
+        AlertDialog.Builder builder = new AlertDialog.Builder(this).setSingleChoiceItems(items, 0,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == 0) {
+                            takePhoto();
+                        } else {
+                            selectPhoto();
+                        }
+                        dialog.dismiss();
+                    }
+                });
+        builder.show();
+    }
+
+    private void takePhoto() {
+        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().getLoginUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
+        CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+    }
+
+    private void selectPhoto() {
+        CameraUtil.pickImageSimple(this, REQUEST_CODE_PICK_PHOTO);  //传统单选方式
+        //新式多选方式
+//        Intent intent = new Intent();
+//        intent.putExtra("MAX_SIZE",Max_Size);
+//        intent.putExtra("CURRENT_SIZE",0);
+//        intent.setClass(ct,ImgFileListActivity.class);
+//        startActivityForResult(intent,0x01);
+    }
+
+}

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

@@ -0,0 +1,184 @@
+package com.uas.appme.settings.activity;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.RelativeLayout;
+import android.widget.Toast;
+
+import com.alibaba.fastjson.JSON;
+import com.andreabaccega.widget.FormEditText;
+import com.common.LogUtil;
+import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.utils.CommonUtil;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.uas.appme.R;
+import com.uas.appme.settings.Constant.Constant;
+import com.uas.appme.settings.model.PersonSetingBean;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by FANGlh on 2017/10/10.
+ * function:
+ */
+
+public class PersonSettingActivity extends BaseActivity implements View.OnClickListener{
+    private FormEditText mUserNameTv;
+    private FormEditText mUserSexTv;
+    private RelativeLayout mRySetStartTime;
+    private FormEditText mUserDepartmentTv;
+    private FormEditText mUserJobTv;
+    private FormEditText mUserTelTv;
+    private FormEditText mUserEmailTv;
+    private Button mBtnSave;
+    private String sm_id;
+    private int sm_sex = -1;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.person_setting_activity);
+
+        initView();
+        initData();
+    }
+
+
+    private void initView() {
+
+        mUserNameTv = (FormEditText) findViewById(R.id.user_name_tv);
+        mUserSexTv = (FormEditText) findViewById(R.id.user_sex_tv);
+        mRySetStartTime = (RelativeLayout) findViewById(R.id.ry_set_startTime);
+        mUserDepartmentTv = (FormEditText) findViewById(R.id.user_department_tv);
+        mUserJobTv = (FormEditText) findViewById(R.id.user_job_tv);
+        mUserTelTv = (FormEditText) findViewById(R.id.user_tel_tv);
+        mUserEmailTv = (FormEditText) findViewById(R.id.user_email_tv);
+        mBtnSave = (Button) findViewById(R.id.btn_save);
+
+        mUserSexTv.setKeyListener(null);
+        mUserSexTv.setFocusable(false);
+        mUserSexTv.setOnClickListener(this);
+        mUserDepartmentTv.setKeyListener(null);
+        mUserDepartmentTv.setFocusable(false);
+        mUserDepartmentTv.setOnClickListener(this);
+
+        mBtnSave.setOnClickListener(this);
+
+    }
+    private void initData() {
+
+        //更新时的数据获取
+        String result = getIntent().getStringExtra("mdoel");
+        int position = getIntent().getIntExtra("position",-1);
+        if (!StringUtil.isEmpty(result) && position != -1)
+            showUpdatedata(result,position);
+    }
+
+    private void showUpdatedata(String result,int position) {
+            PersonSetingBean model = new PersonSetingBean();
+        try {
+            model = JSON.parseObject(result,PersonSetingBean.class);
+            mUserNameTv.setText(model.getResult().get(position).getSm_username());
+            mUserDepartmentTv.setText(model.getResult().get(position).getSm_stname());
+            mUserJobTv.setText(model.getResult().get(position).getSm_level());
+            mUserTelTv.setText(model.getResult().get(position).getSm_telephone());
+            mUserEmailTv.setText("");
+            sm_id = model.getResult().get(position).getSm_id();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.user_sex_tv){
+            showSelectSexDialog();
+        }else if (v.getId() == R.id.user_department_tv){
+
+        }else if (v.getId() == R.id.btn_save){
+            saveJudge();
+        }
+    }
+    private void saveJudge() {
+        if (mUserNameTv.testValidity() && mUserSexTv.testValidity()
+                && mUserDepartmentTv.testValidity() && mUserJobTv.testValidity() &&
+                mUserTelTv.testValidity()&& mUserEmailTv.testValidity()
+                ){
+            if (mUserEmailTv.getText().toString().contains("@")){
+                saveRequest();
+            }else {
+                ToastMessage(getString(com.uas.appcontact.R.string.Please_imput_the_correct_email_format));
+            }
+
+        }
+    }
+
+    private void saveRequest() {
+
+        Map<String, Object> params = new HashMap<>();
+        if (!StringUtil.isEmpty(sm_id))
+            params.put("sm_id",sm_id);
+
+        params.put("sm_stid",111);
+        params.put("sm_userid",MyApplication.getInstance().mLoginUser.getUserId());
+        params.put("sm_username",mUserNameTv.getText().toString());
+//        params.put("sm_companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_uu"));
+        params.put("sm_companyid",201);
+        params.put("sm_stname",mUserDepartmentTv.getText().toString());
+        params.put("sm_companyname", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_commpany"));
+        params.put("sm_level",mUserJobTv.getText().toString());
+        params.put("sm_telephone",mUserTelTv.getText().toString());
+        params.put("sm_email",mUserEmailTv.getText().toString());
+        params.put("sm_sex",sm_sex);
+
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appPersonSet")
+                .add("map", JSONUtil.map2JSON(params))
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                LogUtil.prinlnLongMsg("appPersonSet", o.toString()+"");
+                if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBoolean("result")) {
+                    Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
+                    finish();
+                }
+            }
+        }));
+
+    }
+
+    private void showSelectSexDialog() {
+        // 1是男，0是女，2是全部
+        String[] sexs = new String[]{ getString(com.uas.appcontact.R.string.user_body), getString(com.uas.appcontact.R.string.user_girl)};
+        int checkItem = 0;
+        new AlertDialog.Builder(this).setTitle(getString(com.uas.appcontact.R.string.select_sex_title))
+                .setSingleChoiceItems(sexs, checkItem, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == 0) {
+                            mUserSexTv.setText(R.string.user_body);
+                            sm_sex = 1;
+                        } else {
+                            mUserSexTv.setText(R.string.user_girl);
+                            sm_sex = 0;
+                        }
+                        dialog.dismiss();
+                    }
+                }).setCancelable(true).create().show();
+    }
+}

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

@@ -0,0 +1,116 @@
+package com.uas.appme.settings.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+
+import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
+import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.widget.EmptyLayout;
+import com.core.widget.MyListView;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.uas.appme.R;
+import com.uas.appme.settings.Constant.Constant;
+import com.uas.appme.settings.adapter.PSettingListAdapter;
+import com.uas.appme.settings.model.PersonSetingBean;
+
+/**
+ * Created by FANGlh on 2017/10/11.
+ * function:
+ */
+
+public class PersonSettingListActivity extends BaseActivity {
+
+    private PersonSetingBean mList;
+    private MyListView psetting_list;
+    private PSettingListAdapter myAdapter;
+    private EmptyLayout mEmptyLayout;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.person_setting_list_activity);
+        initView();
+        initData();
+        initEvents();
+    }
+
+
+    private void initView() {
+        mList = new PersonSetingBean();
+        psetting_list = (MyListView) findViewById(R.id.psetting_list);
+        myAdapter = new PSettingListAdapter(this);
+        psetting_list.setAdapter(myAdapter);
+
+
+
+        mEmptyLayout = new EmptyLayout(this,psetting_list);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
+        mEmptyLayout.setShowLoadingButton(false);
+    }
+    private void initData() {
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appStoreman")
+                .add("companyid", 201)
+                .add("serviceid",MyApplication.getInstance().mLoginUser.getUserId())
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.GET)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                LogUtil.prinlnLongMsg("appStoreman", o.toString()+"");
+                try {
+                    mList = JSON.parseObject(o.toString(),PersonSetingBean.class);
+                    myAdapter.setModel(mList);
+                    myAdapter.notifyDataSetChanged();
+
+                    if (mList == null || ListUtils.isEmpty(mList.getResult()))
+                        mEmptyLayout.showEmpty();
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }));
+
+    }
+
+    private void initEvents() {
+        psetting_list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Intent intent = new Intent(ct,PersonSettingActivity.class);
+                intent.putExtra("mdoel",JSON.toJSONString(mList));
+                intent.putExtra("position",position);
+                LogUtil.prinlnLongMsg("intentmodel",JSON.toJSONString(mList.getResult().get(position)));
+                startActivity(intent);
+            }
+        });
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.add_new, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.add){
+            startActivity(new Intent(this,PersonSettingActivity.class));
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

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

@@ -100,6 +100,8 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 	private String newStep_service_name = "com.uas.appme.pedometer.service.StepService";
 
 	private PopupWindow setWindow = null;//
+    private PopupWindow setWindow = null;//
+    private RelativeLayout businessmen_setting_rl;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -110,28 +112,32 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 	}
 
 
-	private void initView() {
-		uas_website_tv = (TextView) findViewById(R.id.uas_website_tv);
-		tv_menu_setting = (TextView) findViewById(R.id.tv_menu_setting);
-		cb_task_reply = (SwitchView) findViewById(R.id.cb_task_reply);
-		uu_step_rl = (RelativeLayout) findViewById(R.id.uu_step_rl);
-		sign_in_rl = (RelativeLayout) findViewById(R.id.sign_in_rl);
-		sign_out_rl = (RelativeLayout) findViewById(R.id.sign_out_rl);
-		tv_signauto_new = (TextView) findViewById(R.id.tv_signauto_new);
-		tv_sign_new = (TextView) findViewById(R.id.tv_sign_new);
-		tv_language_new = (TextView) findViewById(R.id.tv_language_new);
-		tv_booking_new = (TextView) findViewById(R.id.tv_booking_new);
-		tv_help_new = (TextView) findViewById(R.id.tv_help_new);
-		language_us_rl = (RelativeLayout) findViewById(R.id.language_us_rl);
-		uu_step_im = (ImageView) findViewById(R.id.uu_step_im);
-		uu_step_reply = (SwitchView) findViewById(R.id.uu_step_reply);
-		rl_app_update = (RelativeLayout) findViewById(R.id.rl_app_update);
-		version_value = (TextView) findViewById(R.id.version_value);
-		close_push_rl = (RelativeLayout) findViewById(R.id.close_push_rl);
-		speech_recognition_rl = (RelativeLayout) findViewById(R.id.speech_recognition_rl);
-		new_step_rl = (RelativeLayout) findViewById(R.id.new_step_rl);
-		booking_set_rl = (RelativeLayout) findViewById(R.id.booking_set_rl);
-
+    private void initView() {
+        uas_website_tv = (TextView) findViewById(R.id.uas_website_tv);
+        tv_menu_setting = (TextView) findViewById(R.id.tv_menu_setting);
+        cb_task_reply = (SwitchView) findViewById(R.id.cb_task_reply);
+        uu_step_rl = (RelativeLayout) findViewById(R.id.uu_step_rl);
+        sign_in_rl = (RelativeLayout) findViewById(R.id.sign_in_rl);
+        sign_out_rl = (RelativeLayout) findViewById(R.id.sign_out_rl);
+        tv_signauto_new = (TextView) findViewById(R.id.tv_signauto_new);
+        tv_sign_new = (TextView) findViewById(R.id.tv_sign_new);
+        tv_language_new = (TextView) findViewById(R.id.tv_language_new);
+        tv_booking_new = (TextView) findViewById(R.id.tv_booking_new);
+        tv_help_new = (TextView) findViewById(R.id.tv_help_new);
+        language_us_rl = (RelativeLayout) findViewById(R.id.language_us_rl);
+        uu_step_im = (ImageView) findViewById(R.id.uu_step_im);
+        uu_step_reply = (SwitchView) findViewById(R.id.uu_step_reply);
+        rl_app_update = (RelativeLayout) findViewById(R.id.rl_app_update);
+        version_value = (TextView) findViewById(R.id.version_value);
+        close_push_rl = (RelativeLayout) findViewById(R.id.close_push_rl);
+        speech_recognition_rl = (RelativeLayout) findViewById(R.id.speech_recognition_rl);
+        new_step_rl = (RelativeLayout) findViewById(R.id.new_step_rl);
+        booking_set_rl = (RelativeLayout) findViewById(R.id.booking_set_rl);
+        businessmen_setting_rl = (RelativeLayout) findViewById(R.id.businessmen_setting_rl);
+        businessmen_setting_rl.setOnClickListener(this);
+
+        if (CommonUtil.isReleaseVersion())
+            businessmen_setting_rl.setVisibility(View.GONE);
 
 		new_step_rl.setOnClickListener(this);
 //        new_step_rl.setVisibility(View.GONE);
@@ -343,44 +349,46 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 					BDAutoUpdateSDK.cpUpdateCheck(SettingActivity.this,
 							new CPCheckUpdateCallback() {
 
-								@Override
-								public void onCheckUpdateCallback(
-										AppUpdateInfo info,
-										AppUpdateInfoForInstall infoForInstall) {
-									if (infoForInstall != null
-											&& !TextUtils
-											.isEmpty(infoForInstall
-													.getInstallPath())) {
-									} else if (info != null) {
-									} else {
-										ViewUtil.ShowMessageTitle(
-												SettingActivity.this,
-												getString(R.string.set_isnewVersion));
-									}
-									dialog.dismiss();
-								}
-							});
-				}
-			});
-		} else if (v.getId() == R.id.super_setting_tv) {
-			startActivityForResult(new Intent(mContext, SignSeniorSettingActivity.class), 0x12);
-			closePopupWindow();
-		} else if (v.getId() == R.id.work_setting_tv) {
-			intent = new Intent(mContext, FlightsActivity.class);
-			startActivityForResult(intent, 0x12);
-			closePopupWindow();
-		} else if (v.getId() == R.id.office_addr_setting_tv) {
-			startActivityForResult(new Intent(mContext, OfficeAddressSettingsActivity.class), 0x12);
-			closePopupWindow();
-		} else if (v.getId() == R.id.my_rule_setting_tv) {
-			intent = new Intent(mContext, MyRuleSetActivity.class);
-			showMyRele(intent);
-			startActivity(intent);
-			closePopupWindow();
-		} else if (v.getId() == R.id.cancel_tv) {
-			closePopupWindow();
-		}
-	}
+                               @Override
+                               public void onCheckUpdateCallback(
+                                       AppUpdateInfo info,
+                                       AppUpdateInfoForInstall infoForInstall) {
+                                   if (infoForInstall != null
+                                           && !TextUtils
+                                           .isEmpty(infoForInstall
+                                                   .getInstallPath())) {
+                                   } else if (info != null) {
+                                   } else {
+                                       ViewUtil.ShowMessageTitle(
+                                               SettingActivity.this,
+                                               getString(R.string.set_isnewVersion));
+                                   }
+                                   dialog.dismiss();
+                               }
+                           });
+               }
+           });
+       }else if (v.getId() == R.id.super_setting_tv){
+           startActivityForResult(new Intent(mContext, SignSeniorSettingActivity.class), 0x12);
+           closePopupWindow();
+       }else if (v.getId() == R.id.work_setting_tv){
+           intent = new Intent(mContext, FlightsActivity.class);
+           startActivityForResult(intent, 0x12);
+           closePopupWindow();
+       }else if (v.getId() == R.id.office_addr_setting_tv){
+           startActivityForResult(new Intent(mContext, OfficeAddressSettingsActivity.class), 0x12);
+           closePopupWindow();
+       }else if (v.getId() == R.id.my_rule_setting_tv){
+           intent = new Intent(mContext, MyRuleSetActivity.class);
+//                presenter.showMyRele(intent, adapter.getModels());
+           startActivity(intent);
+           closePopupWindow();
+       }else if (v.getId() == R.id.cancel_tv){
+           closePopupWindow();
+       }else if (v.getId() == R.id.businessmen_setting_rl){
+           startActivity(new Intent(this,BSettingActivity.class));
+       }
+    }
 
 	public void showMyRele(Intent intent) {
 		List<WorkModel> models = WorkModelDao.getInstance().query(true);

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

@@ -0,0 +1,69 @@
+package com.uas.appme.settings.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.uas.appme.R;
+import com.uas.appme.settings.model.PersonSetingBean;
+
+/**
+ * Created by FANGlh on 2017/10/12.
+ * function:
+ */
+
+public class PSettingListAdapter extends BaseAdapter {
+    private PersonSetingBean model;
+    private Context mContext;
+
+    public PSettingListAdapter(Context mContext){this.mContext = mContext;}
+    public PersonSetingBean getModel() {return model;}
+    public void setModel(PersonSetingBean model) {this.model = model;}
+
+    @Override
+    public int getCount() {
+        return model == null ? 0 : model.getResult().size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return model.getResult().get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder viewHolder = null;
+        if (convertView == null){
+            viewHolder = new ViewHolder();
+            convertView =  View.inflate(mContext, R.layout.psetting_item,null);
+            viewHolder.name_tv = (TextView) convertView.findViewById(R.id.name_tv);
+            viewHolder.company_tv = (TextView) convertView.findViewById(R.id.company_tv);
+            viewHolder.department_tv = (TextView) convertView.findViewById(R.id.department_tv);
+            viewHolder.position_tv = (TextView) convertView.findViewById(R.id.position_tv);
+            viewHolder.phone_tv = (TextView) convertView.findViewById(R.id.phone_tv);
+            convertView.setTag(viewHolder);
+        }else {
+            viewHolder = (ViewHolder) convertView.getTag();
+        }
+
+        viewHolder.name_tv.setText(model.getResult().get(position).getSm_username());
+        viewHolder.company_tv.setText(model.getResult().get(position).getSm_companyname());
+        viewHolder.department_tv.setText(model.getResult().get(position).getSm_stname());
+        viewHolder.position_tv.setText(model.getResult().get(position).getSm_level());
+        viewHolder.phone_tv.setText(model.getResult().get(position).getSm_telephone());
+        return convertView;
+    }
+
+    class ViewHolder{
+        TextView name_tv,company_tv,department_tv,position_tv,phone_tv;
+    }
+
+
+}

app_modular/appme/src/main/java/com/uas/appme/settings/model/ComRestBean.java

@@ -0,0 +1,56 @@
+package com.uas.appme.settings.model;
+
+/**
+ * Created by FANGlh on 2017/10/12.
+ * function:
+ *
+ * map包括sf_userid 人员ID,sf_username 姓名,sf_date 休息日,sf_companyid 公司UU,sf_companyname 公司名称
+ */
+
+public class ComRestBean {
+    private String sf_userid;
+    private String sf_username;
+    private String sf_date;
+    private String sf_companyid;
+    private String sf_companyname;
+
+    public String getSf_userid() {
+        return sf_userid;
+    }
+
+    public void setSf_userid(String sf_userid) {
+        this.sf_userid = sf_userid;
+    }
+
+    public String getSf_username() {
+        return sf_username;
+    }
+
+    public void setSf_username(String sf_username) {
+        this.sf_username = sf_username;
+    }
+
+    public String getSf_date() {
+        return sf_date;
+    }
+
+    public void setSf_date(String sf_date) {
+        this.sf_date = sf_date;
+    }
+
+    public String getSf_companyid() {
+        return sf_companyid;
+    }
+
+    public void setSf_companyid(String sf_companyid) {
+        this.sf_companyid = sf_companyid;
+    }
+
+    public String getSf_companyname() {
+        return sf_companyname;
+    }
+
+    public void setSf_companyname(String sf_companyname) {
+        this.sf_companyname = sf_companyname;
+    }
+}

app_modular/appme/src/main/java/com/uas/appme/settings/model/PersonSetingBean.java

@@ -0,0 +1,135 @@
+package com.uas.appme.settings.model;
+
+import java.util.List;
+
+/**
+ * Created by FANGlh on 2017/10/11.
+ * function:
+ */
+
+public class PersonSetingBean   {
+
+    private List<ResultBean> result;
+
+    public List<ResultBean> getResult() {
+        return result;
+    }
+
+    public void setResult(List<ResultBean> result) {
+        this.result = result;
+    }
+
+    public static class ResultBean {
+        /**
+         * sm_companyid : 201
+         * sm_companyname : 北大医院
+         * sm_id : 10001
+         * sm_level : 医师
+         * sm_stid : 10001
+         * sm_stname : 骨科
+         * sm_telephone : 13910000001
+         * sm_userid : 1
+         * sm_username : 张三
+         */
+
+        private String sm_companyid;
+        private String sm_companyname;
+        private String sm_id;
+        private String sm_level;
+        private String sm_stid;
+        private String sm_stname;
+        private String sm_telephone;
+        private String sm_userid;
+        private String sm_username;
+        private String sm_sex;
+        private String sm_email;
+
+        public String getSm_sex() {
+            return sm_sex;
+        }
+
+        public void setSm_sex(String sm_sex) {
+            this.sm_sex = sm_sex;
+        }
+
+        public String getSm_email() {
+            return sm_email;
+        }
+
+        public void setSm_email(String sm_email) {
+            this.sm_email = sm_email;
+        }
+
+        public String getSm_companyid() {
+            return sm_companyid;
+        }
+
+        public void setSm_companyid(String sm_companyid) {
+            this.sm_companyid = sm_companyid;
+        }
+
+        public String getSm_companyname() {
+            return sm_companyname;
+        }
+
+        public void setSm_companyname(String sm_companyname) {
+            this.sm_companyname = sm_companyname;
+        }
+
+        public String getSm_id() {
+            return sm_id;
+        }
+
+        public void setSm_id(String sm_id) {
+            this.sm_id = sm_id;
+        }
+
+        public String getSm_level() {
+            return sm_level;
+        }
+
+        public void setSm_level(String sm_level) {
+            this.sm_level = sm_level;
+        }
+
+        public String getSm_stid() {
+            return sm_stid;
+        }
+
+        public void setSm_stid(String sm_stid) {
+            this.sm_stid = sm_stid;
+        }
+
+        public String getSm_stname() {
+            return sm_stname;
+        }
+
+        public void setSm_stname(String sm_stname) {
+            this.sm_stname = sm_stname;
+        }
+
+        public String getSm_telephone() {
+            return sm_telephone;
+        }
+
+        public void setSm_telephone(String sm_telephone) {
+            this.sm_telephone = sm_telephone;
+        }
+
+        public String getSm_userid() {
+            return sm_userid;
+        }
+
+        public void setSm_userid(String sm_userid) {
+            this.sm_userid = sm_userid;
+        }
+
+        public String getSm_username() {
+            return sm_username;
+        }
+
+        public void setSm_username(String sm_username) {
+            this.sm_username = sm_username;
+        }
+    }
+}

app_modular/appme/src/main/res/drawable/rl_circular_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="4dp" android:left="6dp" android:right="6dp" android:top="4dp" />
+        </shape>
+    </item>
+</selector>

app_modular/appme/src/main/res/drawable/text_hint_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#cecece" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="2dp" android:left="10dp" android:right="10dp" android:top="2dp" />
+        </shape>
+    </item>
+</selector>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.uas.appme.settings.activity.BRestActivity">
+
+</LinearLayout>

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

@@ -0,0 +1,101 @@
+<?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:layout_marginLeft="25dp"
+    android:layout_marginRight="25dp"
+    android:orientation="vertical"
+    >
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="15dp"
+        android:background="@drawable/text_hint_bg"
+        android:textColor="@color/green"
+        android:textSize="16sp"
+        android:visibility="invisible"
+        />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@drawable/rl_circular_bg">
+
+        <RelativeLayout
+            style="@style/IMTbleLine2"
+            android:layout_height="50dp"
+            android:background="@color/white"
+            >
+
+            <TextView
+                android:id="@+id/of_add_set_range_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="@string/name"
+                android:textSize="14sp"
+                />
+
+            <TextView
+                android:id="@+id/name_tv"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/of_add_set_range_img"
+                android:layout_toRightOf="@+id/of_add_set_range_text"
+                android:textColor="@color/dark_dark_grey"
+                android:padding="10dp"
+                />
+            <ImageView
+                android:id="@+id/of_add_set_range_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>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:background="@color/item_line"
+            android:layout_below="@+id/position_tv"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            />
+        <RelativeLayout
+            style="@style/IMTbleLine2"
+            android:layout_height="50dp"
+            android:background="@color/white"
+            >
+
+            <TextView
+                android:id="@+id/of_add_set_range_text2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="休息时间"
+                android:textSize="14sp"
+                />
+
+            <TextView
+                android:id="@+id/date_tv"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/of_add_set_range_img2"
+                android:layout_toRightOf="@+id/of_add_set_range_text2"
+                android:textColor="@color/dark_dark_grey"
+                android:padding="10dp"
+                />
+            <ImageView
+                android:id="@+id/of_add_set_range_img2"
+                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>
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,30 @@
+<?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">
+
+    <com.core.widget.CustomerScrollView
+        android:id="@+id/csv_hide"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:fillViewport="true"
+        android:scrollbars="none"
+        android:visibility="visible">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <com.core.widget.MyListView
+                android:id="@+id/psetting_list"
+                android:layout_marginLeft="25dp"
+                android:layout_marginRight="25dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scrollbars="none"
+                android:paddingBottom="20dp">
+            </com.core.widget.MyListView>
+        </LinearLayout>
+    </com.core.widget.CustomerScrollView>
+
+</LinearLayout>

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

@@ -0,0 +1,113 @@
+<?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:layout_marginLeft="25dp"
+    android:layout_marginRight="25dp"
+    android:orientation="vertical"
+    >
+
+    <TextView
+        android:id="@+id/name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="15dp"
+        android:background="@drawable/text_hint_bg"
+        android:text="张三"
+        android:textColor="@color/green"
+        android:textSize="16sp"
+        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@drawable/rl_circular_bg">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/company_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="5dp"
+                android:text="北大医院"
+                android:textColor="@color/green"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentLeft="true"
+                android:layout_marginLeft="20dp"
+                />
+
+            <TextView
+                android:id="@+id/department_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="10dp"
+                android:text="骨科"
+                android:textColor="@color/green"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="20dp"/>
+            <TextView
+                android:id="@+id/position_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingBottom="5dp"
+                android:paddingTop="10dp"
+                android:text="医师"
+                android:textColor="@color/green"
+                android:layout_below="@+id/department_tv"
+                android:layout_marginRight="20dp"
+                android:layout_alignParentRight="true"
+                />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line"
+                android:layout_below="@+id/position_tv"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dp">
+            <ImageView
+                android:id="@+id/champion_im"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/phone"
+                />
+
+
+            <TextView
+                android:id="@+id/phone_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="18122222222"
+                android:textColor="@color/green"
+                android:layout_toRightOf="@+id/champion_im"
+                android:layout_marginLeft="15dp"
+                android:layout_centerVertical="true"/>
+
+
+            <ImageView
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:src="@drawable/next"
+                android:layout_marginRight="19dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="19dp"
+                android:id="@+id/imageView3" />
+
+        </RelativeLayout>
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,59 @@
+<?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/base_bg">
+
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <com.core.widget.MyListView
+                android:id="@+id/com_list"
+                android:layout_marginLeft="25dp"
+                android:layout_marginRight="25dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scrollbars="none"
+                android:paddingBottom="20dp">
+            </com.core.widget.MyListView>
+
+
+            <RelativeLayout
+                android:id="@+id/add_new_rl"
+                android:layout_width="match_parent"
+                style="@style/IMTbleLine2"
+                android:layout_height="50dp"
+                android:background="@color/white"
+                >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:text="+新增"
+                    android:textColor="#2F95DD"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    />
+
+            </RelativeLayout>
+            <Button
+                android:id="@+id/save_bt"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="30dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="50dp"
+                android:background="@drawable/bg_bule_btn"
+                android:padding="10dp"
+                android:text="@string/common_save_button"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>

app_modular/appme/src/main/res/menu/add_new.xml

@@ -0,0 +1,12 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.xzjmyk.pm.activity.MainActivity">
+
+    <item
+        android:id="@+id/add"
+        android:title="@string/add"
+        android:icon="@drawable/more"
+        app:showAsAction="ifRoom" />
+
+</menu>

app_modular/appme/src/main/res/menu/bperson_setting_list.xml

@@ -0,0 +1,12 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.xzjmyk.pm.activity.MainActivity">
+
+    <item
+        android:id="@+id/more"
+        android:title="@string/more"
+        android:icon="@drawable/xlist"
+        app:showAsAction="ifRoom" />
+
+</menu>

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/CommonDocDetailsActivity.java

@@ -1083,6 +1083,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
         if (formdataArray != null && "FeePlease!FYBX".equals(mCaller)) {
             try {
                 String fb_attach = formdataArray.getJSONObject(0).getString("fb_attach");
+                Log.i("fb_attachshow",fb_attach+"show");
                 if (fb_attach==null||"null".equals(fb_attach)||fb_attach.length()<=0) {
                     ex_invoice_ll.setVisibility(View.GONE);
                 }else {
@@ -1091,7 +1092,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     grid_view.deferNotifyDataSetChanged();
                     ex_invoice_ll.setVisibility(View.VISIBLE);
                 }
-                Log.i("fb_attachshow",fb_attach+"show");
             } catch (JSONException e) {
                 e.printStackTrace();
             }

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 9,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 120,
-            versionName      : '5.9.8',
+            versionCode      : 121,
+            versionName      : '5.9.9',
     ]
 
     depsVersion = [