~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -1,5 +1,6 @@
			package com.hdl.photovoltaic.other;

			import android.os.SystemClock;
			import android.text.TextUtils;

			import com.facebook.imagepipeline.image.OriginalEncodedImageInfo;
			@@ -102,7 +103,6 @@
			List<OidBean> oidList = new ArrayList<>();
			AtomicInteger atomicInteger = new AtomicInteger(0);
			for (int i = 0; i < list.size(); i++) {
			atomicInteger.set(atomicInteger.get() + 1);
			GatewayBean gatewayBean = list.get(i);
			if (gatewayBean == null \|\| TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
			continue;
			@@ -110,11 +110,28 @@
			getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() {
			@Override
			public void onSuccess(List<OidBean> oidBeanList) {
			atomicInteger.set(atomicInteger.get() + 1);
			if (oidBeanList == null) {
			return;
			}
			oidList.addAll(oidBeanList);
			if (atomicInteger.get() == list.size()) {
			if (oidList.size() == 0) {
			return;
			}
			// //增量添加oid
			// updateOidAdd(homeId, oidList, new CloudCallBeak<Boolean>() {
			// @Override
			// public void onSuccess(Boolean obj) {
			// HdlLogLogic.print("上传oid列表到云端成功--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac(), true);
			// }
			//
			// @Override
			// public void onFailure(HDLException e) {
			// HdlLogLogic.print("上传oid列表到云端失败--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
			// }
			// });

			//全部获取后再上传
			fullUpdateOid(homeId, oidList, new CloudCallBeak<Boolean>() {
			@Override
			@@ -132,9 +149,26 @@

			@Override
			public void onError(HDLLinkException e) {
			HdlLogLogic.print("获取逆变器oid列表失败--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
			atomicInteger.set(atomicInteger.get() + 1);
			if (oidList.size() == 0) {
			HdlLogLogic.print("获取逆变器oid列表失败--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
			return;
			}
			//增量添加oid
			updateOidAdd(homeId, oidList, new CloudCallBeak<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			HdlLogLogic.print("上传oid列表到云端成功--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac(), true);
			}

			@Override
			public void onFailure(HDLException e) {
			HdlLogLogic.print("上传oid列表到云端失败--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
			}
			});
			}
			});
			SystemClock.sleep(200);
			}


			@@ -212,8 +246,8 @@
			public void onSuccess(String str) {
			if (cloudCallBeak != null) {
			cloudCallBeak.onSuccess(true);
			//临时的逻辑，上传oid列表到云端
			uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), list, null);
			//临时的逻辑，上传oid列表到云端（去掉，原因是我上传成功后，网关再次全量上传oid列表，会把之前oid列表覆盖掉）
			uploadDataToCloud(homeId, list, null);
			}
			}

			@@ -568,7 +602,7 @@
			public void editGatewayParam(String mac, LinkCallBack<Boolean> linkCallBack) {
			String requestUrl = TopicApi.SET_GATEWAY_EDIT;
			JsonObject json = new JsonObject();
			json.addProperty("master", GatewayMasterType.MasterFalse);
			json.addProperty("master", GatewayMasterType.MasterTrue);
			TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
			@Override
			public void onSuccess(String msg) {
			@@ -628,17 +662,16 @@
			*/
			public void initializeGateway(String mac, LinkCallBack<Boolean> linkCallBack) {
			String requestUrl = TopicApi.GATEWAY_INITIALIZE_REMOTE;
			JsonObject sendJsonObj = new JsonObject();
			JsonObject jObject = new JsonObject();
			jObject.addProperty("device_mac", mac);
			jObject.addProperty("reset_factory", "true");//为false或无此字段，则为"清除数据"
			sendJsonObj.add("objects", jObject);
			TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, sendJsonObj, "", new HDLLinkCallBack() {
			TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, jObject, "", new HDLLinkCallBack() {
			@Override
			public void onSuccess(String json) {
			if (linkCallBack != null) {
			linkCallBack.onSuccess(true);
			}
			HdlLogLogic.print("初始化逆变器成功-->mac:" + mac, true);
			}

			@Override
			@@ -646,6 +679,7 @@
			if (linkCallBack != null) {
			linkCallBack.onError(e);
			}
			HdlLogLogic.print("初始化逆变器失败-->mac:" + mac + "--->" + e.getMsg() + "(" + e.getCode() + ")", true);
			}
			});

			@@ -763,15 +797,11 @@
			if (atomicInteger.get() == list.size()) {
			//收集删除逆变器sid
			List<String> removeSidList = new ArrayList<>();
			for (int i = 0; i < list.size(); i++) {
			CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
			for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
			GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
			if (!cloudInverterDeviceBean.getSid().equals(gatewayBean.getSid())) {
			//本地有，云端没有,删除本地；
			removeSidList.add(gatewayBean.getSid());
			}

			for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
			GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
			if (!querySidInverter(list, gatewayBean.getSid())) {
			//本地有，云端没有,删除本地；
			removeSidList.add(gatewayBean.getSid());
			}
			}
			for (int i = 0; i < removeSidList.size(); i++) {
			@@ -791,15 +821,11 @@
			if (atomicInteger.get() == list.size()) {
			//收集删除逆变器sid
			List<String> removeSidList = new ArrayList<>();
			for (int i = 0; i < list.size(); i++) {
			CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
			for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
			GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
			if (!cloudInverterDeviceBean.getSid().equals(gatewayBean.getSid())) {
			//本地有，云端没有,删除本地；
			removeSidList.add(gatewayBean.getSid());
			}

			for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
			GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
			if (!querySidInverter(list, gatewayBean.getSid())) {
			//本地有，云端没有,删除本地；
			removeSidList.add(gatewayBean.getSid());
			}
			}
			for (int i = 0; i < removeSidList.size(); i++) {
			@@ -892,6 +918,22 @@
			});
			}
			});
			}

			/**
			* 通过sid查询逆变器
			*
			* @param list 云端上逆变器列表
			* @return 存在为true, 否则为false
			*/
			private boolean querySidInverter(List<CloudInverterDeviceBean> list, String sid) {
			for (int i = 0; i < list.size(); i++) {
			CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
			if (sid.equals(cloudInverterDeviceBean.getSid())) {
			return true;
			}
			}
			return false;
			}

			/**
			@@ -1139,7 +1181,9 @@
			gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//子网号/设备号,逆变器地址
			gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//发电功率
			gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//今日发电量
			gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//设备型号
			if (!TextUtils.isEmpty(cloudInverterDeviceBean.getOmodel())) {
			gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//设备型号
			}
			gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//设备spk