From 43c0a28db7e43959561036dbde0eb5cb37a7e324 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 10 五月 2024 18:25:40 +0800
Subject: [PATCH] 2024年05月10日18:25:29
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 95 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 82 insertions(+), 13 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 1ee7d7c..936b0f0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -43,6 +43,7 @@
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;
@@ -50,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;
@@ -69,7 +71,7 @@
private ActivityMyPowerStationBinding viewBinding;
- private int currentFragmentIndex = 1;
+ private int currentFragmentIndex = 0;
private EventListener allTopicsListener;
private int backPressTimes;
@@ -81,7 +83,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.blue);
+// setNotificationBarBackgroundColor(CustomColor.blue);
+ setStatusBarTranslucent();
//鍒濆鍖�
this.initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -99,9 +102,13 @@
}
+
@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");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈�
@@ -198,9 +205,23 @@
private void initEvent() {
+ viewBinding.myPowerStationBottomIl0.clickTv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (currentFragmentIndex == 0) {
+ return;
+ }
+ currentFragmentIndex = 0;
+ bottomViewChangeOfStyle();
+ postEventBus(HomepageTitleTabSwitch.homepage);
+ }
+ });
viewBinding.myPowerStationBottomIl1.clickTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (currentFragmentIndex == 1) {
+ return;
+ }
currentFragmentIndex = 1;
bottomViewChangeOfStyle();
postEventBus(HomepageTitleTabSwitch.powerstation);
@@ -209,6 +230,9 @@
viewBinding.myMessageBottomIl2.clickTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (currentFragmentIndex == 2) {
+ return;
+ }
currentFragmentIndex = 2;
bottomViewChangeOfStyle();
postEventBus(HomepageTitleTabSwitch.message);
@@ -217,6 +241,9 @@
viewBinding.myMeBottomIl3.clickTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (currentFragmentIndex == 3) {
+ return;
+ }
currentFragmentIndex = 3;
bottomViewChangeOfStyle();
postEventBus(HomepageTitleTabSwitch.me);
@@ -236,44 +263,65 @@
}
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.home_page_selected));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_90000000));
+ viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
+ 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.me_unselected));
+ 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.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.selectedpowerstation));
+ viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_selected));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_90000000));
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.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected));
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.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedpowerstation));
+ viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_select));
viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_90000000));
- viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedme));
+ viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected));
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.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedpowerstation));
+ viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
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.selectedme));
+ viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_selected));
viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_90000000));
}
}
@@ -401,7 +449,7 @@
@Override
public void onSuccess(MqttInfo info) {
if (info != null) {
- MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
+ MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(), null);
MqttRecvClient.getInstance().connect();
}
}
@@ -477,6 +525,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) {
@@ -576,4 +626,23 @@
}
+ /**
+ * 绔彛鍐茬獊
+ */
+ 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