From 5fdd4458a3c9f99a3c951683d503f73a47ff976d Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期五, 13 三月 2020 15:43:07 +0800
Subject: [PATCH] 解决RTK配置，传感器配置收到NDK_Start的时候发两次的问题；在ExamStatusOutWork里面发送rtf配置 传感器配置、考试状态；RTK配置增加数据库访问；电话使用sn，sn更新发送给服务在RTKConfigUpdateWorker；基本设置里删除电话显示；修改鉴权消息，使用服务器注册给的密码，用des加密时间，发鉴权消息给服务；Utils增加des加密和解密算法
---
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 75 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
index 0b425f3..cfd9bb1 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -1,6 +1,7 @@
package safeluck.drive.evaluation.bean;
import android.content.Context;
+import android.text.TextUtils;
import android.util.Log;
import androidx.lifecycle.LiveData;
@@ -25,6 +26,8 @@
import safeluck.drive.evaluation.viewmodels.MainViewModel;
public class ExamPlatformData {
+
+ private static final String TAG = "ExamPlatformData";
private static final ExamPlatformData ourInstance = new ExamPlatformData();
private int exam_id =12345;//鑰冭瘯鍞竴ID
@@ -37,7 +40,10 @@
public static final int DEV_REGISTERED = 4;
public static final int DEV_NOT_LOGIN = 5;
public static final int DEV_LOGIN = 6;
+
+ private boolean isTrainingMode = false;//鏄惁璁粌妯″紡
private static HashMap<Integer,String> examPlatformStrs = new HashMap<>();
+ private List<Integer> sns =new ArrayList<>();//淇濆瓨鎵�鏈夊け璐ラ」鐩殑sn
private static HashMap<Integer,String> enter_exit_item_tts = new HashMap<>();
private static List<SimulateNightBean.QuestionBean> simulate_light_tips = new ArrayList<>();
static {
@@ -96,6 +102,9 @@
private int port;
private String mapPath;//缁濆璺緞鍖呭惈鏂囦欢鍚嶇殑path
private String carPath;//缁濆璺緞鍖呭惈鏂囦欢鍚嶇殑path
+ private StringBuffer stringBuffer;
+ private int rtkPort = 12125;
+ private String rtkIP = "47.93.80.84";
public static ExamPlatformData getInstance() {
return ourInstance;
@@ -103,6 +112,7 @@
private ExamPlatformData() {
+ stringBuffer = new StringBuffer();
}
public String getPlatformIP(){
@@ -134,6 +144,19 @@
public boolean compareIPandPort(String ip,int port){
MyLog.i( "compareIPandPort: "+ip+" "+port);
if(!getPlatformIP().equalsIgnoreCase(ip) || getPlatformPort()!=port){
+ MyLog.i("ip鍜岀鍙ｆ湁鍙樺寲");
+ return true;
+ }
+ return false;
+ } /**
+ * 姣旇緝RTK ip鍦板潃鍜岀鍙ｅ彿锛�
+ * @param ip
+ * @param port
+ * @return ip鍜岀鍙ｅ叾涓湁鍙樺寲锛岃繑鍥瀟rue锛屽惁鍒欒繑鍥瀎alse
+ */
+ public boolean compareRTKIPandPort(String ip,int port){
+ MyLog.i( "compareIPandPort: "+ip+" "+port);
+ if(!getRtkIP().equalsIgnoreCase(ip) || getRtkPort()!=port){
MyLog.i("ip鍜岀鍙ｆ湁鍙樺寲");
return true;
}
@@ -237,6 +260,15 @@
}
}
+ public boolean isTrainingMode() {
+ isTrainingMode = (boolean) SPUtils.get(app.getAppContext(),SPUtils.TRAIN_MODE,false);
+ return isTrainingMode;
+ }
+
+ public void setTrainingMode(boolean trainingMode) {
+ SPUtils.put(app.getAppContext(),SPUtils.TRAIN_MODE,trainingMode);
+ isTrainingMode = trainingMode;
+ }
public void setPhone(String phone) {
this.mPhone = phone;
@@ -249,4 +281,47 @@
public List<SimulateNightBean.QuestionBean> getSimulate_light_tips() {
return simulate_light_tips;
}
+
+ public List<Integer> getSns() {
+// if (sns.size()<=0){
+// String snsstr = (String) SPUtils.get(app.getAppContext(),SPUtils.FAIL_PROJ_SNS,"");
+// if (!TextUtils.isEmpty(snsstr)){
+// String[] strings=snsstr.split("#");
+// for (int i = 0; i < strings.length; i++) {
+// Log.i(TAG, String.format("strings[%d]=%s",i,strings[i]));
+// if (!TextUtils.isEmpty(strings[i]))
+// sns.add(Integer.parseInt(strings[i]));
+// }
+// }
+// }
+ return sns;
+
+ }
+
+ public void addSn(int sn) {
+// stringBuffer.append("#"+String.valueOf(sn));
+// SPUtils.put(app.getAppContext(),SPUtils.FAIL_PROJ_SNS,stringBuffer.toString());
+ this.sns.add(sn);
+ }
+
+ public void clearSns() {
+// SPUtils.clear(app.getAppContext());
+ sns.clear();
+ }
+
+ public void setRTKPort(int port) {
+ this.rtkPort = port;
+ }
+
+ public void setRTKIP(String ip) {
+ this.rtkIP = ip;
+ }
+
+ public int getRtkPort() {
+ return rtkPort;
+ }
+
+ public String getRtkIP() {
+ return rtkIP;
+ }
}
--
Gitblit v1.8.0