From 75417d96b932dc5da0b3457fa1bc663fa64034f7 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 29 十一月 2023 17:45:49 +0800
Subject: [PATCH] 修改权限逻辑，获取权限后再生成数据库 数据库保存在sd防止用户删除后没有数据了
---
app/src/main/java/com/dayu/recharge/net/SocketNet.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/net/SocketNet.java b/app/src/main/java/com/dayu/recharge/net/SocketNet.java
index f1dbe8f..3f0aaed 100644
--- a/app/src/main/java/com/dayu/recharge/net/SocketNet.java
+++ b/app/src/main/java/com/dayu/recharge/net/SocketNet.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.os.Handler;
+import android.text.TextUtils;
import android.util.Log;
import com.dayu.recharge.activity.HomeActivity;
@@ -94,28 +95,22 @@
*/
@Override
public void onSocketConnSuccess(SocketAddress socketAddress) {
- Log.i("SocketActionListener", "杩炴帴鎴愬姛");
+ Log.i("SocketActionListener1111", "杩炴帴鎴愬姛");
MyApplication.myApplication.isConncet = true;
- rushState();
- DeviceNumber initCode = BaseDaoSingleton.getInstance(MyApplication.myApplication).deviceNumberDao().findFirst();
- if (initCode == null && !MyApplication.myApplication.isDoInitMachine) {
- new Handler().postDelayed(new Runnable() {
- @Override
- public void run() {
- IpBean ipBean = BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
- AdminDataBean adminData = BaseDaoSingleton.getInstance(MyApplication.myApplication).adminDao().findFirst();
- if (ipBean != null && adminData != null) {
- MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
- }
+ AdminDataBean adminData = BaseDaoSingleton.getInstance(MyApplication.myApplication).adminDao().findFirst();
+ Log.i("SocketActionListener1111", "isDoInitMachine==" + MyApplication.myApplication.isDoInitMachine + "");
+ if (!MyApplication.myApplication.isDoInitMachine) {
+ Log.i("SocketActionListener1111", "isDoInitMachine");
+ if (MyApplication.myApplication.ipBean != null && adminData != null) {
+ if (!TextUtils.isEmpty(adminData.getAddressCode())) {
+ Log.i("SocketActionListener1111", "initMachineRequestBean");
+ MyApplication.myApplication.initMachineRequestBean(MyApplication.myApplication.ipBean.getIp(), MyApplication.myApplication.ipBean.getPort(), adminData.getAddressCode());
+
}
- }, 500);
+ }
}
-// if (dataMessage != null) {
-// EasySocket.getInstance().upMessage(dataMessage);
-// }
-
-
+ rushState();
}
/**
@@ -176,8 +171,12 @@
};
private void rushState() {
- if (HomeActivity.homeActivity != null) {
- HomeActivity.homeActivity.rushState();
+ try {
+ if (HomeActivity.homeActivity != null) {
+ HomeActivity.homeActivity.rushState();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
--
Gitblit v1.8.0