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

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

@@ -76,7 +76,7 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
         current_date = TimeUtils.s_long_2_str(DateFormatUtil.str2Long(CURRENT_DATE, "yyyy年MM月dd日"));
 
         CompanyRestBean model = new CompanyRestBean();
-        model.setSc_companyid(Constant.BASE_COMPANYID);
+        model.setSc_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
 //            model.setSc_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
         model.setSc_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
         model.setSc_date("");
@@ -92,7 +92,7 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
     public void onClick(View v) {
         if (v.getId() == R.id.add_new_rl){
             CompanyRestBean model = new CompanyRestBean();
-            model.setSc_companyid(Constant.BASE_COMPANYID);
+            model.setSc_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
 //            model.setSc_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
             model.setSc_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
             model.setSc_date("");

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

@@ -76,7 +76,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
 //                .add("companyid", 201)
-                .add("companyid", Constant.BASE_COMPANYID)
+                .add("companyid", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
                 .add("serviceid", 10002)
                 .add("token",MyApplication.getInstance().mAccessToken)
                 .method(Method.GET)
@@ -135,7 +135,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
         current_date = TimeUtils.s_long_2_str(DateFormatUtil.str2Long(CURRENT_DATE, "yyyy年MM月dd日"));
 
         ComRestBean model = new ComRestBean();
-        model.setSf_companyid(Constant.BASE_COMPANYID);
+        model.setSf_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
         model.setSf_username("");
         model.setSf_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
         model.setSf_userid(MyApplication.getInstance().mLoginUser.getUserId());
@@ -153,7 +153,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
     public void onClick(View v) {
         if (v.getId() == R.id.add_new_rl){
             ComRestBean model = new ComRestBean();
-            model.setSf_companyid(Constant.BASE_COMPANYID);
+            model.setSf_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
             model.setSf_username("");
             model.setSf_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
             model.setSf_userid(MyApplication.getInstance().mLoginUser.getUserId());

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

@@ -145,7 +145,7 @@ public class BSetComRestListActivity extends BaseActivity {
 		httpClient.Api().send(new HttpClient.Builder()
 				.url(url)
 //				.add("companyid", 201)
-				.add("companyid",Constant.BASE_COMPANYID)
+				.add("companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
 				.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/BSettingActivity.java

@@ -12,6 +12,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.utils.CommonUtil;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -42,7 +43,7 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyType")
-                .add("companyid", Constant.BASE_COMPANYID)
+                .add("companyid", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
                 .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/BSettingLocationActivity.java

@@ -105,7 +105,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         }else {
             BSetLocationBean model = new BSetLocationBean();
             model.setSt_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
-            model.setSt_companyid(Constant.BASE_COMPANYID);
+            model.setSt_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
             model.setSt_siid(sc_industrycode);
             model.setSt_name("");
             mList.add(model);
@@ -143,7 +143,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         if (v.getId() == R.id.add_new_rl){
             BSetLocationBean model = new BSetLocationBean();
             model.setSt_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
-            model.setSt_companyid(Constant.BASE_COMPANYID);
+            model.setSt_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
             model.setSt_siid(sc_industrycode);
             model.setSt_name("");
             model.setSt_id("0");

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

@@ -127,7 +127,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
             return;
         }
         Map<String,Object> param = new HashMap<>();
-        param.put("sc_uu",Constant.BASE_COMPANYID);
+        param.put("sc_uu",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
         param.put("sc_booktype",sc_booktype);
 
         LogUtil.prinlnLongMsg("appStoreUpdate",JSONUtil.map2JSON(param));
@@ -178,7 +178,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyAdmin")
-                .add("companyid",Constant.BASE_COMPANYID)
+                .add("companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
                 .add("token", MyApplication.getInstance().mAccessToken)
                 .add("userid",MyApplication.getInstance().mLoginUser.getUserId())
                 .method(Method.GET)
@@ -212,7 +212,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
             return;
         }
         Map<String,Object> param = new HashMap<>();
-        param.put("sc_uu",Constant.BASE_COMPANYID);
+        param.put("sc_uu",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
         param.put("sc_starttime",mTvStartTime.getText().toString());
         param.put("sc_endtime",mTvEndTime.getText().toString());
 

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

@@ -160,7 +160,7 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
     private void doUpdateUrl(String oUrl) {
         Map<String, Object> params = new HashMap<>();
         params.put("sc_imageurl",oUrl);
-        params.put("sc_uu",Constant.BASE_COMPANYID);
+        params.put("sc_uu",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.getHeaders().remove("Content-Type");
         httpClient.Api().send(new HttpClient.Builder()

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

@@ -115,7 +115,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appPlaceList")
-                .add("companyid",Constant.BASE_COMPANYID)
+                .add("companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
                 .add("token",MyApplication.getInstance().mAccessToken)
                 .method(Method.POST)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
@@ -239,7 +239,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         params.put("sm_stid",111);
         params.put("sm_userid",MyApplication.getInstance().mLoginUser.getUserId());
         params.put("sm_username",mUserNameTv.getText().toString());
-        params.put("sm_companyid",Constant.BASE_COMPANYID);
+        params.put("sm_companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
         params.put("sm_stname",mUserDepartmentEv.getText().toString());
         params.put("sm_companyname", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_commpany"));
         params.put("sm_level",mUserJobTv.getText().toString());

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

@@ -73,7 +73,7 @@ public class PersonSettingListActivity extends BaseActivity {
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
-                .add("companyid", Constant.BASE_COMPANYID)
+                .add("companyid", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
                 .add("serviceid",0)
                 .add("token",MyApplication.getInstance().mAccessToken)
                 .method(Method.GET)

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

@@ -270,10 +270,11 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyAdmin")
+//                .add("companyid",10043574)
 //                .add("companyid",201)
 //                .add("userid",100254)
 //                .add("token",1)
-                .add("companyid",Constant.BASE_COMPANYID)
+                .add("companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
                 .add("userid", MyApplication.getInstance().mLoginUser.getUserId())
                 .add("token",MyApplication.getInstance().mAccessToken)