From 9d57ea9c1ca983a8990dfb3791165c6bae28f483 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 09 五月 2024 16:48:50 +0800
Subject: [PATCH] 1.修复河南版本不能自动连接服务器的bug 2.添加重新选择版本的功能
---
app/src/main/java/com/dayu/recharge/MyApplication.java | 51 ++++++++++++----
app/src/main/java/com/dayu/recharge/activity/LoginActivity.java | 42 ++++++++-----
henanlibrary/src/main/res/layout/activity_my_hn.xml | 4
app/src/main/res/layout/activity_login.xml | 4
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java | 2
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java | 6 +
qihealonelibrary/src/main/res/layout/activity_my_qha.xml | 18 +++---
7 files changed, 80 insertions(+), 47 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/MyApplication.java b/app/src/main/java/com/dayu/recharge/MyApplication.java
index a456cdf..a70b71f 100644
--- a/app/src/main/java/com/dayu/recharge/MyApplication.java
+++ b/app/src/main/java/com/dayu/recharge/MyApplication.java
@@ -13,6 +13,8 @@
import com.dayu.qihealonelibrary.QHAloneApplication;
import com.tencent.bugly.crashreport.CrashReport;
+import java.io.File;
+
public class MyApplication extends Application {
public static String TAG = "MyApplication";
@@ -24,6 +26,14 @@
public void onCreate() {
super.onCreate();
myApplication = this;
+ try {
+ File file = new File(HNBaseDaoSingleton.SqlitePath);
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
initApplication();
BaseApplication.getInstance().onCreat(this);
CrashReport.initCrashReport(getApplicationContext(), "45551598b8", true);
@@ -32,23 +42,36 @@
public void initApplication() {
//鍏煎鑰佺増鐨勶紝璁や负鏈塧ddressCode骞朵笖LibraryBean涓簄ull鐨勪负娌冲崡鐗堟湰鐨�
- AdminDataBean adminDataBean = HNBaseDaoSingleton.getInstance(this).adminDao().findFirst();
- LibraryBean libraryBean = BaseDaoSingleton.getInstance(this).libraryDao().findFirst();
- if (adminDataBean != null && libraryBean == null && !TextUtils.isEmpty(adminDataBean.addressCode)) {
- libraryType = BaseCommon.HeNanLibrary;
- HeNanApplication.getInstance().application = this;
- } else if (libraryBean != null) {
- libraryType = libraryBean.getType();
- switch (libraryType) {
- case BaseCommon.HeNanLibrary:
- HeNanApplication.getInstance().application = this;
- break;
- case BaseCommon.QHAloneLibrary:
- QHAloneApplication.getInstance().application = this;
- break;
+ try {
+ AdminDataBean adminDataBean = HNBaseDaoSingleton.getInstance(this).adminDao().findFirst();
+ LibraryBean libraryBean = BaseDaoSingleton.getInstance(this).libraryDao().findFirst();
+ if (adminDataBean != null && libraryBean == null && !TextUtils.isEmpty(adminDataBean.addressCode)) {
+ libraryType = BaseCommon.HeNanLibrary;
+ initHeNan();
+ } else if (libraryBean != null) {
+ libraryType = libraryBean.getType();
+ switch (libraryType) {
+ case BaseCommon.HeNanLibrary:
+ initHeNan();
+ break;
+ case BaseCommon.QHAloneLibrary:
+ QHAloneApplication.getInstance().application = this;
+ break;
+ }
}
+ } catch (Exception e) {
+ e.printStackTrace();
+ CrashReport.postCatchedException(e);
}
}
+ /**
+ * 鍒濆鍖栨渤鍗�
+ */
+ private void initHeNan() {
+ HeNanApplication.getInstance().application = this;
+ HeNanApplication.getInstance().initEasySocket(false, null);
+ }
+
}
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 14757fc..b79405b 100644
--- a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
@@ -41,6 +41,7 @@
ActivityLoginBinding binding;
PassWordBean passWordBean;
+ int clickNumber;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -52,36 +53,27 @@
}
private void initView() {
+ binding.title.setOnClickListener(v -> {
+ clickNumber++;
+ if (clickNumber == 20) {
+ choesLibrary();
+ }
+
+ });
binding.loginBtn.setOnClickListener(v -> {
String psStr = binding.loginPw.getText().toString();
-
if (TextUtils.isEmpty(psStr)) {
TipUtil.show("璇疯緭鍏ュ瘑鐮�");
return;
}
if ((passWordBean == null && psStr.equals("123456"))
|| passWordBean != null && passWordBean.getPassWord().equalsIgnoreCase(WSMD5.getMD5Str(psStr))) {
-
-
if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
- //閫夋嫨鐗堟湰
- LibraryDialog dialog = new LibraryDialog(this, type -> {
- if (type == BaseCommon.HeNanLibrary) {
- getHNPermission();
- } else if (type == BaseCommon.QHAloneLibrary) {
- getQHAlonePermission();
- }
- MyApplication.myApplication.initApplication();
- startToHomeActivity();
- });
- dialog.show();
+ choesLibrary();
//娌℃湁閫夋嫨鐗堟湰鍏堥�夋嫨鐗堟湰
- return;
} else {
startToHomeActivity();
}
-
-
} else {
Toast.makeText(LoginActivity.this, "瀵嗙爜閿欒", Toast.LENGTH_SHORT).show();
}
@@ -94,6 +86,22 @@
}
}
+ /**
+ * 閫夋嫨鐗堟湰
+ */
+ private void choesLibrary() {
+
+ LibraryDialog dialog = new LibraryDialog(this, type -> {
+ if (type == BaseCommon.HeNanLibrary) {
+ getHNPermission();
+ } else if (type == BaseCommon.QHAloneLibrary) {
+ getQHAlonePermission();
+ }
+ MyApplication.myApplication.initApplication();
+ startToHomeActivity();
+ });
+ dialog.show();
+ }
private void startToHomeActivity() {
if (MyApplication.myApplication.libraryType == BaseCommon.HeNanLibrary) {
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 40c5678..61e7c81 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -7,6 +7,7 @@
<TextView
+ android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="20dp"
@@ -63,7 +64,6 @@
android:id="@+id/versionName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="v2.0"
- />
+ android:text="v2.0" />
</LinearLayout>
\ No newline at end of file
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java
index 958c081..06ad0b6 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java
@@ -169,11 +169,13 @@
adminData = baseDao.adminDao().findFirst();
if (adminData.isHasAddressCode()) {
myBinding.myAdminName.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
- myBinding.myVillageNum.setText(adminData.getSerial());
} else {
myBinding.myAdminName.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
- myBinding.myVillageNum.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
}
+ if (!TextUtils.isEmpty(adminData.getSerial())) {
+ myBinding.myVillageNum.setText(adminData.getSerial());
+ }
+
StringBuilder msgData = new StringBuilder();
String initCode = DeviceNumberUtils.getDeviceNumber();
diff --git a/henanlibrary/src/main/res/layout/activity_my_hn.xml b/henanlibrary/src/main/res/layout/activity_my_hn.xml
index 9491b96..8d6c624 100644
--- a/henanlibrary/src/main/res/layout/activity_my_hn.xml
+++ b/henanlibrary/src/main/res/layout/activity_my_hn.xml
@@ -35,12 +35,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="璁惧搴忓垪鍙凤細"
+ android:textColor="@color/picker_text_color"
android:textSize="@dimen/text_size" />
<TextView
android:id="@+id/my_villageNum"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:textColor="@color/picker_text_color"
android:textSize="@dimen/text_size" />
</LinearLayout>
@@ -121,8 +123,6 @@
android:textSize="@dimen/text_size" />
</RelativeLayout>
-
-
<TextView
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
index cd83929..a03e0fb 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
@@ -323,7 +323,7 @@
super.onNewIntent(intent);
try {
this.intent = intent;
- startAnim();
+// startAnim();
Log.i("NFCWreatActivity", "isUser:" + isUser);
if (isUser) {
//鏂板崱娉ㄥ唽閫昏緫
diff --git a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
index d364480..f6baa22 100644
--- a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
@@ -26,10 +26,10 @@
<LinearLayout
android:id="@+id/my_village"
- android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:visibility="gone">
<TextView
@@ -130,9 +130,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="IP璁剧疆"
- android:visibility="gone"
android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
<TextView
android:id="@+id/card_replacement"
@@ -140,9 +140,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鐢ㄦ埛琛ュ崱"
- android:visibility="gone"
android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
<TextView
@@ -150,7 +150,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:text="瀵嗙爜璁剧疆"
+ android:text="鐧诲綍瀵嗙爜璁剧疆"
android:textColor="@color/text_selecter"
android:textSize="@dimen/text_size" />
@@ -160,9 +160,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鏈繛鎺ユ暟鎹腑蹇�"
- android:visibility="gone"
android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
</LinearLayout>
</ScrollView>
--
Gitblit v1.8.0