~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -51,6 +51,7 @@
			import com.hdl.photovoltaic.ui.bean.HouseIdBean;
			import com.hdl.photovoltaic.ui.bean.LinkBean;
			import com.hdl.photovoltaic.ui.bean.MemberBean;
			import com.hdl.photovoltaic.ui.bean.NotRunBean;
			import com.hdl.photovoltaic.ui.bean.OidBean;
			import com.hdl.photovoltaic.ui.bean.StaffBean;
			import com.hdl.photovoltaic.ui.bean.UnCountBean;
			@@ -159,11 +160,13 @@
			break;
			//用户本地缓存信息
			case HDLUniMP.UNI_EVENT_REPLY_USER_LOCAL_INFO: {
			HdlLogLogic.print("本地头像路径---->>>" + UserConfigManage.getInstance().getUserImageUrl());
			JsonObject jsonObject = new JsonObject();
			jsonObject.addProperty("user_name", UserConfigManage.getInstance().getUserName());
			jsonObject.addProperty("user_image_url", UserConfigManage.getInstance().getUserImageUrl());
			jsonObject.addProperty("user_account", UserConfigManage.getInstance().getAccount());
			uniSuccessCallback(mode_type, jsonObject, callback);

			}
			break;
			}
			@@ -348,6 +351,16 @@
			break;
			//设备名称修改(修改是云端oid名称，设备使用modbus协议修改)
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_EDIT_NAME: {
			this.uniOidEditName(mode_type, data, callback);
			}
			break;
			//获取未运行逆变器列表
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_NOT_RUN_DEVICE_LIST: {
			this.uniGetListNotRun(mode_type, data, callback);
			}
			break;
			//快捷开启逆变器
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OPEN_DEVICE_LIST: {
			this.uniOidEditName(mode_type, data, callback);
			}
			break;
			@@ -1757,21 +1770,29 @@
			if (cUserInfo == null) {
			return;
			}
			UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
			UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
			UserConfigManage.getInstance().Save();

			//获取用户头像路径
			if (cUserInfo.getMemberHeadIcon().contains("http")) {
			UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
			//更新用户头像
			uniSuccessCallback(type, cUserInfo, callback);
			UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
			UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
			UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
			UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
			UserConfigManage.getInstance().Save();
			HdlLogLogic.print("头像路径---->>>" + cUserInfo.getMemberHeadIcon());
			} else {
			HdlAccountLogic.getInstance().getImageKey_C(cUserInfo.getMemberHeadIcon(), new CloudCallBeak<String>() {
			@Override
			public void onSuccess(String url) {
			cUserInfo.setMemberHeadIcon(url);
			UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
			uniSuccessCallback(type, cUserInfo, callback);
			UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
			UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
			UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
			UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
			UserConfigManage.getInstance().Save();
			HdlLogLogic.print("头像路径---->>>" + cUserInfo.getMemberHeadIcon());
			}

			@Override
			@@ -2030,6 +2051,22 @@

			@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);
			}
			});
			}
			uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
			}
			});
			@@ -2082,7 +2119,25 @@

			@Override
			public void onFailure(HDLException e) {
			uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
			if (e.getCode() == 121005) {
			//设备不存在（121005）状态码
			//初始化逆变器设备
			HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			//移除本地缓存
			HdlDeviceLogic.getInstance().removeLocalCacheMemoryGatewayToDeviceId(homeId, deviceId);
			uniSuccessCallback(type, null, callback);
			}

			@Override
			public void onError(HDLLinkException e) {
			uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
			}
			});
			} else {
			uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
			}
			}
			});
			}
			@@ -2122,19 +2177,14 @@
			HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
			@Override
			public void onSuccess(List<GatewayBean> list) {
			if (list == null \|\| list.size() == 0) {
			if (callback != null) {
			uniSuccessCallback(type, list, callback);
			}
			return;
			}
			if (callback != null) {
			uniSuccessCallback(type, list, callback);
			}
			//EventBus事件分发,进入住宅开始订阅主题
			BaseEventBus baseEventBus = new BaseEventBus();
			baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
			baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
			baseEventBus.setData(list);
			baseEventBus.setData(homeId);
			EventBus.getDefault().post(baseEventBus);
			//进来住宅详情都要上传一次oid列表到云端;
			HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, list, false, null);
			@@ -2302,7 +2352,7 @@
			/**
			* 初始化逆变器
			*
			* @param type 账号
			* @param type 类型
			* @param data uni请求数据
			* @param callback uni回调
			*/
			@@ -2324,7 +2374,7 @@
			/**
			* 初始化逆变器
			*
			* @param type 账号
			* @param type 类型
			* @param data uni请求数据
			* @param callback uni回调
			*/
			@@ -2371,7 +2421,7 @@
			/**
			* 修改设备名称逆变器BMS电池包
			*
			* @param type 账号
			* @param type 类型
			* @param data uni请求数据
			* @param callback uni回调
			*/
			@@ -2393,6 +2443,51 @@
			});
			}

			/**
			* 获取未运行逆变器列表
			*
			* @param type 类型
			* @param data uni请求数据
			* @param callback uni回调
			*/
			public void uniGetListNotRun(String type, Object data, DCUniMPJSCallback callback) {
			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().getListNotRun(homeId, new CloudCallBeak<List<NotRunBean>>() {
			@Override
			public void onSuccess(List<NotRunBean> obj) {
			uniSuccessCallback(type, obj, callback);
			}

			@Override
			public void onFailure(HDLException e) {
			uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
			}
			});
			}

			/**
			* 逆变器开机
			*
			* @param type 类型
			* @param data uni请求数据
			* @param callback uni回调
			*/
			public void uniSetDeviceStartup(String type, Object data, DCUniMPJSCallback callback) {
			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			String aryJson = getKeyValue("deviceIds", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().setDeviceStartup(homeId, aryJson, new CloudCallBeak<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			uniSuccessCallback(type, obj, callback);
			}

			@Override
			public void onFailure(HDLException e) {
			uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
			}
			});
			}


			/**
			* 发送modbus协议数据