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 | 75 +++++++++++++++----------------------
1 files changed, 30 insertions(+), 45 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 9f53d29..679962f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -7,20 +7,18 @@
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.net.Uri;
import android.os.Bundle;
import android.os.Process;
import android.os.SystemClock;
-import android.provider.ContactsContract;
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;
@@ -29,7 +27,6 @@
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;
@@ -47,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;
@@ -100,11 +98,8 @@
this.pushTokens();
//鐐瑰嚮鏋佸厜閫氱煡鏍忔秷鎭繘鏉�
this.clickJpushNotificationMessage();
- //閫氱煡闄愭潈
- this.notificationSet();
//鍒濆鍖栨潈闄�
- requestPermissions();
-
+ this.requestPermissions();
}
@@ -113,7 +108,8 @@
* 涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
*/
private void pushTokens() {
- String is_registrationID = HDLApp.getInstance().getKey("registrationID");
+ String registrationId_tag = "registrationID_" + UserConfigManage.getInstance().getUserId();
+ String is_registrationID = HDLApp.getInstance().getKey(registrationId_tag);
if (is_registrationID.equals("true")) {
//涓婅繃灏辨病鏈夊繀瑕佸湪涓婁紶鍟�
return;
@@ -145,14 +141,15 @@
UserConfigManage.getInstance().setPushId(pushId);
UserConfigManage.getInstance().Save();
}
- HDLApp.getInstance().setInfoMap("registrationID", "true");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
- 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);
}
});
@@ -229,6 +226,11 @@
HdlUniLogic.getInstance().checkRemoveOtherUniMPEventCallBack();
//绉婚櫎鐩戝惉
HDLLinkLocalSdk.getInstance().removeAllTopicsListener(allTopicsListener);
+ //鏂紑mqtt杩炴帴
+ if (MqttRecvClient.getInstance() != null) {
+ MqttRecvClient.getInstance().stop();
+ }
+
}
private void initView() {
@@ -236,6 +238,7 @@
viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message);
viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
this.bottomViewChangeOfStyle();
+
}
@@ -286,7 +289,10 @@
}
public void requestPermissions() {
- //Manifest.permission.ACCESS_COARSE_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) {
this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
@@ -337,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) {
@@ -380,6 +394,7 @@
* 鍒濆鍖杕qtt瀹㈡埛绔�
*/
public void initMqttClient() {
+
HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
@Override
public void onSuccess(MqttInfo info) {
@@ -491,7 +506,7 @@
/**
- * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢(鍖呮嫭宸︽粦绉婚櫎浜嬩欢)
*/
@Override
public void onBackPressed() {
@@ -527,6 +542,7 @@
private void locationUpdates() {
// 鍒濆鍖朙ocationManager瀵硅薄
LocationManager locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+ GPSManagerUtils.getInstance().getLocation(this);
// 鍒ゆ柇璁惧鏄惁鏀寔瀹氫綅鍔熻兘
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
// 鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
@@ -552,39 +568,8 @@
}
});
- } else {
-// //INTERNET 鍏佽浣跨敤缃戠粶
-// //ACCESS_FINE_LOCATION 鍏佽浣跨敤GPS瀹氫綅
-// //ACCESS_COARSE_LOCATION 鍏佽浣跨敤WIFI鐑偣鎴栧熀绔欐潵鑾峰彇绮楃暐鐨勫畾浣�
-// if (ActivityCompat.checkSelfPermission(_mActivity, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-// // TODO: Consider calling
-// // ActivityCompat#requestPermissions
-// // here to request the missing permissions, and then overriding
-// // public void onRequestPermissionsResult(int requestCode, String[] permissions,
-// // int[] grantResults)
-// // to handle the case where the user grants the permission. See the documentation
-// // for ActivityCompat#requestPermissions for more details.
-// return;
-// }
-// HdlLogLogic.print("寮�濮嬬含搴︾粡搴�--->", true);
-// Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-//
-// //寤鸿杩欎釜 minTime 涓嶅皬浜� 60000锛屽嵆 1 鍒嗛挓锛岃繖鏍蜂細鏇村姞楂樻晥鑰屼笖鐪佺數
-// locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, new LocationListener() {
-// @Override
-// public void onLocationChanged(@NonNull Location location) {
-// // 褰撲綅缃彂鐢熷彉鍖栨椂璋冪敤姝ゆ柟娉�
-// double latitude = location.getLatitude(); // 鑾峰彇绾害
-// double longitude = location.getLongitude(); // 鑾峰彇缁忓害
-//
-// HdlLogLogic.print("绾害--->" + latitude, true);
-// HdlLogLogic.print("缁忓害--->" + longitude, true);
-// }
-// });
}
-
}
-
}
\ No newline at end of file
--
Gitblit v1.8.0