From 844a6141b652e9dc8b521d83988a8121584813d7 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 07 七月 2020 10:06:00 +0800
Subject: [PATCH] 完善退出功能，修改退出对话框确认过小
---
lib/src/main/java/com/anyun/exam/lib/SvrManager.java | 3 +++
app/src/main/res/layout/layout_dlg.xml | 10 +++++-----
app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java | 46 +++++++++++++++++++++++++---------------------
3 files changed, 33 insertions(+), 26 deletions(-)
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..a6300e0 100644
--- a/lib/src/main/java/com/anyun/exam/lib/SvrManager.java
+++ b/lib/src/main/java/com/anyun/exam/lib/SvrManager.java
@@ -122,14 +122,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