From feb7add1979c830e0d940286242a7c489f2f8f96 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 27 九月 2024 09:23:34 +0800
Subject: [PATCH] 优化NFC模块架构,将一些方法抽调到父类中。

---
 app/src/main/java/com/dayu/recharge/activity/LoginActivity.java |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
index 7b46a21..f6d5155 100644
--- a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
@@ -23,9 +23,9 @@
 import com.dayu.henanlibrary.HeNanApplication;
 import com.dayu.henanlibrary.dao.HNBaseDaoSingleton;
 
-import com.dayu.qihealonelibrary.activity.HomeActivity;
+import com.dayu.qihealonelibrary.activity.HomeActivityQHAlone;
 import com.dayu.qiheonlinelibrary.QHOnLineApplication;
-import com.dayu.qiheonlinelibrary.dao.QHOnLineAppDatabase;
+import com.dayu.qiheonlinelibrary.activity.HomeActivityQHOline;
 import com.dayu.qiheonlinelibrary.dao.QHOnlineBaseDaoSingleton;
 import com.dayu.recharge.MyApplication;
 import com.dayu.recharge.databinding.ActivityLoginBinding;
@@ -47,7 +47,6 @@
 
     ActivityLoginBinding binding;
     PassWordBean passWordBean;
-    //    com.dayu.qihealonelibrary.dbBean.PassWordBean
     int clickNumber;
 
     @Override
@@ -55,12 +54,9 @@
         super.onCreate(savedInstanceState);
         binding = ActivityLoginBinding.inflate(LayoutInflater.from(this));
         setContentView(binding.getRoot());
-        getPermission();
         initView();
-        if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
-            choesLibrary();
-            //娌℃湁閫夋嫨鐗堟湰鍏堥�夋嫨鐗堟湰
-        }
+        getPermission();
+
     }
 
     private void initView() {
@@ -68,6 +64,7 @@
             clickNumber++;
             if (clickNumber == 20) {
                 choesLibrary();
+                clickNumber = 0;
             }
 
         });
@@ -119,6 +116,7 @@
     private void choesLibrary() {
 
         LibraryDialog dialog = new LibraryDialog(this, type -> {
+            binding.nameLL.setVisibility(View.GONE);
             if (type == BaseCommon.HeNanLibrary) {
                 getHNPermission();
             } else if (type == BaseCommon.QHOnLineLibrary) {
@@ -134,9 +132,9 @@
         if (MyApplication.myApplication.libraryType == BaseCommon.HeNanLibrary) {
             startActivity(new Intent(LoginActivity.this, com.dayu.henanlibrary.activity.HomeActivity.class));
         } else if (MyApplication.myApplication.libraryType == BaseCommon.QHAloneLibrary) {
-            startActivity(new Intent(LoginActivity.this, HomeActivity.class));
+            startActivity(new Intent(LoginActivity.this, HomeActivityQHAlone.class));
         } else if (MyApplication.myApplication.libraryType == BaseCommon.QHOnLineLibrary) {
-            startActivity(new Intent(LoginActivity.this, com.dayu.qiheonlinelibrary.activity.HomeActivity.class));
+            startActivity(new Intent(LoginActivity.this, HomeActivityQHOline.class));
         }
         LoginActivity.this.finish();
     }
@@ -194,6 +192,9 @@
         }
     }
 
+    /**
+     * 鑾峰彇閫氱敤鏉冮檺
+     */
     private void getPermission() {
         try {
             XXPermissions.with(this)
@@ -212,6 +213,10 @@
                                             file.mkdirs();
                                         }
                                         passWordBean = BaseDaoSingleton.getInstance(LoginActivity.this).loginPsDao().findFirst();
+                                        if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
+                                            choesLibrary();
+                                            //娌℃湁閫夋嫨鐗堟湰鍏堥�夋嫨鐗堟湰
+                                        }
                                     } catch (Exception e) {
                                         e.printStackTrace();
                                     }
@@ -282,6 +287,7 @@
     }
 
     long mExitTime;
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {

--
Gitblit v1.8.0