From b7766a9ec0f58d1cc6054cb78497966413947e5b Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期五, 21 八月 2020 18:07:20 +0800
Subject: [PATCH] 修改灯光考试项
---
app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt | 2
.idea/jarRepositories.xml | 35 +++++++++++++++++
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 39 +++++++++++++------
.idea/gradle.xml | 4 +
lib/src/main/java/com/anyun/exam/lib/AYSdk.java | 7 ---
.idea/misc.xml | 2
6 files changed, 67 insertions(+), 22 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5d94fe3..33e62d6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
+ <option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
+ <option value="$PROJECT_DIR$/BaseCommonLib" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/im_lib" />
<option value="$PROJECT_DIR$/lib" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
- <option name="testRunner" value="PLATFORM" />
</GradleProjectSettings>
</option>
</component>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..d4a4ff6
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RemoteRepositoriesConfiguration">
+ <remote-repository>
+ <option name="id" value="central" />
+ <option name="name" value="Maven Central repository" />
+ <option name="url" value="https://repo1.maven.org/maven2" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="jboss.community" />
+ <option name="name" value="JBoss Community repository" />
+ <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="maven" />
+ <option name="name" value="maven" />
+ <option name="url" value="https://esri.bintray.com/arcgis" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="BintrayJCenter" />
+ <option name="name" value="BintrayJCenter" />
+ <option name="url" value="https://jcenter.bintray.com/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="Google" />
+ <option name="name" value="Google" />
+ <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="MavenRepo" />
+ <option name="name" value="MavenRepo" />
+ <option name="url" value="https://repo.maven.apache.org/maven2/" />
+ </remote-repository>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b6ea2b1..7bfef59 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
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 67d351d..d75cd9b 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -101,19 +101,34 @@
enter_exit_item_tts.put(110,"鎺夊ご");
- simulate_light_tips.add(new SimulateNightBean.QuestionBean(1,"寮�鍚墠鐓х伅"));
- simulate_light_tips.add(new SimulateNightBean.QuestionBean(2,"澶滈棿鍦ㄦ病鏈夎矾鐏収鏄庝笉鑹潯浠朵笅琛岄┒"));
- simulate_light_tips.add(new SimulateNightBean.QuestionBean(3,"澶滈棿鍦ㄧ獎璺笌闈炴満鍔ㄨ溅浼氳溅"));
- simulate_light_tips.add(new SimulateNightBean.QuestionBean(4,"璇峰皢鍓嶇収鐏洿鎹㈡垚杩滃厜"));
- simulate_light_tips.add(new SimulateNightBean.QuestionBean(5,"澶滈棿鍚屾柟鍚戣繎璺濈璺熻溅琛岄┒"));
- simulate_light_tips.add(new SimulateNightBean.QuestionBean(6,"闆惧ぉ琛岄┒"));
- simulate_light_tips.add(new SimulateNightBean.QuestionBean(7,"鎷辨ˉ銆佷汉琛岄亾"));
- simulate_light_tips.add(new SimulateNightBean.QuestionBean(8,"澶滈棿鍦ㄩ亾璺笂鍙戠敓鏁呴殰锛屽Θ纰嶄氦閫氬張闅句互绉诲姩"));
+// simulate_light_tips.add(new SimulateNightBean.QuestionBean(1,"寮�鍚墠鐓х伅"));
+// simulate_light_tips.add(new SimulateNightBean.QuestionBean(2,"澶滈棿鍦ㄦ病鏈夎矾鐏収鏄庝笉鑹潯浠朵笅琛岄┒"));
+// simulate_light_tips.add(new SimulateNightBean.QuestionBean(3,"澶滈棿鍦ㄧ獎璺笌闈炴満鍔ㄨ溅浼氳溅"));
+// simulate_light_tips.add(new SimulateNightBean.QuestionBean(4,"璇峰皢鍓嶇収鐏洿鎹㈡垚杩滃厜"));
+// simulate_light_tips.add(new SimulateNightBean.QuestionBean(6,"闆惧ぉ琛岄┒"));
+// simulate_light_tips.add(new SimulateNightBean.QuestionBean(7,"鎷辨ˉ銆佷汉琛岄亾"));
+// simulate_light_tips.add(new SimulateNightBean.QuestionBean(8,"澶滈棿鍦ㄩ亾璺笂鍙戠敓鏁呴殰锛屽Θ纰嶄氦閫氬張闅句互绉诲姩"));
+// simulate_light_tips.add(new SimulateNightBean.QuestionBean(9," 澶滈棿閫氳繃鎬ュ集銆佸潯璺�"));
+// simulate_light_tips.add(new SimulateNightBean.QuestionBean(10,"娌℃湁浜ら�氭帶鍒剁伅涔嬭矾鍙�"));
+// simulate_light_tips.add(new SimulateNightBean.QuestionBean(11,"涓存椂鍋滆溅"));
+// simulate_light_tips.add(new SimulateNightBean.QuestionBean(12,"瓒呰溅"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(1,"璇锋墦寮�鍓嶇収鐏�"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(2,"澶滈棿涓庢満鍔ㄨ溅浼氳溅"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(3,"澶滈棿鍚屾柟鍚戣繎璺濈璺熻溅琛岄┒"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(4,"澶滈棿鐩磋閫氳繃璺彛"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(5,"澶滈棿鍦ㄦ湁璺伅锛岀収鏄庤壇濂界殑閬撹矾涓婅椹�"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(6,"澶滈棿鍦ㄦ病鏈夎矾鐏紝鐓ф槑涓嶈壇鏉′欢涓嬭椹�"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(7,"澶滈棿閫氳繃鎬ュ集銆佸潯璺�"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(8," 澶滈棿閫氳繃鎬ュ集銆佹嫳妗�"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(9,"澶滈棿閫氳繃鎷辨ˉ銆佷汉琛屾í閬�"));
//銆佹嫳妗ャ�佷汉琛屾í閬撱�佹垨鑰呮病鏈変氦閫氫俊鍙风伅鎺у埗鐨勮矾鍙�
- simulate_light_tips.add(new SimulateNightBean.QuestionBean(9," 澶滈棿閫氳繃鎬ュ集銆佸潯璺�"));
- simulate_light_tips.add(new SimulateNightBean.QuestionBean(10,"娌℃湁浜ら�氭帶鍒剁伅涔嬭矾鍙�"));
- simulate_light_tips.add(new SimulateNightBean.QuestionBean(11,"涓存椂鍋滆溅"));
- simulate_light_tips.add(new SimulateNightBean.QuestionBean(12,"瓒呰溅"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(10,"澶滈棿閫氳繃鍧¤矾銆佹嫳妗�"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(11,"澶滈棿閫氳繃娌℃湁浜ら�氫俊鍙风伅鎺у埗鐨勮矾鍙�"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(12,"澶滈棿瓒呰秺鍓嶆柟杞﹁締"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(13,"澶滈棿鍦ㄩ亾璺笂鍙戠敓鏁呴殰锛屽Θ纰嶄氦閫氬張闅句互绉诲姩"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(14,"璺竟涓存椂鍋滆溅"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(15,"澶滈棿璺彛宸﹁浆寮�"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(16,"澶滈棿璺彛鍙宠浆寮�"));
simulate_light_tips.add(new SimulateNightBean.QuestionBean(100,"涓嬮潰灏嗚繘琛屾ā鎷熷闂磋椹跺満鏅伅鍏変娇鐢ㄧ殑鑰冭瘯锛岃鎸夎闊虫寚浠ゅ湪5绉掑唴鍋氬嚭鐩稿簲鐨勭伅鍏夋搷浣�"));
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
index eab1039..36b87e7 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
@@ -69,7 +69,7 @@
tempQs.add(list[list.size-2])//鎻愮ず涓嬮潰灏嗚繘琛岀伅鍏夎�冭瘯
tempQs.add(list[0])
- val a = Utils.getRandomInts(4, 12)
+ val a = Utils.getRandomInts(4, list.size)
for (i in a.indices) {
tempQs.add(list[a[i]])
}
diff --git a/lib/src/main/java/com/anyun/exam/lib/AYSdk.java b/lib/src/main/java/com/anyun/exam/lib/AYSdk.java
index 3f6f2ca..a0e4f92 100644
--- a/lib/src/main/java/com/anyun/exam/lib/AYSdk.java
+++ b/lib/src/main/java/com/anyun/exam/lib/AYSdk.java
@@ -1,15 +1,8 @@
package com.anyun.exam.lib;
-import android.content.ComponentName;
import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.text.TextUtils;
import android.util.Log;
-import com.anyun.exam.lib.util.ByteUtil;
/**
* MyApplication2
--
Gitblit v1.8.0