From 89e91f91b49676be534eb0005d02beae7b8343ba Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 22 四月 2024 10:56:01 +0800
Subject: [PATCH] 2024年04月22日10:55:54
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 178 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 92 insertions(+), 86 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 dfef1b7..b2418b9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -2,14 +2,11 @@
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.pm.PackageManager;
-import android.location.Location;
-import android.location.LocationListener;
import android.location.LocationManager;
import android.os.Bundle;
import android.os.Process;
@@ -18,7 +15,6 @@
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;
@@ -44,8 +40,10 @@
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.photovoltaic.widget.ConfirmationTipDialog;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.event.EventListener;
import com.hdl.sdk.link.core.bean.LinkResponse;
@@ -53,6 +51,7 @@
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
+import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
import org.greenrobot.eventbus.EventBus;
@@ -66,13 +65,13 @@
/**
- * 鎴戠殑鐢电珯鐣岄潰
+ * B绔�-鐢电珯鐣岄潰
*/
public class MyPowerStationActivity extends CustomBaseActivity {
private ActivityMyPowerStationBinding viewBinding;
- private int currentFragmentIndex = 1;
+ private int currentFragmentIndex = 0;
private EventListener allTopicsListener;
private int backPressTimes;
@@ -103,11 +102,26 @@
}
+ @Override
+ protected void onResume() {
+ super.onResume();
+ //鍚姩椤典笌mainActivity鏍峰紡涓�鏍凤紝杩欐牱鍚姩椤靛拰mainActivity鐪嬩笂鍘绘槸涓�涓晫闈紝鐩殑鏄负浜唌ainActivity閬綇涓嬩竴椤碉紱
+// AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
+ portConflictDialog();
+// Intent intent = new Intent(_mActivity, MyPowerStationActivity.class);
+// intent.setFlags(Intent.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+// intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈�
+// _mActivity.startActivity(intent);
+ //鐐瑰嚮鏋佸厜閫氱煡鏍忔秷鎭繘鏉�
+// this.clickJpushNotificationMessage();
+ }
+
+
/**
* 涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
*/
private void pushTokens() {
- String registrationId_tag="registrationID_"+UserConfigManage.getInstance().getUserId();
+ String registrationId_tag = "registrationID_" + UserConfigManage.getInstance().getUserId();
String is_registrationID = HDLApp.getInstance().getKey(registrationId_tag);
if (is_registrationID.equals("true")) {
//涓婅繃灏辨病鏈夊繀瑕佸湪涓婁紶鍟�
@@ -141,14 +155,14 @@
UserConfigManage.getInstance().Save();
}
HDLApp.getInstance().setInfoMap(registrationId_tag, "true");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
- HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔�--->registrationID:" + finalRegistrationID, true);
+ HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
}
@Override
public void onFailure(HDLException e) {
HDLApp.getInstance().setInfoMap(registrationId_tag, "false");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
- HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔け璐�--->registrationID:" + finalRegistrationID, true);
+ HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔け璐�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
}
});
@@ -190,6 +204,14 @@
private void initEvent() {
+ viewBinding.myPowerStationBottomIl0.clickTv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ currentFragmentIndex = 0;
+ bottomViewChangeOfStyle();
+ postEventBus(HomepageTitleTabSwitch.homepage);
+ }
+ });
viewBinding.myPowerStationBottomIl1.clickTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -228,18 +250,34 @@
}
private void initView() {
- viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_shome_page);//
+ viewBinding.myPowerStationBottomIl0.titleTv.setText(R.string.power_shome_page);//
+ viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_station);//
viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message);
viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
this.bottomViewChangeOfStyle();
-
}
private void bottomViewChangeOfStyle() {
- if (this.currentFragmentIndex == 1) {
+ if (this.currentFragmentIndex == 0) {
+ viewBinding.myHomePageFcv0.setVisibility(View.VISIBLE);//鏄剧ず棣栭〉鐣岄潰
+ viewBinding.myPowerStationFcv1.setVisibility(View.GONE);//鏄剧ず鐢电珯鐣岄潰
+ viewBinding.myMessageFcv2.setVisibility(View.GONE);//闅愯棌娑堟伅鐣岄潰
+ viewBinding.myMeFcv3.setVisibility(View.GONE);//闅愯棌鎴戠殑鐣岄潰
+ viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.selectedpowerstation));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_90000000));
+ viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedpowerstation));
+ viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedme));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000));
+ } else if (this.currentFragmentIndex == 1) {
+ viewBinding.myHomePageFcv0.setVisibility(View.GONE);//闅愯棌棣栭〉鐣岄潰
viewBinding.myPowerStationFcv1.setVisibility(View.VISIBLE);//鏄剧ず鐢电珯鐣岄潰
viewBinding.myMessageFcv2.setVisibility(View.GONE);//闅愯棌娑堟伅鐣岄潰
viewBinding.myMeFcv3.setVisibility(View.GONE);//闅愯棌鎴戠殑鐣岄潰
+ viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedpowerstation));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.selectedpowerstation));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_90000000));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
@@ -247,9 +285,12 @@
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedme));
viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000));
} else if (this.currentFragmentIndex == 2) {
+ viewBinding.myHomePageFcv0.setVisibility(View.GONE);//闅愯棌棣栭〉鐣岄潰
viewBinding.myPowerStationFcv1.setVisibility(View.GONE);//闅愯棌鐢电珯鐣岄潰
viewBinding.myMessageFcv2.setVisibility(View.VISIBLE);//鏄剧ず娑堟伅鐣岄潰
viewBinding.myMeFcv3.setVisibility(View.GONE);//闅愯棌鎴戠殑鐣岄潰
+ viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedpowerstation));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedpowerstation));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_select));
@@ -257,9 +298,12 @@
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedme));
viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000));
} else if (this.currentFragmentIndex == 3) {
+ viewBinding.myHomePageFcv0.setVisibility(View.GONE);//闅愯棌棣栭〉鐣岄潰
viewBinding.myPowerStationFcv1.setVisibility(View.GONE);//闅愯棌鐢电珯鐣岄潰
viewBinding.myMessageFcv2.setVisibility(View.GONE);//闅愯棌娑堟伅鐣岄潰
viewBinding.myMeFcv3.setVisibility(View.VISIBLE);//鏄剧ず鎴戠殑鐣岄潰
+ viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedpowerstation));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedpowerstation));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
@@ -284,7 +328,6 @@
public void requestPermissions() {
//娑堟伅閫氱煡闄愭潈
this.notificationSet();
- //Manifest.permission.ACCESS_COARSE_LOCATION
//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});
@@ -388,19 +431,22 @@
* 鍒濆鍖杕qtt瀹㈡埛绔�
*/
public void initMqttClient() {
- HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
- @Override
- public void onSuccess(MqttInfo info) {
- if (info != null) {
- MqttRecvClient.init(_mActivity, info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
+ if (!MqttRecvClient.getInstance().isInit()) {
+ HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
+ @Override
+ public void onSuccess(MqttInfo info) {
+ if (info != null) {
+ MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(), null);
+ MqttRecvClient.getInstance().connect();
+ }
}
- }
- @Override
- public void onFailure(HDLException e) {
- HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
- }
- });
+ @Override
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
+ }
+ });
+ }
}
@Subscribe(threadMode = ThreadMode.MAIN)
@@ -466,6 +512,8 @@
HdlThreadLogic.runSubThread(new Runnable() {
@Override
public void run() {
+ //闃叉app鍚姩鐨勬椂鍊欐病鏈夌綉缁�(app涔熺櫥褰曚笉浜�),瀵艰嚧鑾峰彇涓嶄簡mqtt杩滅▼杩炴帴淇℃伅;
+ initMqttClient();
HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
@Override
public void onSuccess(List<GatewayBean> obj) {
@@ -499,7 +547,7 @@
/**
- * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢(鍖呮嫭宸︽粦绉婚櫎浜嬩欢)
*/
@Override
public void onBackPressed() {
@@ -533,38 +581,9 @@
* 鍒濆鍖栥�愬紑鍚畾浣嶃�戝拰銆愪綅缃俊鎭�戞潈闄�
*/
private void locationUpdates() {
-
-
// 鍒濆鍖朙ocationManager瀵硅薄
LocationManager locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-// //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("寮�濮嬬含搴︾粡搴�--->", false);
-// 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);
-// }
-// });
+ GPSManagerUtils.getInstance().getLocation(this);
// 鍒ゆ柇璁惧鏄惁鏀寔瀹氫綅鍔熻兘
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
// 鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
@@ -590,40 +609,27 @@
}
});
- } 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("寮�濮嬬含搴︾粡搴�--->", false);
-// Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-
- //寤鸿杩欎釜 minTime 涓嶅皬浜� 60000锛屽嵆 1 鍒嗛挓锛岃繖鏍蜂細鏇村姞楂樻晥鑰屼笖鐪佺數
- locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 60 * 1000, 10, new LocationListener() {
- @Override
- public void onLocationChanged(@NonNull Location location) {
- // 褰撲綅缃彂鐢熷彉鍖栨椂璋冪敤姝ゆ柟娉�
- double latitude = location.getLatitude(); // 鑾峰彇绾害
- double longitude = location.getLongitude(); // 鑾峰彇缁忓害
-
-
- HdlLogLogic.print("绾害--->" + latitude, false);
- HdlLogLogic.print("缁忓害--->" + longitude, false);
- }
- });
}
-
}
+ /**
+ * 绔彛鍐茬獊
+ */
+ private void portConflictDialog() {
+ if (!HDLUdpConnect.getInstance().isBindSuccess()) {
+ ConfirmationTipDialog dialog = new ConfirmationTipDialog(_mActivity);
+ dialog.show();
+ dialog.setTitle(getString(R.string.loading_title_tip));
+ dialog.setContent(getString(R.string.port_conflict));
+ dialog.setConfirmation(getString(R.string.home_login_affirm));
+ dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ dialog.dismiss();
+ }
+ });
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0