From fc1ec55e6ad56dc92737657750bcca7ed49f53eb Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 29 七月 2024 14:44:35 +0800
Subject: [PATCH] 齐河联网版程序和通讯相关工具
---
app/src/main/java/com/dayu/recharge/activity/LoginActivity.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 3ab6edb..230959b 100644
--- a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
@@ -5,6 +5,7 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.text.TextUtils;
+import android.util.Log;
import android.view.LayoutInflater;
import android.widget.Toast;
@@ -51,6 +52,10 @@
setContentView(binding.getRoot());
getPermission();
initView();
+ if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
+ choesLibrary();
+ //娌℃湁閫夋嫨鐗堟湰鍏堥�夋嫨鐗堟湰
+ }
}
private void initView() {
@@ -69,12 +74,9 @@
}
if ((passWordBean == null && psStr.equals("123456"))
|| passWordBean != null && passWordBean.getPassWord().equalsIgnoreCase(WSMD5.getMD5Str(psStr))) {
- if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
- choesLibrary();
- //娌℃湁閫夋嫨鐗堟湰鍏堥�夋嫨鐗堟湰
- } else {
+
startToHomeActivity();
- }
+
} else {
Toast.makeText(LoginActivity.this, "瀵嗙爜閿欒", Toast.LENGTH_SHORT).show();
}
@@ -87,6 +89,16 @@
}
}
+
+
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ Log.i("LoginActivity","onResume");
+
+ }
+
/**
* 閫夋嫨鐗堟湰
*/
@@ -95,11 +107,10 @@
LibraryDialog dialog = new LibraryDialog(this, type -> {
if (type == BaseCommon.HeNanLibrary) {
getHNPermission();
- } else if (type == BaseCommon.QHAloneLibrary) {
-
+ } else if (type == BaseCommon.QHOnLineLibrary) {
+ getHNPermission();
}
MyApplication.myApplication.initApplication();
- startToHomeActivity();
});
dialog.show();
}
@@ -109,6 +120,8 @@
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));
+ }else if (MyApplication.myApplication.libraryType==BaseCommon.QHOnLineLibrary){
+ startActivity(new Intent(LoginActivity.this, com.dayu.qiheonlinelibrary.activity.HomeActivity.class));
}
LoginActivity.this.finish();
}
--
Gitblit v1.8.0