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

# Conflicts:
#	app_core/common/src/main/java/com/core/net/http/ViewUtil.java
#	app_modular/applogin/src/main/java/com/modular/login/activity/LoginActivity.java

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

@@ -13,6 +13,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -239,9 +240,10 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                Log.d("loadurl", url);
-                if (!url.equals("http://www.ubtob.com/signin#")) {
-                    if ("https://account.ubtob.com/sso/login?appId=".equals(url)) {
+                if (!TextUtils.isEmpty(url) && !url.equals("http://www.ubtob.com/signin#")) {
+                    Log.d("loadurl", url);
+                    if (url.contains("https://account.ubtob.com/sso/login") ||
+                            url.contains("https://sso.ubtob.com/")) {
                         Intent loginIntent = new Intent();
                         loginIntent.setClass(WebViewCommActivity.this, LoginActivity.class);
                         startActivity(loginIntent);

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Apr 12 18:52:32 CST 2018
-debugName=299
-versionName=628
-debugCode=299
-versionCode=168
+#Fri Apr 20 10:48:22 CST 2018
+debugName=142
+versionName=613
+debugCode=142
+versionCode=152

app_core/common/src/main/java/com/core/app/AppConfig.java

@@ -6,7 +6,6 @@ import android.content.SharedPreferences.Editor;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.common.config.BaseConfig;
 import com.core.model.ConfigBean;
 
 public class AppConfig {
@@ -179,9 +178,9 @@ public class AppConfig {
 
     private static void initApiUrls(AppConfig config) {
         String apiUrl = config.apiUrl;
-        if (BaseConfig.isDebug()){
-            apiUrl=Constants.IM_BASE_URL();
-        }
+//        if (BaseConfig.isDebug()){
+//            apiUrl=Constants.IM_BASE_URL();
+//        }
         /* 登陆注册 */
         config.USER_REGISTER = apiUrl + "user/register";// 注册
         config.VERIFY_TELEPHONE = apiUrl + "verify/telephone";// 验证手机号有没有被注册

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -527,6 +527,12 @@ public class ViewUtil {
                 ct.startActivity(new Intent("com.modular.main.DataDownloadActivity"));
             }
             CommonUtil.setSharedPreferences(ct, "erp_baseurl", erp_baseurl);
+        }else{
+            if (!StringUtil.isEmpty(CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_baseurl"))) {
+            } else {
+              MyApplication.getInstance().startActivity(new Intent("com.modular.main.DataDownloadActivity"));
+            }
+            CommonUtil.setSharedPreferences(ct, "erp_baseurl", erp_baseurl);
         }
         if (isBrodcast) {
             sendBrodcast("ERP");

app_modular/applogin/src/main/java/com/modular/login/activity/LoginActivity.java

@@ -69,7 +69,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     protected void onResume() {
         super.onResume();
 
-        requestPermission(Manifest.permission.READ_PHONE_STATE, null, null);
+        requestPermission(Manifest.permission.READ_PHONE_STATE,null,null);
         if (!MyApplication.getInstance().getBdLocationHelper().isLocationUpdate()) {
             MyApplication.getInstance().getBdLocationHelper().requestLocation();
         }
@@ -187,6 +187,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
             @Override
             public void onResponse(ObjectResult<LoginRegisterResult> result) {
+                LogUtil.d("HttpLogs", "IM login:"+ JSON.toJSONString(result));
                 if (result == null) {
                     ProgressDialogUtil.dismiss(dialog);
                     ToastUtil.showErrorData(mContext);
@@ -194,7 +195,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 }
                 boolean success = false;
                 if (result.getResultCode() == Result.CODE_SUCCESS) {
-                    LogUtil.d("HttpLogs", "IM login:" + JSON.toJSONString(result));
                     success = LoginHelper.setLoginUser(mContext, phoneNumber, digestPwd, result);// 设置登陆用户信息
                 }
                 if (success) {
@@ -218,9 +218,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         if (TextUtils.isEmpty(password)) {
             return;
         }
+        mContext=null;
         if (mContext == null) {
             mContext = this;
-            return;
         }
         ViewUtil.LoginTask(phone, password, mContext);
     }