app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -403,12 +403,26 @@ cloudCallBeak.onSuccess(true); //临时的逻辑，上传oid列表到云端 List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId); uploadOidDataToCloud(UserConfigManage.getInstance().getHomeId(), list, true, null); uploadOidDataToCloud(homeId, list, true, null); } } @Override public void onFailure(HDLException e) { //添加逆变器失败后初始化逆变器 HdlLogLogic.print("添加逆变器失败后开始初始化逆变器-->", true); HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() { @Override public void onSuccess(Boolean obj) { HdlLogLogic.print("初始化逆变器成功-->mac:" + mac, true); } @Override public void onError(HDLLinkException e) { HdlLogLogic.print("初始化逆变器失败-->mac:" + mac, true); } }); if (cloudCallBeak != null) { cloudCallBeak.onFailure(e); } @@ -453,9 +467,27 @@ @Override public void onFailure(HDLException e) { //添加逆变器失败后初始化逆变器 HdlLogLogic.print("添加逆变器失败后开始初始化逆变器-->", true); for (int i = 0; i < list.size(); i++) { GatewayBean gatewayBean = list.get(i); HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() { @Override public void onSuccess(Boolean obj) { HdlLogLogic.print("初始化逆变器成功-->mac:" + gatewayBean.getDevice_mac(), true); } @Override public void onError(HDLLinkException e) { HdlLogLogic.print("初始化逆变器失败-->mac:" + gatewayBean.getDevice_mac(), true); } }); } if (cloudCallBeak != null) { cloudCallBeak.onFailure(e); } } }); } @@ -967,7 +999,7 @@ * @param cloudCallBeak 返回逆变器列表 */ public void getCurrentHomeLocalAndCloudGatewayList(String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) { HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() { HdlDeviceLogic.getInstance().searchCurrentHomeGateway(homeId,new GatewayCallBack() { @Override public void onSuccess(List<GatewayBean> gatewayBeanList) { //局域网有2种情况(1:有局域网，有外网；2:有局域网，没有外网); @@ -1169,10 +1201,10 @@ * * @param gatewayCallBack - */ public void searchCurrentHomeGateway(GatewayCallBack gatewayCallBack) { public void searchCurrentHomeGateway(String homeId,GatewayCallBack gatewayCallBack) { List<String> spks = this.getGatewaySpk(); //网关搜索 HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack); HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(homeId, spks, true, gatewayCallBack); } /** @@ -1193,8 +1225,8 @@ * @param deviceMac 设备mac， * @param callBeak 返回 true=本地连接;false=远程; */ public void isLocalConnect(String deviceMac, CloudCallBeak<Boolean> callBeak) { searchCurrentHomeGateway(new GatewayCallBack() { public void isLocalConnect(String homeId,String deviceMac, CloudCallBeak<Boolean> callBeak) { searchCurrentHomeGateway(homeId,new GatewayCallBack() { @Override public void onSuccess(List<GatewayBean> gatewayBeanList) { if (gatewayBeanList == null || gatewayBeanList.size() == 0) { app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -887,7 +887,7 @@ //重新创建住宅文件夹 HdlFileLogic.getInstance().createDirectory(); //进去住宅详情搜索一下逆变器列表,目的是建立通讯通道; HdlDeviceLogic.getInstance().searchCurrentHomeGateway(null); HdlDeviceLogic.getInstance().searchCurrentHomeGateway(houseIdBean.getHomeId(),null); }
@@ -802,7 +802,7 @@ String module = "FW#" + imageId;//模块信息(HW：硬件) //升级本地优先->云端升级 HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() { HdlDeviceLogic.getInstance().isLocalConnect(homeId,deviceMac, new CloudCallBeak<Boolean>() { @Override public void onSuccess(Boolean b) { if (b) { @@ -1054,7 +1054,7 @@ String imageId = getKeyValue("imageId", getKeyValue("data", data));//固件镜像id String module = driverCode + "#" + imageId; //升级本地优先->云端升级 HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() { HdlDeviceLogic.getInstance().isLocalConnect(homeId,deviceMac, new CloudCallBeak<Boolean>() { @Override public void onSuccess(Boolean b) { if (b) { @@ -1499,7 +1499,7 @@ // com.alibaba.fastjson.JSONArray jsonArray = JSON.parseArray(data); try { String devices = getKeyValue("devices", getKeyValue("data", data)); String homeId = UserConfigManage.getInstance().getHomeId(); //uni创建电站成功之后通知给Android的 String homeId = getKeyValue("homeId", getKeyValue("data", data)); Gson gson = new Gson(); Type typeOfT = new TypeToken<List<GatewayBean>>() { }.getType(); app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -118,13 +118,13 @@ viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE); } String acc = "13375012441"; // String acc = "18316672920"; // String acc = "nuy13368@uzxia.com"; String pws = "123456"; //测试用 viewBinding.homeLoginAccountEt.setText(acc); viewBinding.homeLoginPasswordEt.setText(pws); // String acc = "13375012441"; //// String acc = "18316672920"; //// String acc = "nuy13368@uzxia.com"; // String pws = "123456"; // //测试用 // viewBinding.homeLoginAccountEt.setText(acc); // viewBinding.homeLoginPasswordEt.setText(pws); isLoginTextViewEnabled(); }
@@ -110,6 +110,8 @@ HdlThreadLogic.toast(_mActivity, R.string.search_content_null); return; } viewBinding.messageSearchEt.clearFocus(); hideSoftInputFromWindow(); viewBinding.historyListParent.setVisibility(View.GONE); viewBinding.listParent.setVisibility(View.VISIBLE); addSearchTextToList(); @@ -167,6 +169,8 @@ viewBinding.messageDelIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { viewBinding.messageSearchEt.clearFocus(); hideSoftInputFromWindow(); searchHistoryTitleList = new ArrayList<>(); searchHistoryAdapter.setList(searchHistoryTitleList); viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE); @@ -184,6 +188,8 @@ HdlThreadLogic.toast(_mActivity, R.string.search_content_null); return; } viewBinding.messageSearchEt.clearFocus(); hideSoftInputFromWindow(); viewBinding.historyListParent.setVisibility(View.GONE); viewBinding.listParent.setVisibility(View.VISIBLE); addSearchTextToList(); @@ -245,7 +251,7 @@ @Override public void onKeyboardShow(int h) { //Toast.makeText(MainActivity.this,"键盘弹出",Toast.LENGTH_SHORT).show(); viewBinding.messageSearchEt.requestFocus(); // viewBinding.messageSearchEt.requestFocus(); }
@@ -119,6 +119,8 @@ HdlThreadLogic.toast(_mActivity, R.string.search_content_null); return; } viewBinding.powerStationSearchEt.clearFocus(); hideSoftInputFromWindow(); viewBinding.historyListParent.setVisibility(View.GONE); viewBinding.listParent.setVisibility(View.VISIBLE); addSearchTextToList(); @@ -176,6 +178,8 @@ viewBinding.powerStationDelIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { viewBinding.powerStationSearchEt.clearFocus(); hideSoftInputFromWindow(); searchHistoryTitleList = new ArrayList<>(); searchHistoryAdapter.setList(searchHistoryTitleList); viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE); @@ -194,6 +198,8 @@ HdlThreadLogic.toast(_mActivity, R.string.search_content_null); return; } viewBinding.powerStationSearchEt.clearFocus(); hideSoftInputFromWindow(); viewBinding.historyListParent.setVisibility(View.GONE); viewBinding.listParent.setVisibility(View.VISIBLE); addSearchTextToList(); @@ -259,7 +265,7 @@ @Override public void onKeyboardShow(int h) { //Toast.makeText(MainActivity.this,"键盘弹出",Toast.LENGTH_SHORT).show(); viewBinding.powerStationSearchEt.requestFocus(); // viewBinding.powerStationSearchEt.requestFocus(); }
@@ -115,6 +115,8 @@ } viewBinding.historyListParent.setVisibility(View.GONE); viewBinding.listParent.setVisibility(View.VISIBLE); viewBinding.powerStationSearchEt.clearFocus(); hideSoftInputFromWindow(); addSearchTextToList(); loadNextPageHouseList(true, 1, true); } @@ -171,10 +173,13 @@ viewBinding.powerStationDelIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { viewBinding.powerStationSearchEt.clearFocus(); hideSoftInputFromWindow(); searchHistoryTitleList = new ArrayList<>(); searchHistoryAdapter.setList(searchHistoryTitleList); viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE); HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath()); } }); //历史记录点击事件 @@ -188,10 +193,13 @@ HdlThreadLogic.toast(_mActivity, R.string.search_content_null); return; } viewBinding.powerStationSearchEt.clearFocus(); hideSoftInputFromWindow(); viewBinding.historyListParent.setVisibility(View.GONE); viewBinding.listParent.setVisibility(View.VISIBLE); addSearchTextToList(); loadNextPageHouseList(true, 1, true); } }); //电站点击是事件 @@ -250,7 +258,7 @@ @Override public void onKeyboardShow(int h) { //Toast.makeText(MainActivity.this,"键盘弹出",Toast.LENGTH_SHORT).show(); viewBinding.powerStationSearchEt.requestFocus(); // viewBinding.powerStationSearchEt.requestFocus(); }
