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

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

@@ -77,7 +77,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
                 .url("user/appStoreman")
 //                .add("companyid", 201)
                 .add("companyid", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
-                .add("serviceid", 10002)
+                .add("serviceid", 0)
                 .add("token",MyApplication.getInstance().mAccessToken)
                 .method(Method.GET)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {

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

@@ -174,7 +174,6 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
 
     //获取是否之前有设置的时间
     private void initData() {
-        if (setType == 2) return;
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyAdmin")
@@ -194,6 +193,18 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
                         mTvStartTime.setText(JSON.parseObject(o.toString()).getString("starttime")+"");
                     if (o.toString().contains("endtime"))
                         mTvEndTime.setText(JSON.parseObject(o.toString()).getString("endtime"));
+                    String timekind = JSON.parseObject(o.toString()).getString("timekind");
+                    if (!StringUtil.isEmpty(timekind)){
+                        if ("1".equals(timekind)){
+                            sc_booktype = 1;
+                            period_tv.setBackgroundResource(R.color.aqua);
+                            timpoint_tv.setBackgroundResource(R.color.white);
+                        }else {
+                            sc_booktype = 0;
+                            period_tv.setBackgroundResource(R.color.white);
+                            timpoint_tv.setBackgroundResource(R.color.aqua);
+                        }
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

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

@@ -58,6 +58,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
     private TextView user_department_tv;
     private List<String> departmentModel_list;
     private String result;
+    private String sm_userid;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -152,6 +153,9 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
             sm_id = model.getResult().get(position).getSm_id();
             mBtnSave.setText(getString(R.string.common_update_button));
             getSupportActionBar().setTitle(getString(R.string.common_update_button));
+
+            sm_userid = model.getResult().get(position).getSm_userid();
+
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -236,8 +240,8 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         if (!StringUtil.isEmpty(sm_id))
             params.put("sm_id",sm_id);
 
-        params.put("sm_stid",111);
-        params.put("sm_userid",MyApplication.getInstance().mLoginUser.getUserId());
+        params.put("sm_stid",0);
+        params.put("sm_userid",StringUtil.isEmail(sm_userid) ? 0 : sm_userid);
         params.put("sm_username",mUserNameTv.getText().toString());
         params.put("sm_companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
         params.put("sm_stname",mUserDepartmentEv.getText().toString());
@@ -246,6 +250,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         params.put("sm_telephone",mUserTelTv.getText().toString());
         params.put("sm_sex",sm_sex);
         params.put("sm_email",mUserEmailTv.getText().toString());
+        LogUtil.prinlnLongMsg("appPersonSet",JSONUtil.map2JSON(params));
 
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
@@ -264,11 +269,12 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
             public void onResponse(Object o) {
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("appPersonSet", o.toString()+"");
-                if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBoolean("result")) {
+                if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBoolean("result")){
                     Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
                     setResult(20);
                     finish();
-                }
+                }else
+                    ToastMessage(getString(R.string.save_failed));
             }
         }));