From 70174da77a07dfa477dd3ff33077965edc09ff03 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 23 七月 2020 10:15:06 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
lib/src/main/java/com/anyun/exam/lib/SvrManager.java | 14 ++++---
app/src/main/res/layout/layout_dlg.xml | 10 ++--
app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java | 46 ++++++++++++----------
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt | 10 +++--
4 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
index dd422ce..e2f6007 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
+++ b/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("璇绘枃浠跺彂閫丷TK閰嶇疆")
+ MyLog.i(TAG,"璇绘枃浠跺彂閫丷TK閰嶇疆")
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))
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
index 659e551..a01f0a6 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
+++ b/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:
diff --git a/app/src/main/res/layout/layout_dlg.xml b/app/src/main/res/layout/layout_dlg.xml
index 9856c7f..98e2681 100644
--- a/app/src/main/res/layout/layout_dlg.xml
+++ b/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"
diff --git a/lib/src/main/java/com/anyun/exam/lib/SvrManager.java b/lib/src/main/java/com/anyun/exam/lib/SvrManager.java
index 1583bb4..042fe64 100644
--- a/lib/src/main/java/com/anyun/exam/lib/SvrManager.java
+++ b/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);
}
}
--
Gitblit v1.8.0