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

# Conflicts:
#	WeiChat/version.properties

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

@@ -14,6 +14,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;
@@ -214,7 +215,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         if (isCookie) {
             synCookies(this, url);
         } else {
-         //   clearCookie();
+            //   clearCookie();
         }
         Map<String, String> headers = new HashMap<>();
         headers.put("client-name", "uasClient");
@@ -235,9 +236,10 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
             }
 
             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);
@@ -271,13 +273,14 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
             public void onPageFinished(WebView view, String url) {
                 CookieManager cookieManager = CookieManager.getInstance();
                 String CookieStr = cookieManager.getCookie(url);
-                LogUtil.d(TAG,"Cookies = " + CookieStr);
+                LogUtil.d(TAG, "Cookies = " + CookieStr);
                 super.onPageFinished(view, url);
             }
         });
     }
 
     private static final String TAG = "WebViewCommActivity";
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -593,7 +596,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
     }
 
     /**
-     * 同步一下cookie 
+     * 同步一下cookie
      */
     public static void synComCookies(Context context, String url) {
         CookieSyncManager.createInstance(context);
@@ -603,9 +606,8 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         cookieManager.setCookie(url, com.core.utils.CommonUtil.getB2BSession(MyApplication.getInstance()));//cookies是在HttpClient中获得的cookie  
         CookieSyncManager.getInstance().sync();
     }
-    
-    
-    
+
+
     public class JSWebView {
 
         @JavascriptInterface

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Apr 11 16:21:47 CST 2018
-debugName=136
+#Fri Apr 20 10:48:22 CST 2018
+debugName=142
 versionName=613
-debugCode=136
+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

@@ -430,7 +430,6 @@ public class ViewUtil {
         }
         //必须补位空，才能不覆盖原有的根路径
         if (!StringUtil.isEmpty(erp_baseurl)) {
-
             CommonUtil.setSharedPreferences(ct, "erp_master", erp_master);
             CommonUtil.setSharedPreferences(ct, "erp_commpany", erp_company);
             CommonUtil.setSharedPreferences(ct, "erp_uu", String.valueOf(dataMap.get("uu")));
@@ -458,6 +457,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

@@ -186,6 +186,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);
@@ -193,7 +194,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) {
@@ -217,9 +217,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);
     }