From e5659a16092dc90fd7b06f3659158ddae6e1edd3 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期一, 06 七月 2020 17:06:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/safeluck/drive/evaluation/app.java | 61 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index cef9ce9..3c2f9aa 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();
});
}
@@ -150,7 +136,6 @@
@Override
public void callBackMsg(final int cmd, String json) {
String strConent = String.format("鏀跺埌鍛戒护[%d],Json鍐呭涓�%s", cmd, json);
- Log.i(TAG,strConent);
if (strConent.equalsIgnoreCase(lastStr)){
}else{
@@ -160,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();
+
@@ -272,12 +255,35 @@
MyLog.i("鏀跺埌鑰冭瘯搴旂瓟閿欒鐮�="+errCode);
switch (errCode){
case -1:
-// sendMapInfo();
-// break;
+ if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
+ if (TextUtils.isEmpty(ExamPlatformData.getInstance().getRoadMapPath())){
+ MyLog.i("寮�濮嬭�冭瘯鍚庯紝杩滅▼鏈嶅姟缂哄皯璺�冨湴鍥撅紝浣嗗湴鍥剧‘瀹炰笉瀛樺湪鏃犳硶鍙戦�佺粰杩滅▼鏈嶅姟");
+ CThreadPoolExecutor.runOnMainThread(() -> Toast.makeText(appContext, "缂哄皯璺�冨湴鍥撅紝璇峰墠寰�\"璁剧疆\"閫夋嫨鍦板浘", Toast.LENGTH_SHORT).show());
+
+ return;
+ }
+ }
+ if (ExamPlatformData.getInstance().getExamType()==ExamPlatformData.EXAM_TYPE_ChangKAO){
+ if (TextUtils.isEmpty(ExamPlatformData.getInstance().getMapPath())){
+ MyLog.i("寮�濮嬭�冭瘯鍚庯紝杩滅▼鏈嶅姟缂哄皯chang鑰冨湴鍥撅紝浣嗗湴鍥剧‘瀹炰笉瀛樺湪鏃犳硶鍙戦�佺粰杩滅▼鏈嶅姟");
+ CThreadPoolExecutor.runOnMainThread(new Runnable() {
+ @Override
+ public void run() {
+ Toast.makeText(appContext, "缂哄皯鍦鸿�冨湴鍥撅紝璇峰墠寰�\"璁剧疆\"閫夋嫨鍦板浘", Toast.LENGTH_SHORT).show();
+
+ }
+ });
+
+ return;
+ }
+ }
+
+ sendMapInfo();
+ break;
case -2:
-// sendVechileInfo();
-// break;
+ sendVechileInfo();
+ break;
case -3:
Data data = new Data.Builder().putInt(Constant.NEED_MAPS_CAR,1).build();
OneTimeWorkRequest examStatausOutWorker1 = new OneTimeWorkRequest.Builder(ExamStatusOutWorker.class)
@@ -551,7 +557,6 @@
AYSdk.getInstance().sendCmd(Constant.PUSH_ROAD_MAP_INFO,str);
}else{
MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�",roadmapPath));
-
CThreadPoolExecutor.runOnMainThread(new Runnable() {
@Override
public void run() {
--
Gitblit v1.8.0