| app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/layout/layout_dlg.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| lib/src/main/java/com/anyun/exam/lib/SvrManager.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
@@ -52,7 +52,7 @@ } tempQs.add(list[list.size-1])//提示灯光考试结束 simulateNightBean.setQuestion(tempQs) AYSdk.getInstance().sendCmd(0x8012, gson.toJson(simulateNightBean)) if (inputData.getInt(safeluck.drive.evaluation.Constant.NEED_MAPS_CAR,0)==1){ sendMapInfo() sendVehicleInfo() @@ -65,7 +65,7 @@ var rtk = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).rtkConfigDao._getRtkConfig() if (rtk == null){ try { MyLog.i("读文件发送RTK配置") MyLog.i(TAG,"读文件发送RTK配置") val inputStream = applicationContext.assets.open(safeluck.drive.evaluation.Constant.RTK_CONFIG_JSON) val inputStreamReader = InputStreamReader(inputStream) val jsonReader = JsonReader(inputStreamReader) @@ -80,9 +80,11 @@ } sendRtkConfigInfo(rtk) MyLog.i(TAG,"开始发送灯光,考试项共有"+simulateNightBean.question.size) AYSdk.getInstance().sendCmd(0x8012, gson.toJson(simulateNightBean)) singalConfigs = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).signalConfigDao._getSignalConfigs() if (singalConfigs ==null){ MyLog.i("读文件发送信号配置") MyLog.i(TAG,"读文件发送信号配置") try { val inputStream = applicationContext.assets.open("signal_config_file.json") val inputStreamReader = InputStreamReader(inputStream) @@ -133,7 +135,7 @@ private fun sendSignalConfigsToRemote(indexs: List<Int>) { if (signalConfiglist.size > 0) { if (listContainsSameValue(indexs)) { Log.i(TAG, "sendSignalConfigsToRemote: 有相同的index，不能发送" + gson.toJson(signalConfiglist)) MyLog.i(TAG, "sendSignalConfigsToRemote: 有相同的index，不能发送" + gson.toJson(signalConfiglist)) } else { AYSdk.getInstance().sendCmd(safeluck.drive.evaluation.Constant.SEND_CONFIG_SIGNAL, gson.toJson(signalConfiglist)) } app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
@@ -15,6 +15,7 @@ import androidx.annotation.Nullable; import com.anyun.exam.lib.AYSdk; import me.yokeyword.fragmentation.ISupportFragment; import me.yokeyword.fragmentation.SupportFragment; @@ -109,28 +110,31 @@ break; case R.id.exit_sys: // MyDialog myDialog = MyDialog.Companion.newInstance("您将退出系统,请确认数据已保存"); // // myDialog.setOnClick(new MyDialog.MyOnClickListener() { // @Override // public void onSure() { // _mActivity.finish(); // // } // // @Override // public void onCancle() { // // } // }); // // myDialog.show(getFragmentManager(),"mydialog"); MyDialog myDialog = MyDialog.Companion.newInstance("您将退出系统,请确认数据已保存"); JiaXiaoFragment jiaXiaoFragment = findFragment(JiaXiaoFragment.class); if (jiaXiaoFragment == null) { jiaXiaoFragment = (JiaXiaoFragment) JiaXiaoFragment.newInstance(); } start(jiaXiaoFragment); myDialog.setOnClick(new MyDialog.MyOnClickListener() { @Override public void onSure() { AYSdk.getInstance().uninit(); _mActivity.finish(); System.exit(0); } @Override public void onCancle() { } }); myDialog.show(getFragmentManager(),"mydialog"); // JiaXiaoFragment jiaXiaoFragment = findFragment(JiaXiaoFragment.class); // if (jiaXiaoFragment == null) { // jiaXiaoFragment = (JiaXiaoFragment) JiaXiaoFragment.newInstance(); // } // start(jiaXiaoFragment); break; case R.id.system_setting: app/src/main/res/layout/layout_dlg.xml
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="210dp" android:layout_width="230dp" android:layout_height="180dp" android:layout_height="220dp" android:gravity="center" android:background="@drawable/bg_select_dlg" @@ -29,7 +29,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="2" android:layout_weight="4" android:orientation="horizontal" > <Button @@ -38,7 +38,7 @@ android:layout_weight="1" android:layout_marginTop="@dimen/ui_margin_10dp" android:text="确定" android:padding="@dimen/ui_margin_5dp" android:padding="@dimen/ui_margin_20dp" android:textSize="@dimen/network_train_textsize22px" android:background="@drawable/bg_rgb_dlg" android:textColor="@android:color/white" @@ -47,7 +47,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:padding="@dimen/ui_margin_5dp" android:padding="@dimen/ui_margin_20dp" android:layout_marginTop="@dimen/ui_margin_10dp" android:text="取消" android:textSize="@dimen/network_train_textsize22px" lib/src/main/java/com/anyun/exam/lib/SvrManager.java
@@ -7,7 +7,6 @@ import android.os.IBinder; import android.os.RemoteException; import android.text.TextUtils; import android.util.Log; import java.util.LinkedList; @@ -49,9 +48,9 @@ private IBinder.DeathRecipient mDeathRecipient = new IBinder.DeathRecipient() { @Override public void binderDied() { Log.e(TAG,"IBinder.DeathRecipient binderDied"); if (remoteInterface != null){ Log.e(TAG,"IBinder.DeathRecipient binderDied remoteInterface != null ,return"); MyLog.e(TAG,"IBinder.DeathRecipient binderDied"); if (remoteInterface == null){ MyLog.e(TAG,"IBinder.DeathRecipient binderDied remoteInterface == null ,return"); return; } remoteInterface.asBinder().unlinkToDeath(mDeathRecipient,0); @@ -98,7 +97,7 @@ try { //设置死亡代理 service.linkToDeath(mDeathRecipient,0); MyLog.i("绑定服务onServiceConnected"); remoteInterface.registListener(RemoteCallback); } catch (RemoteException e) { e.printStackTrace(); @@ -107,7 +106,7 @@ @Override public void onServiceDisconnected(ComponentName name) { MyLog.i("绑定服务失败onServiceDisconnected"); } @@ -122,14 +121,17 @@ public void unBindRemoteService(Context mContext){ if (remoteInterface!=null && remoteInterface.asBinder().isBinderAlive()){ try { MyLog.i("摧毁SDK，需要解绑远程回调"); remoteInterface.unRegistListener(RemoteCallback); } catch (RemoteException e) { e.printStackTrace(); } } MyLog.i("摧毁SDK，需要解绑远程服务"); mContext.unbindService(conn); if (intent!=null){ MyLog.i("摧毁SDK，需要停止远程服务"); mContext.stopService(intent); } }
