From 2a6c0d9a93923f852a90f9f53f5e75985ad5bf73 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 14 十二月 2023 09:52:10 +0800
Subject: [PATCH] 2023年12月14日09:51:57
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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 1706fa8..634d792 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -4,29 +4,24 @@
import androidx.appcompat.content.res.AppCompatResources;
import android.Manifest;
-import android.content.ComponentName;
-import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.os.IBinder;
import android.os.Process;
import android.text.TextUtils;
-import android.util.Log;
import android.view.View;
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.home.type.HomeType;
-import com.hdl.linkpm.sdk.ota.bean.CloudGatewayDriversBean;
-import com.hdl.linkpm.sdk.utils.HDLMD5Utils;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.bean.MqttInfo;
+import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
-import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMqttLogic;
import com.hdl.photovoltaic.other.HdlOtaLogic;
@@ -45,12 +40,12 @@
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
+import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
-import okhttp3.ResponseBody;
/**
@@ -74,6 +69,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+ setNotificationBarBackgroundColor(CustomColor.blue);
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -83,8 +79,6 @@
//鍒濆鍖杕qtt瀹㈡埛绔�
initMqttClient();
-
-
}
private void initEvent() {
@@ -93,6 +87,7 @@
public void onClick(View v) {
currentFragmentIndex = 1;
bottomViewChangeOfStyle();
+ postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.powerstation);
}
});
viewBinding.myMessageBottomIl2.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -100,6 +95,7 @@
public void onClick(View v) {
currentFragmentIndex = 2;
bottomViewChangeOfStyle();
+ postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.message);
}
});
viewBinding.myMeBottomIl3.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -107,6 +103,7 @@
public void onClick(View v) {
currentFragmentIndex = 3;
bottomViewChangeOfStyle();
+ postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.me);
}
});
@@ -164,6 +161,17 @@
}
}
+ /**
+ * 鍙戝竷鐐瑰嚮浜嬩欢
+ *
+ * @param tabSwitch -
+ */
+ private void postEventBus(HdlCommonLogic.HomepageTitleTabSwitch tabSwitch) {
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setTopic(ConstantManage.homepage_title_tab_switch);
+ baseEventBus.setType(tabSwitch + "");
+ EventBus.getDefault().post(baseEventBus);
+ }
public void requestPermissions() {
String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION});
@@ -242,6 +250,7 @@
uniCallBackBaseBean.setType(linkResponse.getTopic());
uniCallBackBaseBean.setData(linkResponse.getData());
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean);
+ HdlLogLogic.print( linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true);
}
}
}
@@ -313,12 +322,12 @@
});
}
} else if (event.getTopic().contains(HdlOtaLogic.localDownloadProgress)) {
- //涓嬭浇浜戠椹卞姩鎴栬�呭浐浠舵枃浠�,鑷繁璁＄畻杩涘害鏉′笂鎶ュ埌uni閭ｈ竟
+ //涓嬭浇浜戠椹卞姩鎴栬�呭浐浠舵枃浠跺埌鏈湴,鑷繁璁＄畻杩涘害鏉′笂鎶ュ埌uni閭ｈ竟
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
- uniCallBackBaseBean.setType(HdlOtaLogic.localDownloadProgress);
+ uniCallBackBaseBean.setType(event.getType());
uniCallBackBaseBean.setData(event.getData());
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean);
- HdlLogLogic.print(((HdlOtaLogic.Progress) event.getData()).step + "", false);
+ HdlLogLogic.print( event.getTopic() + new Gson().toJson(event.getData()), true);
}
}
@@ -352,9 +361,6 @@
}
super.onBackPressed();
}
-
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0