From 12c468b38b46e61f9c2dcec27684e9ea1d54adcf Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 08 一月 2020 17:37:12 +0800
Subject: [PATCH] 删除数据库升级方法；插入数据库改到Activity，否则application insert会报错；
---
app/src/main/java/safeluck/drive/evaluation/app.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 87d6bb6..ee68c5c 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -1,6 +1,7 @@
package safeluck.drive.evaluation;
import android.app.Application;
+import android.os.Handler;
import android.util.Log;
import android.widget.Toast;
@@ -12,6 +13,7 @@
import me.yokeyword.fragmentation.Fragmentation;
import me.yokeyword.fragmentation.helper.ExceptionHandler;
+
import com.anyun.exam.lib.MyLog;
import com.anyun.exam.lib.crash.CrashHandler;
import com.facebook.stetho.Stetho;
@@ -21,11 +23,12 @@
import org.json.JSONException;
import org.json.JSONObject;
+import java.util.Random;
+
import safeluck.drive.evaluation.DB.failitems.FailedProj;
import safeluck.drive.evaluation.DB.failitems.FailedProjRepository;
import safeluck.drive.evaluation.bean.RTKConfig;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
-import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.SystemUtil;
/**
@@ -39,11 +42,14 @@
private static final String TAG = "app";
private Gson gson;
RTKConfig rtkConfig;
+ FailedProjRepository failedProjRepository;
+ Random random = new Random();
+
@Override
public void onCreate() {
super.onCreate();
//鍒濆鍖朏ragment 寤鸿鍦ˋpplication onCreate閲岄潰鍒濆鍖�
- if (SystemUtil.compareProcessName(this)){
+ if (SystemUtil.compareProcessName(this)) {
Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE).debug(false)
.handleException(new ExceptionHandler() {
@Override
@@ -53,13 +59,13 @@
})
.install();
- CrashHandler crashHandler =CrashHandler.getInstance();
+ CrashHandler crashHandler = CrashHandler.getInstance();
crashHandler.init(getApplicationContext());
AYSdk.getInstance().init(getApplicationContext());
AYSdk.getInstance().registListener(this);
- Log.i(TAG, "onCreate: ");
MyLog.createIfNotExist();
Stetho.initializeWithDefaults(this);
+
//RTK閰嶇疆淇℃伅
rtkConfig = new RTKConfig();
@@ -72,6 +78,9 @@
rtkConfig.setPort(12125);
rtkConfig.setProvince(23);
rtkConfig.setSn("2019101500000001");
+ //鏁版嵁搴撴搷浣�
+ MyLog.i(TAG, "onCreate111");
+ failedProjRepository = new FailedProjRepository(this);
}
}
@@ -90,17 +99,18 @@
}
@Override
- public void callBackMsg(int cmd, String json) {
- MyLog.d(TAG, String.format("鏀跺埌鍛戒护[%d],Json鍐呭涓�%s",cmd,json));
- switch (cmd){
+ public void callBackMsg(final int cmd, String json) {
+ MyLog.d(TAG, String.format("鏀跺埌鍛戒护[%d],Json鍐呭涓�%s", cmd, json));
+ switch (cmd) {
case Constant.NDK_START:
Toast.makeText(this, "NDK start", Toast.LENGTH_SHORT).show();
break;
case Constant.RTK_PLATFORM_REGISTER_STATUS:
+ failedProjRepository.insert(new FailedProj(Constant.SUBJECT_I, cmd + random.nextInt(30), Constant.TEST_STU_ID));
try {
- JSONObject jsonObject = new JSONObject();
- int reg_code = jsonObject.getInt("register_code");
+ JSONObject jsonObject = new JSONObject(json);
String rtkLoginPwd = jsonObject.getString("password");
+ int reg_code = jsonObject.getInt("register_code");
rtkConfig.setPassword(rtkLoginPwd);
rtkConfig.setRegistered(reg_code);
} catch (JSONException e) {
@@ -108,22 +118,31 @@
}
break;
case Constant.RTK_PLATFORM_REGISTER_RESULT:
+
+ failedProjRepository.insert(new FailedProj(Constant.SUBJECT_I, cmd + random.nextInt(30), Constant.TEST_STU_ID));
+
+
break;
case Constant.FETCH_RTK_PLATFORM_INFO:
- if (gson == null){
+ if (gson == null) {
gson = new Gson();
}
- MyLog.i(TAG, "RTK閰嶇疆淇℃伅锛�"+gson.toJson(rtkConfig));
- AYSdk.getInstance().sendCmd(Constant.PUSH_RTK_PLATFORM_INFO,gson.toJson(rtkConfig));
+ MyLog.i(TAG, "RTK閰嶇疆淇℃伅锛�" + gson.toJson(rtkConfig));
+ AYSdk.getInstance().sendCmd(Constant.PUSH_RTK_PLATFORM_INFO, gson.toJson(rtkConfig));
break;
case Constant.JUDGE_INFO:
- FailedProjRepository failedProjRepository = new FailedProjRepository(this);
- failedProjRepository.insert(new FailedProj(1,cmd,Constant.TEST_STU_ID));
+
+
+ failedProjRepository.insert(new FailedProj(Constant.SUBJECT_I, cmd, Constant.TEST_STU_ID));
+
+ break;
+ case Constant.EXAM_STATUS_REPLY:
+ MyLog.d(TAG, "鑰冭瘯寮�濮嬶紝闇�瑕佸垹闄や笂涓�涓�冭瘯瀛﹀憳鐨勬暟鎹簱澶辫触椤圭洰琛�");
+ failedProjRepository.deleteAll();
break;
}
}
-
}
--
Gitblit v1.8.0