From e5659a16092dc90fd7b06f3659158ddae6e1edd3 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期一, 06 七月 2020 17:06:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 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 7a2a4d5..659e551 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
@@ -109,22 +109,28 @@
break;
case R.id.exit_sys:
- MyDialog myDialog = MyDialog.Companion.newInstance("鎮ㄥ皢閫�鍑虹郴缁�,璇风‘璁ゆ暟鎹凡淇濆瓨");
+// 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.setOnClick(new MyDialog.MyOnClickListener() {
- @Override
- public void onSure() {
- _mActivity.finish();
-
- }
-
- @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:
--
Gitblit v1.8.0