提交分类 修复BUG；

提交内容	服务预约UI调整；
当前版本	正式版本V6.1.1（测试版本6.1.1）
是否冲突	否

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

# Conflicts:
#	WeiChat/version.properties

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

@@ -392,7 +392,7 @@
         <item name="android:layout_marginLeft">10dp</item>
         <item name="android:gravity">right|center_vertical</item>
         <item name="android:textColorHint">@color/gray</item>
-        <item name="android:textSize">15sp</item>
+        <item name="android:textSize">14sp</item>
     </style>
     <!-- 日报详情总结、计划、心得内容显示样式-->
     <style name="form_relative_right_text1">

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Dec 19 18:31:53 CST 2017
-debugName=211
-versionName=611
-debugCode=211
-versionCode=150
+#Wed Dec 20 16:15:46 CST 2017
+debugName=239
+versionName=614
+debugCode=239
+versionCode=153

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

@@ -199,7 +199,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@null"
-                    android:hint="@string/common_input1"
+                    android:hint="@string/common_input"
                     android:textSize="15sp"
                     android:gravity="center_vertical|right"
                     android:layout_marginLeft="5dp"

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

@@ -370,7 +370,7 @@
 
     <style name="item_menu_tag">
         <item name="android:ellipsize">end</item>
-        <item name="android:textSize">15sp</item>
+        <item name="android:textSize">18sp</item>
         <item name="android:textColor">@color/text_normal</item>
         <item name="android:gravity">left|center_vertical</item>
         <item name="android:layout_width">wrap_content</item>
@@ -392,7 +392,7 @@
         <item name="android:layout_marginLeft">10dp</item>
         <item name="android:gravity">right|center_vertical</item>
         <item name="android:textColorHint">@color/gray</item>
-        <item name="android:textSize">15sp</item>
+        <item name="android:textSize">12sp</item>
     </style>
     <!-- 日报详情总结、计划、心得内容显示样式-->
     <style name="form_relative_right_text1">

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -295,6 +295,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             sb_userid = intent.getStringExtra("sb_userid");
             sb_username = intent.getStringExtra("sb_username");
             LogUtil.d(TAG, "sb_userid:" + sb_userid + "  sb_username:" + sb_username + " dataService:" + dataService);
+            LogUtil.prinlnLongMsg("model",JSON.toJSONString(model));
             if (model != null) {
                 LogUtil.i(model.toString());
                 initType(model.getType());
@@ -1644,6 +1645,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
           
                      @Override
                      public void onResponse(Object o) {
+                         LogUtil.prinlnLongMsg("appLineList",o.toString());
                          dimssLoading();
                          try {
                              LogUtil.d(TAG,o.toString());

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceDetailActivity.java

@@ -132,7 +132,7 @@ public class BServiceDetailActivity extends OABaseActivity implements View.OnCli
 		if (getIntent() != null) {
 			model = getIntent().getParcelableExtra("model");
 			getSupportActionBar().setTitle(model.getName());
-			LogUtil.d("myTest", "model:" + JSON.toJSONString(model));
+			LogUtil.prinlnLongMsg("myTest", "model:" + JSON.toJSONString(model));
 			if ("10005".equals(model.getIndustrycode())){
 				//会所
 				mBookStoreTv.setText("不指定技师，预约门店");

app_modular/appbooking/src/main/java/com/modular/booking/adapter/ItemRoomsSelectAdapter.java

@@ -75,10 +75,12 @@ public class ItemRoomsSelectAdapter extends BaseAdapter {
         holder.model = object;
         if (object.isBooking()) {
             holder.tvBookAction.setText("已预定");
-            holder.tvBookAction.setBackgroundResource(R.color.item_line);
+            holder.tvBookAction.setBackgroundResource(R.drawable.bg_bule_btn);
+            holder.tvBookAction.setSelected(true);
         } else {
             holder.tvBookAction.setBackgroundResource(R.drawable.bg_bule_btn);
             holder.tvBookAction.setText("预定");
+            holder.tvBookAction.setSelected(false);
         }
 
         holder.ivItem.setOnClickListener(new View.OnClickListener() {

app_modular/appbooking/src/main/res/layout/activity_bservice_add.xml

@@ -553,12 +553,17 @@
                         android:textColor="@color/blue_seats_num"
                 
                         android:text="排队实况"/>
+<!--
+                    <View
+                      
+                        style="@style/app_line_v_1dp" ></View>
+-->
                     <TextView
                         android:id="@+id/tvSeatsRight"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="10dp"
-                       
+                       android:drawableLeft="@drawable/icon_line_v"
                         android:textColor="@color/gray"
                         android:text="商家释放"/>
                 </LinearLayout>

app_modular/appbooking/src/main/res/layout/include_add_bottom.xml

@@ -52,7 +52,8 @@
                 android:id="@+id/rg_sex"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:gravity="center"
+                android:gravity="right|center_vertical"
+             
                 android:layout_toRightOf="@+id/tag_book_sex"
                 android:orientation="horizontal" >
 
@@ -70,6 +71,7 @@
                     android:id="@+id/rb_girl"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="right"
                     android:layout_marginLeft="20dp"
 
                     android:button="@null"
@@ -105,9 +107,11 @@
         </RelativeLayout>
         <RelativeLayout
             android:id="@+id/notes_rl"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="17dp"
             android:layout_height="wrap_content"
-            style="@style/item_menu">
+            style="@style/item_menu"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true">
 
             <TextView
                 android:id="@+id/tag_book_notes"

app_modular/appbooking/src/main/res/layout/include_add_top.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
     <!--抬头信息-->
     <RelativeLayout
@@ -12,27 +14,44 @@
             android:id="@+id/max_img"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:alpha="0.16"
+            android:alpha="0.5"
             android:scaleType="fitXY" />
-
+        <ImageView
+            android:id="@+id/shadow_img"
+            android:background="#80000000"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY" />
+<com.xzjmyk.pm.activity.view.shadow.ShadowLayout
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:layout_centerVertical="true"
+    android:layout_marginLeft="12dp"
+    android:layout_marginStart="12dp"
+    app:sl_shadowRadius="4dp"
+    app:sl_shadowColor="#AA000000"
+    app:sl_dx="2dp"
+    app:sl_dy="2dp"
+    android:id="@+id/sl_header"
+    app:sl_cornerRadius="50dp">
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/iv_header"
             android:layout_width="55dp"
             android:layout_height="55dp"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="12dp"
-            android:layout_marginStart="12dp"
+         
             android:background="@null"
-            android:src="@drawable/defaultpic"></de.hdodenhof.circleimageview.CircleImageView>
-
+            android:src="@drawable/defaultpic">
+            
+        </de.hdodenhof.circleimageview.CircleImageView>
+</com.xzjmyk.pm.activity.view.shadow.ShadowLayout>
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="15dp"
-            android:layout_toRightOf="@+id/iv_header"
+            android:layout_marginLeft="7dp"
+            android:layout_toRightOf="@+id/sl_header"
             android:orientation="vertical">
 
             <TextView
@@ -40,9 +59,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:drawableLeft="@drawable/icon_detail"
+                android:drawablePadding="3dp"
                 android:gravity="center_vertical"
+                android:elevation="2dp"
                 android:text="********"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="20sp"
                 android:textStyle="bold" />
 
@@ -51,9 +72,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:drawableLeft="@drawable/icon_map"
+                android:drawablePadding="3dp"
+                android:elevation="2dp"
                 android:gravity="center_vertical"
                 android:text="********"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="14sp" />
         </LinearLayout>
     </RelativeLayout>

app_modular/appbooking/src/main/res/layout/item_bservice_list.xml

@@ -44,7 +44,7 @@
                 android:layout_weight="1"
                 android:gravity="right"
                 android:text="餐饮"
-                android:textSize="10sp" />
+                android:textSize="14sp" />
         </LinearLayout>
 
         <!--<LinearLayout-->
@@ -99,13 +99,12 @@
             <TextView
                 android:id="@+id/tvCash"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
                 android:drawableLeft="@drawable/icon_tel"
-                android:padding="5dp"
                 android:layout_weight="1"
                 android:text="1328349823"
                 android:textColor="@color/light_green" />
-
             <Button
                 android:id="@+id/btBook"
                 android:layout_width="65dp"

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

@@ -89,6 +89,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     private TextView wageDateTv;
     private LinearLayout noWageLl;
     private Boolean haveData = false;
+    private TextView announcement_tv;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -106,6 +107,9 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             if (salaryObject != null){
                 JSONArray configsArray = salaryObject.getJSONArray("configs");
                 JSONObject dataObject = salaryObject.getJSONObject("data");
+                String gonggao = dataObject.getString("sl_text");
+                if (!StringUtil.isEmpty(gonggao))  announcement_tv.setText(gonggao);
+                    
                 sl_id = dataObject.getString("sl_id");
                 if (!ListUtils.isEmpty(configsArray) && dataObject != null){
                     for (int i = 0; i < configsArray.size(); i++) {
@@ -168,6 +172,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         wageDateTv = (TextView) findViewById(R.id.wage_date_tv);
         wageDateTv.setOnClickListener(this);
         noWageLl = (LinearLayout) findViewById(R.id.wage_nodata_ll);
+        announcement_tv = (TextView) findViewById(R.id.announcement);
 
 
 //        findViewById(R.id.h_sign_tv).setOnClickListener(this);
@@ -259,6 +264,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     }
 
     private void searchWage() {
+        if (!ListUtils.isEmpty(kvModeList)) kvModeList.clear();
         //        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()

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

@@ -3,14 +3,14 @@
     <item android:state_pressed="true">
         <shape>
             <solid android:color="@color/btn_orange_press" />
-            <corners android:radius="8dp" />
+            <corners android:radius="4dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
-    <item android:state_enabled="false">
+    <item android:state_selected="true">
         <shape>
             <solid android:color="@color/btn_orange_press" />
-            <corners android:radius="8dp" />
+            <corners android:radius="4dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>

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

@@ -30,6 +30,7 @@
             />
     </LinearLayout>
     <TextView
+        android:id="@+id/announcement"
         android:textSize="12sp"
         android:background="@color/white"
         android:padding="10dp"

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/CharitableListFragment.java

@@ -203,7 +203,7 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
                 char c = showTop.charAt(i);
                 TextView textView = new TextView(ct);
                 textView.setTextSize(textSize);
-                textView.setPadding(3, 2, 3, 2);
+                textView.setPadding(4, 2, 4, 2);
                 textView.setText(String.valueOf(c));
                 textView.setGravity(Gravity.CENTER_VERTICAL);
                 textView.setBackgroundResource(R.drawable.text_frame_hint_bg);