From 53cfbb7c949edc8e3d0b624e251afbad1a1c74ca Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 08 一月 2024 18:03:18 +0800 Subject: [PATCH] 2024年01月08日18:03:16 --- app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java | 122 +++++++++++++++++++++++++++++++++------- 1 files changed, 101 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java index 0911e5b..3baa86d 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java @@ -2,28 +2,36 @@ import androidx.recyclerview.widget.LinearLayoutManager; -import android.content.Context; import android.os.Bundle; import android.text.TextUtils; -import android.util.Log; import android.view.View; + import com.google.gson.Gson; -import com.hdl.photovoltaic.R; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.reflect.TypeToken; +import com.hdl.linkpm.sdk.core.exception.HDLException; import com.hdl.photovoltaic.base.CustomBaseActivity; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.ActivityTestMainBinding; import com.hdl.photovoltaic.enums.ShowErrorMode; +import com.hdl.photovoltaic.internet.TcpClient; +import com.hdl.photovoltaic.internet.api.TopicApi; +import com.hdl.photovoltaic.listener.CloudCallBeak; import com.hdl.photovoltaic.listener.LinkCallBack; import com.hdl.photovoltaic.other.HdlDeviceLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; +import com.hdl.photovoltaic.ui.bean.CloudInverterChildDeviceBean; import com.hdl.photovoltaic.ui.bean.OidBean; import com.hdl.photovoltaic.widget.ConfirmationCancelDialog; -import com.hdl.photovoltaic.widget.ConfirmationExceptionDialog; import com.hdl.sdk.link.common.exception.HDLLinkException; import com.hdl.sdk.link.core.bean.gateway.GatewayBean; +import com.hdl.sdk.link.core.bean.response.BaseLocalResponse; import com.hdl.sdk.link.core.callback.GatewayCallBack; +import com.hdl.sdk.link.core.callback.HDLLinkCallBack; +import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; @@ -34,6 +42,8 @@ private ActivityTestMainBinding viewBinding; private TestTitleAdapter testTitleAdapter; + + private List<OidBean> mOidList; @Override public Object getContentView() { @@ -69,6 +79,7 @@ private void initEvent() { viewBinding.topBackBtn.setOnClickListener(this); viewBinding.topLogBtn.setOnClickListener(this); + viewBinding.clickCommandTv.setOnClickListener(this); testTitleAdapter.setItemOnClickListener(new TestTitleAdapter.OnClickListener() { @Override public void OnClick(int position, String title) { @@ -79,8 +90,8 @@ TipDialog("璇峰厛閫夋嫨浣忓畢杩涜娴嬭瘯,鍚﹀垯鏃犳硶杩涜閫嗗彉鍣ㄦ寚浠ゆ祴璇�.", null); return; } - GatewayBean gatewayBean = HdlDeviceLogic.getInstance().getCurrentHomeMainGateway(); - if (gatewayBean == null && !title.equals("鎼滅储閫嗗彉鍣ㄥ垪琛�")) { + GatewayBean gatewayBean = HdlDeviceLogic.getInstance().getCurrentHomeMainGateway(UserConfigManage.getInstance().getHomeId()); + if (gatewayBean == null && !title.equals("鎼滅储閫嗗彉鍣ㄥ垪琛�(0)") && !title.equals("鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)")) { // TODO: 10/30/23 鎵句笉鍒颁綇瀹呯殑涓婚�嗗彉鍣�,璇峰厛纭鏄惁缁戝畾閫嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�; TipDialog("鎵句笉鍒颁綇瀹呯殑銆愪富閫嗗彉鍣ㄣ��,璇峰厛纭鏄惁缁戝畾杩囬�嗗彉鍣紝鍐嶈繘琛岄�嗗彉鍣ㄦ寚浠ゆ祴璇�.", null); return; @@ -100,6 +111,8 @@ } else if (id == viewBinding.topLogBtn.getId()) { startActivity(TestLogActivity.class); + } else if (id == viewBinding.clickCommandTv.getId()) { + } } @@ -110,10 +123,13 @@ */ private List<String> getTitleList() { List<String> s = new ArrayList<>(); - s.add("鎼滅储閫嗗彉鍣ㄥ垪琛�"); - s.add("鑾峰彇閫嗗彉鍣╫id鍒楄〃"); - s.add("璇诲彇閫嗗彉鍣ㄨ鎯�"); - s.add("娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d"); + s.add("鎼滅储閫嗗彉鍣ㄥ垪琛�(0)"); + s.add("鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)"); + s.add("鑾峰彇閫嗗彉鍣╫id鍒楄〃(2)"); + s.add("璇诲彇閫嗗彉鍣ㄨ鎯�(3)"); + s.add("娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d(4)"); + s.add("涓婁紶oid鍒楄〃缁欎簯绔�(5)"); + s.add("鑾峰彇閫嗗彉鍣ㄤ笅鎸傝澶囧垪琛�(6)"); return s; } @@ -125,8 +141,28 @@ private void startRequest(int position, GatewayBean gatewayBean) { String title = getTitleList().get(position); switch (title) { - case "鎼滅储閫嗗彉鍣ㄥ垪琛�": { - HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() { + case "鎼滅储閫嗗彉鍣ㄥ垪琛�(0)": { + HdlDeviceLogic.getInstance().searchAllGateway(new GatewayCallBack() { + @Override + public void onSuccess(List<GatewayBean> gatewayBeanList) { + List<GatewayBean> newGatewayBeanList = new ArrayList<>(); + for (int i = 0; i < gatewayBeanList.size(); i++) { + if (HdlDeviceLogic.getInstance().isGatewaySpk(gatewayBeanList.get(i).getGatewayType())) { + newGatewayBeanList.add(gatewayBeanList.get(i)); + } + } + gsonConvertJsonStr(newGatewayBeanList); + } + + @Override + public void onError(HDLLinkException e) { + setError(e.getMsg(), e.getCode()); + } + }); + } + break; + case "鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)": { + HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() { @Override public void onSuccess(List<GatewayBean> gatewayBeanList) { gsonConvertJsonStr(gatewayBeanList); @@ -134,28 +170,29 @@ @Override public void onError(HDLLinkException e) { - setError(e); + setError(e.getMsg(), e.getCode()); } }); } break; - case "鑾峰彇閫嗗彉鍣╫id鍒楄〃": { + case "鑾峰彇閫嗗彉鍣╫id鍒楄〃(2)": { HdlDeviceLogic.getInstance().getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() { @Override public void onSuccess(List<OidBean> obj) { + mOidList = obj; gsonConvertJsonStr(obj); } @Override public void onError(HDLLinkException e) { - setError(e); + setError(e.getMsg(), e.getCode()); } }); } break; - case "璇诲彇閫嗗彉鍣ㄨ鎯�": { + case "璇诲彇閫嗗彉鍣ㄨ鎯�(3)": { HdlDeviceLogic.getInstance().getGatewayInfo(gatewayBean.getDevice_mac(), new LinkCallBack<GatewayBean>() { @Override public void onSuccess(GatewayBean obj) { @@ -164,12 +201,12 @@ @Override public void onError(HDLLinkException e) { - setError(e); + setError(e.getMsg(), e.getCode()); } }); } break; - case "娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d": { + case "娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d(4)": { TipDialog("涓�鏃︽竻闄ゆ帀閫嗗彉鍣ㄤ綇瀹卛d,閫嗗彉鍣ㄩ渶瑕侀噸鏂扮粦瀹氫綇瀹咃紝鍚﹀垯鏃犳硶娴嬭瘯閫嗗彉鍣ㄦ寚浠�;", new Listener() { @Override public void Confirmation() { @@ -181,19 +218,62 @@ @Override public void onError(HDLLinkException e) { - setError(e); + setError(e.getMsg(), e.getCode()); } }); } }); } break; + case "涓婁紶oid鍒楄〃缁欎簯绔�(5)": { + if (this.mOidList == null || this.mOidList.size() == 0) { + hideLoading(); + HdlThreadLogic.toast(this, "娌℃湁oid鍒楄〃鏁版嵁锛岃鍏堣幏鍙栭�嗗彉鍣╫id鍒楄〃鏁版嵁锛屽啀閲嶆柊涓婁紶."); + return; + } + HdlDeviceLogic.getInstance().fullUpdateOid(UserConfigManage.getInstance().getHomeId(), this.mOidList, new CloudCallBeak<Boolean>() { + @Override + public void onSuccess(Boolean obj) { + gsonConvertJsonStr(obj); + } + + @Override + public void onFailure(HDLException e) { + setError(e.getMsg(), e.getCode()); + } + }); + } + break; + case "鑾峰彇閫嗗彉鍣ㄤ笅鎸傝澶囧垪琛�(6)": { + HdlDeviceLogic.getInstance().getInverterDeviceChildDeviceList(UserConfigManage.getInstance().getHomeId(), gatewayBean.getOid(), new CloudCallBeak<List<CloudInverterChildDeviceBean>>() { + @Override + public void onSuccess(List<CloudInverterChildDeviceBean> obj) { + gsonConvertJsonStr(obj); + } + + @Override + public void onFailure(HDLException e) { + setError(e.getMsg(), e.getCode()); + } + }); + } + break; + default: { + HdlThreadLogic.runMainThread(new Runnable() { + @Override + public void run() { + hideLoading(); + } + }, this, ShowErrorMode.YES); + break; + } + } } - private void setError(HDLLinkException hdlLinkException) { - String error = hdlLinkException.getMsg() + "(" + hdlLinkException.getCode() + ")"; + private void setError(String msg, int code) { + String error = msg + "(" + code + ")"; showText(error); } -- Gitblit v1.8.0