From 71cc515dd4b2e0073eb7c866fd4bfbf6069dd3b5 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期五, 12 六月 2020 10:29:14 +0800
Subject: [PATCH] 服务异常死亡重新绑定（未测试）， bind远程服务之后直接发送地图/灯光/车辆信息
---
/dev/null | 0
app/src/main/java/safeluck/drive/evaluation/app.java | 28 ++++++----------------------
lib/src/main/java/com/anyun/exam/lib/SvrManager.java | 4 ++++
app/src/main/java/safeluck/drive/evaluation/fragment/VPFragment.java | 27 ++-------------------------
4 files changed, 12 insertions(+), 47 deletions(-)
diff --git a/app/libs/tbs_sdk_thirdapp_v4.3.0.3_43903_sharewithdownloadwithfile_withoutGame_obfs_20200402_121309.jar b/app/libs/tbs_sdk_thirdapp_v4.3.0.3_43903_sharewithdownloadwithfile_withoutGame_obfs_20200402_121309.jar
deleted file mode 100644
index 87c40fa..0000000
--- a/app/libs/tbs_sdk_thirdapp_v4.3.0.3_43903_sharewithdownloadwithfile_withoutGame_obfs_20200402_121309.jar
+++ /dev/null
Binary files differ
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index bcdf1c1..732c3b2 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -26,7 +26,6 @@
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
-import com.tencent.smtt.sdk.QbSdk;
import org.json.JSONException;
@@ -98,33 +97,20 @@
//鑰冭瘯鐘舵�� 锛屼竴浜涘垵濮嬬姸鎬侊紝app涓�浜涚姸鎬佸簲璇ュ厛鍒濆鍖栦竴涓�
initData();
-// QbSdk.initX5Environment(this,cb);
}
}
- QbSdk.PreInitCallback cb = new QbSdk.PreInitCallback() {
- @Override
- public void onViewInitFinished(boolean arg0) {
- MyLog.i(" QbSdk onViewInitFinished is " + arg0);
- }
- @Override
- public void onCoreInitFinished() {
- MyLog.i("x5鍐呮牳onCoreInitFinished");
- }
- };
- private void preinitX5WebCore() {
- if (!QbSdk.isTbsCoreInited()) {
- // preinit鍙渶瑕佽皟鐢ㄤ竴娆★紝濡傛灉宸茬粡瀹屾垚浜嗗垵濮嬪寲锛岄偅涔堝氨鐩存帴鏋勯�爒iew
- QbSdk.preInit(this, null);// 璁剧疆X5鍒濆鍖栧畬鎴愮殑鍥炶皟鎺ュ彛
- MyLog.i(" QbSdk isTbsCoreInited " );
- }
- }
+
private void initData() {
CThreadPoolExecutor.runInBackground(()->{
+ MyLog.i("寮�濮嬪垵濮嬪寲鏁版嵁鍙戦�佸湴鍥�/杞﹁締/mcu鍗囩骇鏂囦欢/鑰冭瘯鐘舵��");
int type = WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getExamStatusDao().getStartExamInt();
ExamPlatformData.getInstance().setExamType(type);
+ OneTimeWorkRequest examStatausOutWorker = OneTimeWorkRequest.from(ExamStatusOutWorker.class);
+ OneTimeWorkRequest mcuUpgradeWorker = OneTimeWorkRequest.from(MCUUpgradeWorker.class);
+ WorkManager.getInstance(getApplicationContext()).beginWith(examStatausOutWorker).then(mcuUpgradeWorker).enqueue();
});
}
@@ -159,9 +145,7 @@
}
switch (cmd) {
case Constant.NDK_START:
- OneTimeWorkRequest examStatausOutWorker = OneTimeWorkRequest.from(ExamStatusOutWorker.class);
- OneTimeWorkRequest mcuUpgradeWorker = OneTimeWorkRequest.from(MCUUpgradeWorker.class);
- WorkManager.getInstance(getApplicationContext()).beginWith(examStatausOutWorker).then(mcuUpgradeWorker).enqueue();
+
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/VPFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/VPFragment.java
index b4725bb..9bdb8f5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/VPFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/VPFragment.java
@@ -7,18 +7,13 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.anyun.exam.lib.MyLog;
-import com.tencent.smtt.export.external.interfaces.SslError;
-import com.tencent.smtt.export.external.interfaces.SslErrorHandler;
-import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
-import com.tencent.smtt.export.external.interfaces.WebResourceResponse;
-import com.tencent.smtt.sdk.WebSettings;
-import com.tencent.smtt.sdk.WebView;
-import com.tencent.smtt.sdk.WebViewClient;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
@@ -71,25 +66,7 @@
webSettings.setJavaScriptEnabled(true);
webSettings.setJavaScriptCanOpenWindowsAutomatically(true);
webView.loadUrl(url);
- webView.setWebViewClient(new WebViewClient(){
- @Override
- public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
- view.loadUrl(url);
- return true;
- }
- @Override
- public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
- super.onReceivedHttpError(view, request, errorResponse);
- Log.i(TAG,errorResponse.getReasonPhrase());
- }
-
- @Override
- public void onReceivedSslError(WebView webView, SslErrorHandler sslErrorHandler, SslError sslError) {
- super.onReceivedSslError(webView, sslErrorHandler, sslError);
- sslErrorHandler.proceed();
- }
- });
return webView;
}
public static void hookWebView() {
diff --git a/lib/src/main/java/com/anyun/exam/lib/SvrManager.java b/lib/src/main/java/com/anyun/exam/lib/SvrManager.java
index f72ef4b..1583bb4 100644
--- a/lib/src/main/java/com/anyun/exam/lib/SvrManager.java
+++ b/lib/src/main/java/com/anyun/exam/lib/SvrManager.java
@@ -23,6 +23,7 @@
private static final String TAG = "SvrManager";
private MyServiceConn conn;
private Intent intent;
+ private Context mContext;
private IAYExamListener mCallback;
@@ -55,6 +56,8 @@
}
remoteInterface.asBinder().unlinkToDeath(mDeathRecipient,0);
remoteInterface = null;
+ MyLog.i("妫�娴嬪埌杩滅▼鏈嶅姟寮傚父姝讳骸锛岄噸鏂扮粦瀹�");
+ bindRemoteService(mContext);
}
};
@@ -110,6 +113,7 @@
}
public void bindRemoteService(Context mContext){
+ this.mContext = mContext;
intent = new Intent(mContext,RemoteService.class);
conn = new MyServiceConn();
mContext.bindService(intent,conn, Context.BIND_AUTO_CREATE);
--
Gitblit v1.8.0