From c9fc43ded908425af405f61a1df3474dd3105e92 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 26 二月 2020 14:36:30 +0800
Subject: [PATCH] 完成所有协议
---
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 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 f790567..dde1e74 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -1,31 +1,46 @@
package safeluck.drive.evaluation.bean;
import android.content.Context;
+import android.util.Log;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.ViewModelProviders;
+
+import com.anyun.exam.lib.MyLog;
import java.util.Random;
import safeluck.drive.evaluation.app;
import safeluck.drive.evaluation.util.SPUtils;
+import safeluck.drive.evaluation.viewmodels.ExamPlatformModel;
+import safeluck.drive.evaluation.viewmodels.MainViewModel;
public class ExamPlatformData {
private static final ExamPlatformData ourInstance = new ExamPlatformData();
private int exam_id =12345;//鑰冭瘯鍞竴ID
+ private String id;//韬唤璇�
+
+ private String ip;
+ private int port;
+
public static ExamPlatformData getInstance() {
return ourInstance;
}
- private ExamPlatformData() {
+ private ExamPlatformData() {
}
public String getPlatformIP(){
- return (String) SPUtils.get(app.getAppContext(),SPUtils.PLATFORM_IP,"");
+ ip = (String) SPUtils.get(app.getAppContext(),SPUtils.PLATFORM_IP,"47.93.157.103");
+ return ip;
}
public int getPlatformPort(){
- return (int) SPUtils.get(app.getAppContext(),SPUtils.PLATFORM_PORT,0);
+ port = (int) SPUtils.get(app.getAppContext(),SPUtils.PLATFORM_PORT,2020);
+ return port;
}
/**
@@ -33,8 +48,24 @@
* @param ip
*/
public void insertPlatformIp(String ip){
+
SPUtils.put(app.getAppContext(),SPUtils.PLATFORM_IP,ip);
+ }
+
+ /**
+ * 姣旇緝ip鍦板潃鍜岀鍙ｅ彿锛�
+ * @param ip
+ * @param port
+ * @return ip鍜岀鍙ｅ叾涓湁鍙樺寲锛岃繑鍥瀟rue锛屽惁鍒欒繑鍥瀎alse
+ */
+ 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;
}
/**
@@ -45,11 +76,17 @@
SPUtils.put(app.getAppContext(),SPUtils.PLATFORM_PORT,port);
}
- public int getExamUniqueID(){
-
- return exam_id;
+ public String getID() {
+ return id;
}
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public int getExam_id() {
+ return exam_id;
+ }
}
--
Gitblit v1.8.0