代码冲突

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

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

@@ -646,8 +646,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             map.put("sb_telephone", StringUtil.getTextRexHttp(et_book_phone));//姓名
         }
         if (TextUtils.isEmpty(et_book_notes.getText())) {
-            showToast("备注为必填项", R.color.load_error);
-            return null;
+//            showToast("备注为必填项", R.color.load_error);
+//            return null;
         } else {
             map.put("sb_remark", StringUtil.getTextRexHttp(et_book_notes));//姓名
         }
@@ -711,8 +711,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     setTime(map, tv_sport_time);
                 }
                 if (TextUtils.isEmpty(tv_sport_peoples.getText())) {
-                    showToast("运动人数为必填项", R.color.load_error);
-                    return null;
+//                    showToast("运动人数为必填项", R.color.load_error);
+//                    return null;
                 } else {
                     map.put("sb_person", StringUtil.getFirstInt(tv_sport_peoples.getText().toString(), 1));//人数
                 }
@@ -756,8 +756,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     setTime(map, tv_club_time);
                 }
                 if (TextUtils.isEmpty(tv_club_peoples.getText())) {
-                    showToast("人数为必填项", R.color.load_error);
-                    return null;
+//                    showToast("人数为必填项", R.color.load_error);
+//                    return null;
                 } else {
                     map.put("sb_person", StringUtil.getFirstInt(tv_club_peoples.getText().toString(), 1));//人数
                 }
@@ -784,8 +784,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     setTime(map, tv_ktv_times);
                 }
                 if (TextUtils.isEmpty(tv_ktv_peoples.getText())) {
-                    showToast("人数为必填项", R.color.load_error);
-                    return null;
+//                    showToast("人数为必填项", R.color.load_error);
+//                    return null;
                 } else {
                     map.put("sb_person", StringUtil.getFirstInt(tv_ktv_peoples.getText().toString(), 1));//人数
                 }
@@ -874,6 +874,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 break;
             case "运动健身":
                 findViewById(R.id.ll_sport).setVisibility(View.VISIBLE);
+                
                 if (isEdited) {
                     tv_sport_peoples.setOnClickListener(this);
                     tv_sport_rooms.setOnClickListener(this);
@@ -908,6 +909,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 break;
             case "会所":
                 findViewById(R.id.ll_club).setVisibility(View.VISIBLE);
+                tv_club_peoples.setVisibility(View.GONE);
                 if (isEdited) {
                     tv_club_technician.setOnClickListener(this);
                     tv_club_time.setOnClickListener(this);
@@ -925,6 +927,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 break;
             case "KTV":
                 findViewById(R.id.ll_ktv).setVisibility(View.VISIBLE);
+                tv_ktv_peoples.setVisibility(View.GONE);
                 if (isEdited) {
                     tv_ktv_times.setOnClickListener(this);
                     tv_ktv_rooms.setOnClickListener(this);
@@ -959,6 +962,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 break;
             case "10002"://运动健身
                 findViewById(R.id.ll_sport).setVisibility(View.VISIBLE);
+                tv_sport_peoples.setVisibility(View.GONE);
                 if (isEdited) {
                     tv_sport_peoples.setOnClickListener(this);
                     tv_sport_rooms.setOnClickListener(this);
@@ -1008,6 +1012,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 break;
             case "10005"://会所
                 findViewById(R.id.ll_club).setVisibility(View.VISIBLE);
+                tv_club_peoples.setVisibility(View.GONE);
                 if (isEdited) {
                     tv_club_technician.setOnClickListener(this);
                     tv_club_time.setOnClickListener(this);
@@ -1025,6 +1030,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 break;
             case "10006"://ktv
                 findViewById(R.id.ll_ktv).setVisibility(View.VISIBLE);
+                tv_ktv_peoples.setVisibility(View.GONE);
                 if (isEdited) {
                     tv_ktv_times.setOnClickListener(this);
                     tv_ktv_rooms.setOnClickListener(this);

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

@@ -128,6 +128,7 @@
 
             <RelativeLayout
                 android:id="@+id/ktv_people_rl"
+                android:visibility="gone"
                 style="@style/item_menu">
 
                 <TextView
@@ -203,6 +204,7 @@
 
             <RelativeLayout
                 android:id="@+id/club_pepoles_rl"
+                android:visibility="gone"
                 style="@style/item_menu">
 
                 <TextView
@@ -353,6 +355,7 @@
 
             <RelativeLayout
                 android:id="@+id/sport_peoples_rl"
+                android:visibility="gone"
                 style="@style/item_menu">
 
                 <TextView
@@ -613,7 +616,7 @@
                     android:layout_toRightOf="@id/tag_book_notes"
                     android:drawablePadding="6dp"
                     android:ellipsize="end"
-                    android:hint="@string/common_input"/>
+                    android:hint="@string/common_input2"/>
 
 
             </RelativeLayout>