From 78dbac2e8e7ad58d9e5d6a025de0d6fc58f69146 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 21 十二月 2023 21:17:15 +0800
Subject: [PATCH] 2023年12月21日21:17:08
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 dcf4b23..0bc1f2a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -1,26 +1,21 @@
package com.hdl.photovoltaic.ui;
import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import androidx.appcompat.content.res.AppCompatResources;
import android.Manifest;
import android.content.ComponentName;
-import android.content.Intent;
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;
@@ -30,7 +25,6 @@
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;
@@ -54,8 +48,6 @@
import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
-
-import okhttp3.ResponseBody;
/**
@@ -88,6 +80,18 @@
registerAllTopicsListener();
//鍒濆鍖杕qtt瀹㈡埛绔�
initMqttClient();
+
+// HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
+// @Override
+// public void onServiceConnected(ComponentName name, IBinder service) {
+//
+// }
+//
+// @Override
+// public void onServiceDisconnected(ComponentName name) {
+//
+// }
+// });
}
@@ -130,7 +134,7 @@
}
private void initView() {
- viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_station);
+ viewBinding.myPowerStationBottomIl1.titleTv.setText("棣栭〉");//
viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message);
viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
this.bottomViewChangeOfStyle();
@@ -260,6 +264,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);
}
}
}
@@ -336,7 +341,7 @@
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);
}
}
--
Gitblit v1.8.0