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

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Dec 13 16:55:40 CST 2017
-debugName=150
+#Thu Dec 14 10:48:06 CST 2017
+debugName=160
 versionName=624
-debugCode=150
+debugCode=160
 versionCode=163

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

@@ -1197,14 +1197,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         tv_food_times.setText(data.getString("sb_starttime").substring(0, 10) + " "
                                 + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
-             
                     searchSeatNumbers(tv_food_times.getText().toString(),data.getString("sb_companyid"));
-                    getSteatListStates(data.getString("sb_companyid"));//获取餐饮类别状态信息
-                    
-                    if(StringUtil.isEmpty(data.getString("sb_stname"))){
-                        tv_food_rooms.setText("无");
+                    if(StringUtil.isEmpty(data.getString("sb_spname"))){
+                        tv_food_rooms.setText(" ");
                     }else{
-                        tv_food_rooms.setText(data.getString("sb_stname"));
+                        tv_food_rooms.setText(data.getString("sb_spname"));
                     }
                     tv_food_rooms.setText(data.getString("sb_stname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
@@ -1362,12 +1359,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     }
 
                     searchSeatNumbers(tv_food_times.getText().toString(),data.getString("sb_companyid"));
-                    if(StringUtil.isEmpty(data.getString("sb_stname"))){
-                        tv_food_rooms.setText("无");
+                    if(StringUtil.isEmpty(data.getString("sb_spname"))){
+                        tv_food_rooms.setText(" ");
                     }else{
-                        tv_food_rooms.setText(data.getString("sb_stname"));
+                        tv_food_rooms.setText(data.getString("sb_spname"));
                     }
-                    tv_food_rooms.setText(data.getString("sb_stname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
                     tv_food_peoples.setVisibility(View.VISIBLE);
                     addSubUtils.setVisibility(View.GONE);

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

@@ -410,7 +410,7 @@
             android:id="@+id/ll_food"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
+            
             android:orientation="vertical">
 
             <RelativeLayout
@@ -440,13 +440,13 @@
                     android:layout_alignParentRight="true"
                     android:gravity="center_vertical"
                     jmf:editable="true"
+                    jmf:contentWidth="40dp"
                     jmf:all_background="@color/me_menu_item_normal"
                     jmf:contentTextColor="@color/black"
                     jmf:contentBackground="@color/me_menu_item_normal"
                     jmf:leftBackground="@drawable/icon_remove"
                     jmf:rightBackground="@drawable/icon_add"
-                    jmf:leftResources="@color/me_menu_item_normal"
-                    jmf:rightResources="@color/me_menu_item_normal">
+                  >
                 </com.modular.booking.widget.AddSubUtils>
             </RelativeLayout>
 
@@ -490,18 +490,19 @@
                     style="@style/item_menu_input"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginRight="45dp"
+                  
                     android:layout_toRightOf="@id/tag_food_rooms"
                     android:layout_toLeftOf="@+id/sv_food_rooms"
                     android:drawableRight="@drawable/oa_next"
                     android:contentDescription="@string/service_food_rooms"
                     android:hint="@string/common_select_not_must"
-                    android:text="否"
+                  
                     android:textColor="@color/hintColor" />
                 <com.core.widget.view.SwitchView
                     android:id="@+id/sv_food_rooms"
                     android:layout_width="40dp"
                     android:layout_height="25dp"
+                    android:visibility="gone"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true" />
             </RelativeLayout>

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

@@ -2,18 +2,18 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:divider="@drawable/divider_horizontal"
-    android:background="@drawable/addsubutils_add_sub_bg"
+ 
     android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/ic_minus"
-        android:layout_width="40dp"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:background="@null"
         android:clickable="true"
         android:padding="@dimen/addsubutils_btn_padding"
         android:scaleType="centerInside"
-        android:src="@drawable/icon_remove" />
+        />
 
     <EditText
         android:id="@+id/et_input"
@@ -26,18 +26,18 @@
         android:singleLine="true"
         android:inputType="number"
         android:minWidth="@dimen/addsubutils_et_minwidth"
-        android:text="1"
+        android:text=""
         android:textColor="@color/addsubutils_text"
         android:textCursorDrawable="@null"
         android:textSize="@dimen/addsubutils_textsize"/>
 
     <ImageView
         android:id="@+id/ic_plus"
-        android:layout_width="@dimen/addsubutils_btn_width"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:background="@drawable/addsubutils_right_selector"
+        android:background="@null"
         android:clickable="true"
         android:padding="@dimen/addsubutils_btn_padding"
         android:scaleType="centerInside"
-        android:src="@drawable/addsubutils_ic_plus" />
+        />
 </LinearLayout>