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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 10 15:56:45 CST 2018
-debugName=405
+#Thu Jan 11 18:13:05 CST 2018
+debugName=407
 versionName=624
-debugCode=405
+debugCode=407
 versionCode=163

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

@@ -28,6 +28,7 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -115,7 +116,8 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
     }
 
     private void checkIsHavePassword() {
-        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+//        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(buildtrue);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("mobile/salary/checkPassword.action")
                 .add("phone",mTel.getText().toString())
@@ -226,8 +228,8 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
             if (!CommonUtil.isNetWorkConnected(ct)){
                 ToastMessage(getString(R.string.common_notlinknet));
                 return;
-            }
-            HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+            }HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+//            HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
             httpClient.Api().send(new HttpClient.Builder()
                     .url("mobile/salary/verificationCode.action")
 //                    .header("Cookie","JSESSIONID="+CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"))
@@ -243,7 +245,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                         codeTimeOut = false;
                         mWagesCodeBtn.setVisibility(View.GONE);
                         seconds_tv.setVisibility(View.VISIBLE);
-                        mWagesCodeEt.setText(JSON.parseObject(o.toString()).getString("vecode")+"");
+//                        mWagesCodeEt.setText(JSON.parseObject(o.toString()).getString("vecode")+"");
                         isRun = true;
                         startRun();
                     }
@@ -294,7 +296,8 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
     }
 
     private void doSavePW() {
-        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+//        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("mobile/salary/changePassword.action")
                 .add("emcode", emcode)
@@ -324,8 +327,8 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
             ToastMessage("验证码超时，请重新获取");
             return;
         }
-        //        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
-        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+                HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+//        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("mobile/salary/getEmSalary.action")
                 .add("emcode", emcode)

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

@@ -19,6 +19,7 @@ import com.common.LogUtil;
 import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -117,7 +118,8 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
                 return;
             }
             mTelTv.setText(mPhoneEt.getText().toString());
-            HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+            HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+//            HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
             httpClient.Api().send(new HttpClient.Builder()
                     .url("mobile/salary/verificationCode.action")
 //                    .header("Cookie","JSESSIONID="+CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"))
@@ -130,7 +132,7 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
                     if (!JSONUtil.validate(o.toString()) || o == null) return;
                     if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")){
                         Toast.makeText(ct,"短信发送成功,请在一分钟内完成输入验证",Toast.LENGTH_LONG).show();
-                        mCodeEt.setText(JSON.parseObject(o.toString()).getString("vecode")+"");
+//                        mCodeEt.setText(JSON.parseObject(o.toString()).getString("vecode")+"");
                         showStepView(2);
                     }
 
@@ -168,7 +170,8 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
     }
 
     private void doChangePW() {
-        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+//        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("mobile/salary/changePassword.action")
                 .add("emcode", CommonUtil.getEmcode())

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

@@ -24,7 +24,6 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baidu.cyberplayer.utils.G;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
@@ -33,6 +32,7 @@ import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
@@ -338,8 +338,8 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         }
 
         errorgone = false;
-        //        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
-        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+                HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+//        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("mobile/salary/getEmSalary.action")
                 .add("emcode", emcode)
@@ -367,8 +367,8 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     }
 
     private void doErrorMsgHandle() {
-//        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
-        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+//        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("mobile/salary/salaryWrong.action")
                 .add("sl_id",sl_id)
@@ -458,8 +458,8 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             ToastMessage(getString(R.string.common_notlinknet));
             return;
         }
-//        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
-        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+//        HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("mobile/salary/salaryBackNoSignature.action\n")
                 .add("emcode", emcode)