From 636c4bb04e4fcd723766b82732990cdb4ae4ea2e Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 22 二月 2024 15:48:23 +0800
Subject: [PATCH] 删除掉本地库
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 150 +++++++++++++++++++++++++++++++-------------------
1 files changed, 93 insertions(+), 57 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
index d2289a6..679962f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -2,25 +2,31 @@
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.app.ActivityCompat;
import android.Manifest;
+import android.content.Context;
import android.content.Intent;
-import android.content.IntentFilter;
import android.content.pm.PackageManager;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
import android.os.Bundle;
import android.os.Process;
import android.os.SystemClock;
+import android.provider.Settings;
import android.text.TextUtils;
import android.view.View;
+import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.home.type.HomeType;
+import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.bean.MqttInfo;
-import com.hdl.photovoltaic.broadcast.NetworkChangeReceiver;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding;
@@ -38,6 +44,7 @@
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.AppManagerUtils;
+import com.hdl.photovoltaic.utils.GPSManagerUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.sdk.link.HDLLinkLocalSdk;
@@ -68,11 +75,7 @@
private ActivityMyPowerStationBinding viewBinding;
private int currentFragmentIndex = 1;
private EventListener allTopicsListener;
-
private int backPressTimes;
-
- private NetworkChangeReceiver networkChangeReceiver;
-
@Override
public Object getContentView() {
@@ -91,22 +94,27 @@
this.registerAllTopicsListener();
//鍒濆鍖杕qtt瀹㈡埛绔�
this.initMqttClient();
-
- //涓婁紶鏋佸厜娉ㄥ唽ID
+ //涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
this.pushTokens();
//鐐瑰嚮鏋佸厜閫氱煡鏍忔秷鎭繘鏉�
this.clickJpushNotificationMessage();
- //閫氱煡闄愭潈
- this.notificationSet();
-
+ //鍒濆鍖栨潈闄�
+ this.requestPermissions();
}
/**
- * 涓婁紶鏋佸厜娉ㄥ唽ID
+ * 涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
*/
private void pushTokens() {
+ String registrationId_tag = "registrationID_" + UserConfigManage.getInstance().getUserId();
+ String is_registrationID = HDLApp.getInstance().getKey(registrationId_tag);
+ if (is_registrationID.equals("true")) {
+ //涓婅繃灏辨病鏈夊繀瑕佸湪涓婁紶鍟�
+ return;
+ }
+
HdlThreadLogic.runSubThread(new Runnable() {
@Override
public void run() {
@@ -133,13 +141,15 @@
UserConfigManage.getInstance().setPushId(pushId);
UserConfigManage.getInstance().Save();
}
- HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔�--->registrationID:" + finalRegistrationID, true);
+ HDLApp.getInstance().setInfoMap(registrationId_tag, "true");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
+ HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
}
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔け璐�--->registrationID:" + finalRegistrationID, true);
+ HDLApp.getInstance().setInfoMap(registrationId_tag, "false");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
+ HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔け璐�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
}
});
@@ -157,9 +167,9 @@
boolean isBoolean = PermissionUtils.isNotificationEnabled(_mActivity);
if (!isBoolean) {
ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
- confirmationCancelDialog.setTitle("鎻愮ず");
- confirmationCancelDialog.setContent("閫氱煡鏉冮檺娌″紑鍚�,灏嗘棤娉曟敹鍒版帹閫佷俊鎭�.");
- confirmationCancelDialog.setConfirmation("鍓嶅線璁剧疆");
+ confirmationCancelDialog.setTitle(getString(R.string.loading_title_tip));
+ confirmationCancelDialog.setContent(getString(R.string.no_permissions_unable_to_receive_push));
+ confirmationCancelDialog.setConfirmation(getString(R.string.go_to_settings));
confirmationCancelDialog.show();
confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
@@ -179,15 +189,6 @@
}
}
- /**
- * 鐩戝惉缃戠粶鐘舵�佸彉鍖�
- */
- private void networkMonitoring() {
- IntentFilter intentFilter = new IntentFilter();
- intentFilter.addAction("android.net.conn.CONNECTIVITY_CHANGE");
- networkChangeReceiver = new NetworkChangeReceiver();
- registerReceiver(networkChangeReceiver, intentFilter);
- }
private void initEvent() {
viewBinding.myPowerStationBottomIl1.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -225,8 +226,10 @@
HdlUniLogic.getInstance().checkRemoveOtherUniMPEventCallBack();
//绉婚櫎鐩戝惉
HDLLinkLocalSdk.getInstance().removeAllTopicsListener(allTopicsListener);
- //绉婚櫎鐩戝惉缃戠粶鐘舵�佸彉鍖�
- unregisterReceiver(networkChangeReceiver);
+ //鏂紑mqtt杩炴帴
+ if (MqttRecvClient.getInstance() != null) {
+ MqttRecvClient.getInstance().stop();
+ }
}
@@ -235,6 +238,7 @@
viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message);
viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
this.bottomViewChangeOfStyle();
+
}
@@ -285,13 +289,15 @@
}
public void requestPermissions() {
- String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION});
+ //娑堟伅閫氱煡闄愭潈
+ this.notificationSet();
+ //ACCESS_FINE_LOCATION 鍏佽浣跨敤GPS瀹氫綅
+ //ACCESS_COARSE_LOCATION 鍏佽浣跨敤WIFI鐑偣鎴栧熀绔欐潵鑾峰彇绮楃暐鐨勫畾浣�
+ String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION});
if (ary.length > 0) {
- requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
+ this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
} else {
- if (mPermissionsResultCallback != null) {
- mPermissionsResultCallback.succeed();
- }
+ locationUpdates();
}
}
@@ -301,28 +307,17 @@
if (requestCode == PermissionUtils.STATUS_SUCCESS) {
for (int i = 0; i < permissions.length; i++) {
if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
- if (mPermissionsResultCallback != null) {
- mPermissionsResultCallback.succeed();
+ switch (permissions[i]) {
+ case Manifest.permission.ACCESS_FINE_LOCATION: {
+ locationUpdates();
+ }
+ break;
}
+
}
}
}
-
- }
-
-
- private PermissionsResultCallback mPermissionsResultCallback;
-
- public void setPermissionsResultCallback(PermissionsResultCallback permissionsResultCallback) {
- mPermissionsResultCallback = permissionsResultCallback;
- }
-
- public interface PermissionsResultCallback {
-
- void succeed();
-
- void failing();
}
@@ -348,7 +343,15 @@
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(response.getTopic());
uniCallBackBaseBean.setData(response.getData());
+// if (com.hdl.photovoltaic.ui.test.UniAppMqtt.getInstance().getUni()) {
+// try {
+// String t = String.format("AndroidToPC/%s/%s", System.currentTimeMillis(), HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL);
+// com.hdl.photovoltaic.ui.test.UniAppMqtt.getInstance().publish(t, JSONObject.toJSON(uniCallBackBaseBean).toString());
+// } catch (Exception ignored) {
+// }
+// } else {
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+// }
// }
} else if (msg instanceof LinkResponse) {
@@ -383,18 +386,15 @@
}
}
}
- }
-
- ;
- HDLLinkLocalSdk.getInstance().
-
- registerAllTopicsListener(allTopicsListener);
+ };
+ HDLLinkLocalSdk.getInstance().registerAllTopicsListener(allTopicsListener);
}
/**
* 鍒濆鍖杕qtt瀹㈡埛绔�
*/
public void initMqttClient() {
+
HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
@Override
public void onSuccess(MqttInfo info) {
@@ -506,7 +506,7 @@
/**
- * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢(鍖呮嫭宸︽粦绉婚櫎浜嬩欢)
*/
@Override
public void onBackPressed() {
@@ -536,4 +536,40 @@
}
+ /**
+ * 鍒濆鍖栥�愬紑鍚畾浣嶃�戝拰銆愪綅缃俊鎭�戞潈闄�
+ */
+ private void locationUpdates() {
+ // 鍒濆鍖朙ocationManager瀵硅薄
+ LocationManager locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+ GPSManagerUtils.getInstance().getLocation(this);
+ // 鍒ゆ柇璁惧鏄惁鏀寔瀹氫綅鍔熻兘
+ if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+ // 鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
+ ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
+ confirmationCancelDialog.setTitle(getString(R.string.loading_title_tip));
+ confirmationCancelDialog.setContent(getString(R.string.system_positioning_switch));
+ confirmationCancelDialog.setConfirmation(getString(R.string.go_to_settings));
+ confirmationCancelDialog.show();
+ confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ confirmationCancelDialog.dismiss();
+ Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ HDLApp.getInstance().startActivity(intent);
+
+ }
+ });
+ confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ @Override
+ public void Cancel() {
+ confirmationCancelDialog.dismiss();
+ }
+ });
+
+ }
+
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0