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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,8 +1,8 @@
-#Fri Jan 05 14:15:16 CST 2018
-debugName=394
-versionName=613
+#Fri Jan 05 14:38:37 CST 2018
+debugName=395
 >>>>>>>=ee498070608d5e9e61ea28c6cea1571216fbad83
-debugCode=394
+versionName=613
+debugCode=395
 versionCode=152
-<<<<<<<=HEAD
 =\=\=\=\=\=\=
+<<<<<<<=HEAD

app_modular/apputils/src/main/java/com/modular/apputils/activity/SimpleWebActivity.java

@@ -40,15 +40,18 @@ private static final String TAG = "SimpleWebActivity";
         webView.getSettings().setDatabaseEnabled(true);
         webView.getSettings().setAppCacheEnabled(true);
         webView.getSettings().setCacheMode(WebSettings.LOAD_DEFAULT);
-        initBusinessToken();
+        
+        
         
         Intent intent = getIntent();
         String  url = intent.getStringExtra("url");
         getSupportActionBar().setTitle(intent.getStringExtra("p"));
         LogUtil.d(TAG,"url:"+url+" title:"+intent.getStringExtra("p"));
+        if ("http://mall.ubtob.com".equals(url)){
+            initBusinessToken();
+        }
+       
         setThirdPartyCookiesEnabled(true);
-                
-                
         webView.setWebViewClient(new WebViewClient(){
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 LogUtil.d(TAG,"转发url："+url);
@@ -69,7 +72,7 @@ private static final String TAG = "SimpleWebActivity";
                 super.onPageFinished(view, url);
             }
         });
-      // webView.loadUrl(url);
+         webView.loadUrl(url);
     }