From 8735b56eefde751618c819f5b331a56a62274a5c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 14 五月 2020 18:30:22 +0800
Subject: [PATCH] Merge branch 'newUI'
---
app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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 78f59ae..7a2a4d5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
@@ -1,10 +1,9 @@
package safeluck.drive.evaluation.fragment;
-import android.content.DialogInterface;
import android.os.Bundle;
-import android.view.Gravity;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -14,18 +13,16 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-import com.anyun.exam.lib.AYSdk;
import me.yokeyword.fragmentation.ISupportFragment;
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.BuildConfig;
+import safeluck.drive.evaluation.MainActivity;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.bean.ExamPlatformData;
-import safeluck.drive.evaluation.customview.LoadProgressDialog;
+import safeluck.drive.evaluation.customview.MyDialog;
/**
@@ -54,6 +51,14 @@
}
private void initView(View view) {
+ Log.i(TAG,"currTopFragment="+getTopFragment().getClass().getSimpleName());
+ if (HomeFragment.class.getSimpleName().equals(getTopFragment().getClass().getSimpleName())){
+ ((MainActivity)_mActivity).viewtitle.setVisibility(View.GONE);
+ ((MainActivity)_mActivity).btn_return.setVisibility(View.GONE);
+ }else{
+ ((MainActivity)_mActivity).viewtitle.setVisibility(View.VISIBLE);
+ ((MainActivity)_mActivity).btn_return.setVisibility(View.VISIBLE);
+ }
view.findViewById(R.id.network_train).setOnClickListener(this);
view.findViewById(R.id.car_train).setOnClickListener(this);
view.findViewById(R.id.system_setting).setOnClickListener(this);
@@ -103,16 +108,23 @@
break;
case R.id.exit_sys:
- //閫�鍑虹郴缁�
- AlertDialog.Builder builder = new AlertDialog.Builder(_mActivity);
- builder.setMessage("鎮ㄥ皢閫�鍑虹郴缁�,璇风‘璁ゆ暟鎹凡淇濆瓨").setPositiveButton("纭畾", new DialogInterface.OnClickListener() {
+
+ MyDialog myDialog = MyDialog.Companion.newInstance("鎮ㄥ皢閫�鍑虹郴缁�,璇风‘璁ゆ暟鎹凡淇濆瓨");
+
+ myDialog.setOnClick(new MyDialog.MyOnClickListener() {
@Override
- public void onClick(DialogInterface dialog, int which) {
+ public void onSure() {
_mActivity.finish();
+
}
- }).setNegativeButton("鍙栨秷", (DialogInterface dialog, int which)-> {
- dialog.dismiss();
- }).show();
+
+ @Override
+ public void onCancle() {
+
+ }
+ });
+
+ myDialog.show(getFragmentManager(),"mydialog");
break;
case R.id.system_setting:
--
Gitblit v1.8.0