提交分类 修复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/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingListActivity.java

@@ -104,8 +104,6 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
         setContentView(R.layout.activity_booking_list);
         getSupportActionBar().setTitle(getString(R.string.booking_menu));
         ViewUtils.inject(this);
-//        String path=null;
-//        new File(path);
         initView();
         initEvent();
     }
@@ -538,6 +536,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
 //                                int day = c.get(Calendar.DAY_OF_MONTH);
                             //                               calendarView.setDownIndex(day);
                             if (mDatas.size() == 0) {
+                                emptyLayout.setEmptyMessage("您还没有预约，现在就去约吧！");
                                 emptyLayout.showEmpty();
                             }
                         }
@@ -617,7 +616,6 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if ((keyCode == KeyEvent.KEYCODE_BACK)) {
             Intent it = new Intent(BookingListActivity.this, MainActivity.class);
-            // it.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
             startActivity(it);
             overridePendingTransition(R.anim.anim_activity_out, R.anim.anim_activity_in);
             finish();

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

@@ -16,9 +16,8 @@
         android:layout_gravity="center"
         android:gravity="center"
         android:layout_centerInParent="true"
-        android:textSize="12sp"
-        android:text="多约一个老板就多一个生意\n
-       现在就去约他们吧！"
+        android:textSize="14sp"
+        android:text="您还没有预约，现在就去约吧！"
        />
 
 </LinearLayout>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Dec 18 09:07:42 CST 2017
-debugName=190
+#Tue Dec 19 18:31:53 CST 2017
+debugName=211
 versionName=611
-debugCode=190
+debugCode=211
 versionCode=150

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

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

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

@@ -15,10 +15,21 @@
         </shape>
     </item>
     <item>
-        <shape>
-            <solid android:color="@color/titleBlue" />
-            <corners android:radius="1dp" />
-            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        <shape android:shape="rectangle">
+            <corners
+                android:topLeftRadius="4dp"
+                android:topRightRadius="4dp"
+                android:bottomRightRadius="4dp"
+                android:bottomLeftRadius="4dp">
+            </corners>
+            <stroke
+                android:width="1dp"
+                android:color="#999999">
+            </stroke>
+            <solid
+                android:color="@color/titleBlue">
+            </solid>
         </shape>
+
     </item>
 </selector>

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

@@ -1684,7 +1684,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                  }
                              }
                              if (desklist!=null){
-                                 if (deskbook.size()==0){
+                                 if (desklist.size()==0){
                                      tv_food_rooms.setHint(R.string.common_select);
                                      ll_seats_panel.setVisibility(View.GONE);
                                      food_seats_rl.setVisibility(View.GONE);

app_modular/appbooking/src/main/java/com/modular/booking/activity/shares/BBSharesListActivity.java

@@ -33,7 +33,7 @@ public class BBSharesListActivity extends BaseActivity {
     }
     
     private void initView(){
-        getSupportActionBar().setTitle("共享预约");
+        getSupportActionBar().setTitle("预约共享");
         mlist= (PullToRefreshListView) findViewById(R.id.shareList);
         emptyLayout=new EmptyLayout(mContext,mlist.getRefreshableView());
         if (getIntent()!=null){
@@ -42,6 +42,7 @@ public class BBSharesListActivity extends BaseActivity {
             mAdapter.setTime(true);
             mlist.setAdapter(mAdapter);
             if (mAdapter.getCount()==0){
+                emptyLayout.setEmptyMessage("您还没有预约，现在就去约吧！");
                 emptyLayout.showEmpty();
             }
         }

app_modular/appbooking/src/main/java/com/modular/booking/activity/shares/MuiltSelectShareActivity.java

@@ -9,7 +9,6 @@ import android.widget.AdapterView;
 
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
-import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
@@ -42,12 +41,11 @@ public class MuiltSelectShareActivity extends OABaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_shares_list);
-        LogUtil.d(TAG,"AppUtils.isDebug():"+ BaseConfig.isDebug());
         initView();
     }
 
     private void initView() {
-        getSupportActionBar().setTitle("预约分享");
+        getSupportActionBar().setTitle("预约共享");
         mlist = (PullToRefreshListView) findViewById(R.id.shareList);
         emptyLayout = new EmptyLayout(ct, mlist.getRefreshableView());
         if (getIntent() != null) {
@@ -56,6 +54,7 @@ public class MuiltSelectShareActivity extends OABaseActivity {
             mAdapter.setTime(true);
             mlist.setAdapter(mAdapter);
             if (mAdapter.getCount()==0){
+                emptyLayout.setEmptyMessage("您还没有预约，现在就去约吧！");
                 emptyLayout.showEmpty();
             }
         }

app_modular/appbooking/src/main/java/com/modular/booking/widget/AddSubUtils.java

@@ -223,12 +223,12 @@ public class AddSubUtils extends LinearLayout implements View.OnClickListener, T
 
     @Override
     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-       
+        onNumberInput();
     }
 
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {
-        onNumberInput();
+  
     }
 
     /**

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

@@ -3,7 +3,7 @@
     android:id="@+id/book_service_action"
     android:layout_width="match_parent"
     android:background="@color/antionbarcolor"
-    android:layout_height="48dp">
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/book_service_search_back"

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

@@ -7,11 +7,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/transparent"
-        android:horizontalSpacing="15dp"
+        android:horizontalSpacing="5dp"
         android:numColumns="2"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:paddingTop="5dp"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
         android:scrollbars="none"
-        android:verticalSpacing="10dp" />
+        android:verticalSpacing="5dp" />
 </RelativeLayout>

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

@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.xzjmyk.pm.activity.view.shadow.ShadowLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:sl_cornerRadius="0dp"
+    app:sl_dx="-1dp"
+    app:sl_dy="3dp"
+    app:sl_shadowColor="@color/shadow"
+    app:sl_shadowRadius="3dp">
+<RelativeLayout 
     android:orientation="vertical"
     android:layout_width="match_parent"
+    android:background="@color/white"
     android:layout_height="match_parent">
     <RelativeLayout
         android:id="@+id/rlImage"
@@ -17,12 +28,13 @@
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:textSize="16sp"
+   
         android:gravity="center"
         android:layout_alignParentBottom="true"
         android:textColor="@color/white"
         android:textStyle="bold"
         android:background="#80000000"
-        android:text="服务项目" />
+        android:text="服务项目" />  
 </RelativeLayout>
     <LinearLayout
         android:layout_width="match_parent"
@@ -32,7 +44,7 @@
         android:orientation="horizontal">
         <TextView
             android:id="@+id/tvBookAction"
-            android:layout_width="60dp"
+            android:layout_width="80dp"
             android:layout_height="30dp"
             android:gravity="center"
             
@@ -45,4 +57,5 @@
             android:background="@color/gray"/>
     </LinearLayout>
   
-</RelativeLayout>
+</RelativeLayout>
+</com.xzjmyk.pm.activity.view.shadow.ShadowLayout>

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

@@ -17,7 +17,7 @@
     <item>
         <shape>
             <solid android:color="@color/titleBlue" />
-            <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>