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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/WorkMenuParentAdapter.java

@@ -252,7 +252,7 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                     String url = Constants.ACCOUNT_CENTER_HOST +
                             "agency?token=" + accountToken + "&appId=mall&spaceUU=" + enuu
                             + "&returnURL=https://www.usoftmall.com/"
-                            + "&baseUrl=https://www.usoftmall.com/newLogin/other";
+                            + "&baseURL=https://www.usoftmall.com/newLogin/other";
                     intent.putExtra("url", url);
                     intent.putExtra("p", context.getString(R.string.work_business_find));
                     intent.putExtra("cookie", true);

app_modular/apptasks/src/main/java/com/modular/apptasks/presenter/SchedulePresenter.java

@@ -36,7 +36,7 @@ public class SchedulePresenter {
 
     private HttpClient getHttpClient() {
         if (httpClient == null) {
-            String baseUrl = "http://192.168.253.230:8080/schedule/";
+            String baseUrl = "https://mobile.ubtob.com:8443/schedule/";
             if (!StringUtil.isEmpty(baseUrl)) {
                 httpClient = new HttpClient.Builder(baseUrl).isDebug(true)
                         .connectTimeout(5000)

app_modular/appworks/src/main/java/com/uas/appworks/activity/ScheduleActivity.java

@@ -85,7 +85,7 @@ public class ScheduleActivity extends BaseNetActivity {
 
     @Override
     protected String getBaseUrl() {
-        return "http://192.168.253.230:8080/schedule/";
+        return "https://mobile.ubtob.com:8443/schedule/";
     }
 
     private void initView() {

app_modular/appworks/src/main/java/com/uas/appworks/activity/ScheduleSearchActivity.java

@@ -67,7 +67,7 @@ public class ScheduleSearchActivity extends BaseNetActivity {
     }
     @Override
     protected String getBaseUrl() {
-        return "http://192.168.253.230:8080/schedule/";
+        return "https://mobile.ubtob.com:8443/schedule/";
     }
 
     private void initView() {

app_modular/appworks/src/main/java/com/uas/appworks/activity/SchedulerCreateActivity.java

@@ -146,7 +146,7 @@ public class SchedulerCreateActivity extends BaseNetActivity {
 
     @Override
     protected String getBaseUrl() {
-        return "http://192.168.253.230:8080/schedule/";
+        return "https://mobile.ubtob.com:8443/schedule/";
     }
 
     private void findById() {

app_modular/appworks/src/main/java/com/uas/appworks/activity/TimeHelperActivity.java

@@ -200,7 +200,7 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
     }
 
     private void getByDaySchedule(String day) {
-        mPresenter.httpRequest(mContext, "http://192.168.253.230:8080/",
+        mPresenter.httpRequest(mContext, "https://mobile.ubtob.com:8443/",
                 new HttpParams.Builder()
                         .url("schedule/schedule/getByDaySchedule")
                         .method(Method.GET)

app_modular/appworks/src/main/java/com/uas/appworks/activity/TimeHelperSettingActivity.java

@@ -71,7 +71,7 @@ public class TimeHelperSettingActivity extends BaseMVPActivity<SimplePresenter>
 
     @Override
     protected void initData() {
-        mPresenter.httpRequest(this, "http://192.168.253.230:8080/",
+        mPresenter.httpRequest(this, "https://mobile.ubtob.com:8443/",
                 new HttpParams.Builder()
                         .url("schedule/config/loadConfig")
                         .method(Method.GET)
@@ -189,7 +189,7 @@ public class TimeHelperSettingActivity extends BaseMVPActivity<SimplePresenter>
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.menu_time_helper_setting_save) {
 
-            mPresenter.httpRequest(this, "http://192.168.253.230:8080/",
+            mPresenter.httpRequest(this, "https://mobile.ubtob.com:8443/",
                     new HttpParams.Builder()
                             .url("schedule/config/saveConfig")
                             .method(Method.POST)