硬件组-智慧驾培
parent: 2d6a9d02 | 补丁 | 提交 | ignore whitespace
endian11
2020-08-21 b7766a9ec0f58d1cc6054cb78497966413947e5b 
修改灯光考试项
5个文件已修改
1个文件已添加
89 ■■■■■ 已修改文件
.idea/gradle.xml 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/jarRepositories.xml 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/misc.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lib/src/main/java/com/anyun/exam/lib/AYSdk.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 .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>




 .idea/jarRepositories.xml


New file


@@ -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>




 .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">




 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秒内做出相应的灯光操作"));




 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]])


    }




 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