集成tbs。目前没有进行64位手机适配。

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

# Conflicts:
#	WeiChat/version.properties
#	app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Jan 09 18:02:40 CST 2018
-debugName=32
+#Fri Jan 12 15:57:09 CST 2018
+debugName=60
 versionName=611
-debugCode=32
+debugCode=60
 versionCode=150

app_core/common/build.gradle

@@ -8,8 +8,7 @@ android {
         targetSdkVersion rootProject.ext.android.targetSdkVersion
         versionCode rootProject.ext.android.versionCode
         versionName rootProject.ext.android.versionName
-
-
+       
     }
     useLibrary 'org.apache.http.legacy'
 
@@ -60,4 +59,5 @@ dependencies {
     //折线库
     compile files('libs/hellocharts-library-1.5.8.jar')
     compile 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
+
 }

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

@@ -32,6 +32,7 @@ import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
+import com.tencent.smtt.sdk.QbSdk;
 
 import org.apache.http.cookie.Cookie;
 
@@ -107,14 +108,28 @@ public class MyApplication extends BaseApplication {
 
         mHttpUtils = new HttpUtils();
         configHttpUtils();
-
         // 初始化定位
         getBdLocationHelper();
         // 初始化App目录
         initAppDir();
         // 初始化图片加载
         initImageLoader();
+        //搜集本地tbs内核信息并上报服务器，服务器返回结果决定使用哪个内核。
+        QbSdk.PreInitCallback cb = new QbSdk.PreInitCallback() {
+
+            @Override
+            public void onViewInitFinished(boolean arg0) {
+                //x5內核初始化完成的回调，为true表示x5内核加载成功，否则表示x5内核加载失败，会自动切换到系统内核。
+                Log.d("app", " onViewInitFinished is " + arg0);
+            }
 
+            @Override
+            public void onCoreInitFinished() {
+     
+            }
+        };
+        //x5内核初始化接口
+        QbSdk.initX5Environment(getApplicationContext(),  cb);
         // 初始化网络监听
         mNetWorkObservable = new NetWorkObservable(this);
 

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

@@ -8,11 +8,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.KeyEvent;
-import android.webkit.CookieManager;
-import android.webkit.CookieSyncManager;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
@@ -24,6 +19,11 @@ import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.apputils.R;
+import com.tencent.smtt.sdk.CookieManager;
+import com.tencent.smtt.sdk.CookieSyncManager;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 
 public class SimpleWebActivity extends BaseActivity {
 private static final String TAG = "SimpleWebActivity";
@@ -33,7 +33,7 @@ private static final String TAG = "SimpleWebActivity";
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_simple_web);
-
+         getSupportActionBar().hide();
         webView= findViewById(R.id.mSimpleWebView);
         webView.getSettings().setJavaScriptEnabled(true);
         webView.getSettings().setAllowFileAccess(true);
@@ -74,6 +74,19 @@ private static final String TAG = "SimpleWebActivity";
             }
         });
          webView.loadUrl(url);
+//       String filePath=FileUtils.getSDRoot()+"/uu/HTTP权威指南.pdf";
+//       LogUtil.d(TAG,filePath);
+//        ValueCallback<String> callback=new ValueCallback<String>() {
+//            @Override
+//            public void onReceiveValue(String s) {
+//                LogUtil.d(TAG,"result:"+s);
+//            }
+//        };
+//        HashMap<String,String> params=new HashMap<>();
+//        params.put("style","1");
+//      int code=  QbSdk.openFileReader(mContext, filePath, params,callback);
+//        
+//      LogUtil.d(TAG,"code:"+code);
     }
 
 
@@ -96,7 +109,7 @@ private static final String TAG = "SimpleWebActivity";
                              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";
-                             webView.loadUrl(url);
+                          //   webView.loadUrl(url);
                          } catch (Exception e) {
                              e.printStackTrace();
                          }

app_modular/apputils/src/main/res/layout/activity_simple_web.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.modular.apputils.activity.SimpleWebActivity">
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/mSimpleWebView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"