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

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -85,7 +85,7 @@ import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.settings.activity.FeedbackActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
-import com.xzjmyk.pm.activity.ui.erp.fragment.WorkPlatFragment;
+import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;
 import com.xzjmyk.pm.activity.ui.me.ScreenListener;
@@ -138,7 +138,9 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 	private Fragment mLastFragment;
 	private MessageFragment mMessageFragment;
 	private MyFriendFragment mMyFriendFragment;//我的朋友---相互关注，单项关注，房间
-	private WorkPlatFragment mWorksFragment;//工作
+//	private WorkPlatFragment mWorksFragment;//工作
+	private WorksFragment mWorksFragment;//工作
+	
 	private GroupChatFragment mGroupChatFragment;//群聊
 	private MeFragment mMeFragment;//我
 	private ContactsFragment mBusinessCircleFragment;
@@ -288,7 +290,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 
 			} else if (checkedId == R.id.main_tab_three) {  //点击工作选项
 				if (mWorksFragment == null) {
-					mWorksFragment = new WorkPlatFragment();
+					mWorksFragment = new WorksFragment();
 				}
 				changeFragment(mWorksFragment, TAG_NEARBY);
 				getSupportActionBar().setTitle(R.string.usoft_science);
@@ -892,7 +894,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 		mLastFragment = getSupportFragmentManager().findFragmentById(R.id.main_content);
 		mMessageFragment = (MessageFragment) getSupportFragmentManager().findFragmentByTag(TAG_MESSAGE);
 		mMyFriendFragment = (MyFriendFragment) getSupportFragmentManager().findFragmentByTag(TAG_MY);
-		mWorksFragment = (WorkPlatFragment) getSupportFragmentManager().findFragmentByTag(TAG_NEARBY);
+		mWorksFragment = (WorksFragment) getSupportFragmentManager().findFragmentByTag(TAG_NEARBY);
 		mGroupChatFragment = (GroupChatFragment) getSupportFragmentManager().findFragmentByTag(TAG_GROUP_CHAT);
 		mMeFragment = (MeFragment) getSupportFragmentManager().findFragmentByTag(TAG_ME);
 		mBusinessCircleFragment = (ContactsFragment) getSupportFragmentManager().findFragmentByTag(TAG_BusinessCircle);

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/UserRoleUtils.java

@@ -7,7 +7,7 @@ import com.core.app.MyApplication;
 import com.core.app.R;
 import com.core.utils.CommonUtil;
 import com.uas.appme.settings.activity.SettingActivity;
-import com.xzjmyk.pm.activity.ui.erp.fragment.WorkPlatFragment;
+import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;
 import com.xzjmyk.pm.activity.ui.message.MessageFragment;
 
@@ -33,7 +33,7 @@ public class UserRoleUtils {
                         view.findViewById(R.id.waitting_work_rl).setVisibility(View.GONE);//待办工作
                         view.findViewById(R.id.subscribe_rl).setVisibility(View.GONE);//我的订阅
                     }
-                    if (fragment instanceof WorkPlatFragment){
+                    if (fragment instanceof WorksFragment){
                         view.findViewById(R.id.rl_uas_sys).setVisibility(View.GONE);
                         view.findViewById(R.id.my_client_rl).setVisibility(View.GONE);
                         view.findViewById(R.id.setting_rl).setVisibility(View.GONE);
@@ -53,7 +53,7 @@ public class UserRoleUtils {
                         view.findViewById(R.id.waitting_work_rl).setVisibility(View.VISIBLE);//待办工作
                         view.findViewById(R.id.subscribe_rl).setVisibility(View.VISIBLE);//我的订阅
                     }
-                    if (fragment instanceof WorkPlatFragment){
+                    if (fragment instanceof WorksFragment){
                         view.findViewById(R.id.rl_uas_sys).setVisibility(View.VISIBLE);
                         view.findViewById(R.id.my_client_rl).setVisibility(View.VISIBLE);
                         view.findViewById(R.id.setting_rl).setVisibility(View.VISIBLE);
@@ -73,7 +73,7 @@ public class UserRoleUtils {
                         view.findViewById(R.id.waitting_work_rl).setVisibility(View.GONE);//待办工作
                         view.findViewById(R.id.subscribe_rl).setVisibility(View.GONE);//我的订阅
                     }
-                    if (fragment instanceof WorkPlatFragment){
+                    if (fragment instanceof WorksFragment){
                        // view.findViewById(R.id.rl_uas_sys).setVisibility(View.GONE);
                         view.findViewById(R.id.my_client_rl).setVisibility(View.GONE);
                         view.findViewById(R.id.setting_rl).setVisibility(View.GONE);

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Nov 29 17:00:55 CST 2017
+#Wed Nov 29 18:27:33 CST 2017
 debugName=1
 versionName=621
-debugCode=206
+debugCode=212
 versionCode=121

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

@@ -216,7 +216,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
                 RadioButton radioButton = (RadioButton)findViewById(rg_sex.getCheckedRadioButtonId());
-                ToastMessage("id:"+radioButton.getId()+"text:"+radioButton.getText().toString());
+              //  ToastMessage("id:"+radioButton.getId()+"text:"+radioButton.getText().toString());
                 if (radioButton.getText().toString().equals("先生")){
                     sb_sex="0";
                 }else if(radioButton.getText().toString().equals("女士")){

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

@@ -489,9 +489,10 @@
                     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"
                     android:text="否"
@@ -500,11 +501,13 @@
                     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>
             <RelativeLayout
                 android:id="@+id/food_seats_rl"
+                android:visibility="gone"
                 style="@style/item_menu">
 
                 <TextView
@@ -534,6 +537,7 @@
                 android:layout_height="wrap_content"
                 android:background="@color/me_menu_item_normal"
                 android:layout_marginTop="10dp"
+                android:visibility="gone"
                 android:orientation="vertical">
                 
                 <LinearLayout

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

@@ -36,6 +36,7 @@
 
         <RelativeLayout
             android:id="@+id/sex_rl"
+            android:visibility="gone"
             style="@style/item_menu">
 
             <TextView