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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,8 +1,8 @@
-#Thu Jan 04 16:26:00 CST 2018
-debugName=377
->>>>>>>=ee498070608d5e9e61ea28c6cea1571216fbad83
+#Fri Jan 05 14:15:16 CST 2018
+debugName=394
 versionName=613
-debugCode=377
+>>>>>>>=ee498070608d5e9e61ea28c6cea1571216fbad83
+debugCode=394
 versionCode=152
-=\=\=\=\=\=\=
 <<<<<<<=HEAD
+=\=\=\=\=\=\=

app_core/common/src/main/assets/work_menu_b2b.json

@@ -127,7 +127,7 @@
         "isLocalMenu": true,
         "menuName": "str_work_b2b_commerce",
         "menuIcon": "ic_work_b2b_commerce",
-        "menuActivity": "com.modular.main.WebViewCommActivity",
+        "menuActivity": "com.modular.apputils.activity.SimpleWebActivity",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -136,7 +136,7 @@
         "isLocalMenu": true,
         "menuName": "str_work_usoft_mall",
         "menuIcon": "ic_work_usoft_mall",
-        "menuActivity": "com.modular.main.WebViewCommActivity",
+        "menuActivity": "com.modular.apputils.activity.SimpleWebActivity",
         "menuUrl": "",
         "caller": "",
         "isHide": false

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

@@ -17,7 +17,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
-import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -1047,19 +1046,10 @@ public class ViewUtil {
                                     String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
         url = url + "mobile/login.action";
-//        if (BaseConfig.isDebug()){
-//            master=CommonUtil.getMaster();
-//            url="http://192.168.253.203:8090/ERP/mobile/login.action";
-//        }
- //       url="http://192.168.253.58:8080/ERP/mobile/login.action";
-//        url = "http://192.168.253.29:8080/ERP/mobile/login.action";
-//        url = "http://192.168.253.6/uas_dev/mobile/login.action";
-//        url = "https://admin-city.ubtob.com/mobile/login.action";
         Map<String, String> params = new HashMap<String, String>();
         params.put("username", username);
         params.put("password", password);
         params.put("master", master);
-//        params.put("master", "CITIES_CONTROL");
         LogUtil.i("login", "url=" + url);
         LogUtil.i("login", "params=" + JSONUtil.map2JSON(params));
         startNetThread(url, params, handler, Constants.SUCCESS_ERP, null, null, "post");

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

@@ -17,6 +17,7 @@ import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.utils.CommonUtil;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -39,7 +40,7 @@ private static final String TAG = "SimpleWebActivity";
         webView.getSettings().setDatabaseEnabled(true);
         webView.getSettings().setAppCacheEnabled(true);
         webView.getSettings().setCacheMode(WebSettings.LOAD_DEFAULT);
-        //initBusinessToken();
+        initBusinessToken();
         
         Intent intent = getIntent();
         String  url = intent.getStringExtra("url");
@@ -68,17 +69,19 @@ private static final String TAG = "SimpleWebActivity";
                 super.onPageFinished(view, url);
             }
         });
-      //  webView.loadUrl(url);
+      // webView.loadUrl(url);
     }
 
 
-  
+    //企业uu为空，则取附近账套和子帐套的
     public void initBusinessToken(){
+          LogUtil.d(TAG, CommonUtil.getSharedPreferences(this,"erp_uu"));
+       
           HttpClient httpClient=new HttpClient.Builder("https://account.ubtob.com/").build();
                  httpClient.Api().send(new HttpClient.Builder()
                  .url("api/user/getToken")
                          .add("appId","b2b")
-                         .add("spaceDialectUID","0")
+                         .add("spaceDialectUID",CommonUtil.getSharedPreferences(this,"erp_uu"))
                          .add("uid", MyApplication.getInstance().mLoginUser.getTelephone())
                  .method(Method.GET)
                  .build(),new ResultSubscriber<Object>(new ResultListener<Object>() {
@@ -86,10 +89,6 @@ private static final String TAG = "SimpleWebActivity";
                      @Override
                      public void onResponse(Object o) {
                          try {
-//                             {
-//                             "success": true,
-//                                     "content": "fe7120a70d3c40c59830dbb5c0efb7f7"
-//                         }
                              LogUtil.d(TAG,o.toString());
                              String token= JSON.parseObject(o.toString()).getString("content");
                              String url="https://account.ubtob.com/sso/login/proxy?appId=b2b&returnURL=https://www.usoftmall.com&token="+token+"&baseURL=https://www.usoftmall.com/login/other&isLoginAll=false";
@@ -121,6 +120,8 @@ private static final String TAG = "SimpleWebActivity";
     public void setThirdPartyCookiesEnabled(final boolean enabled) {
         if (Build.VERSION.SDK_INT >= 21) {
             CookieManager.getInstance().setAcceptThirdPartyCookies(webView, enabled);
+        }else {
+            CookieManager.getInstance().setAcceptCookie(true);
         }
     }