From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
index 8be5933..b78fa72 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
@@ -142,7 +142,7 @@
//鍗曞嚮浜嬩欢
gatewayRow.frameTable.ButtonClickEvent += (sender, e) =>
{
- if (UserCenterResourse.HideOption.GotoGatewayProductInfoForm == 1)
+ if (HdlUserCenterResourse.HideOption.GotoGatewayProductInfoForm == 1)
{
//寮哄埗璺宠浆
var form2 = new GatewayProductInfoForm();
@@ -169,7 +169,7 @@
btnSwitch.TextColor = UserCenterColor.Current.White;
btnSwitch.TextSize = 12;
btnSwitch.TextID = R.MyInternationalizationString.uSwitch1;
- if (strWayId == GatewayResourse.AppOldSelectGatewayId)
+ if (strWayId == HdlGatewayResourse.AppOldSelectGatewayId)
{
btnSwitch.TextID = R.MyInternationalizationString.uRefresh;
}
@@ -178,7 +178,7 @@
{
//鏄惁鍒囨崲鍒皗0}缃戝叧?
string msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToSwitchTheGateway), "[" + gatewayRow.btnName.Text + "]");
- if (strWayId == GatewayResourse.AppOldSelectGatewayId)
+ if (strWayId == HdlGatewayResourse.AppOldSelectGatewayId)
{
//鏄惁閲嶆柊鍒锋柊{0}缃戝叧?
msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToRefreshTheGateway), "[" + gatewayRow.btnName.Text + "]");
@@ -230,13 +230,13 @@
this.dicRowContr[strWayId] = gatewayRow;
//璁剧疆涓�涓�夋嫨缃戝叧鐨勯粯璁ゅ��
- if (string.IsNullOrEmpty(GatewayResourse.AppOldSelectGatewayId) == true)
+ if (string.IsNullOrEmpty(HdlGatewayResourse.AppOldSelectGatewayId) == true)
{
HdlGatewayLogic.Current.SaveGatewayIdToLocation(strWayId);
}
//褰撳墠缃戝叧鐨勮鏍�
- if (strWayId == GatewayResourse.AppOldSelectGatewayId)
+ if (strWayId == HdlGatewayResourse.AppOldSelectGatewayId)
{
var btnNow = new IconViewControl(52);
btnNow.Y = Application.GetMinReal(23) + gatewayRow.frameTable.chidrenYaxis;
@@ -268,7 +268,7 @@
return;
}
- if (strWayId == GatewayResourse.AppOldSelectGatewayId)
+ if (strWayId == HdlGatewayResourse.AppOldSelectGatewayId)
{
//濡傛灉瑙ｉ櫎缁戝畾鐨勭綉鍏虫槸褰撳墠鎵�閫夋嫨鐨勭綉鍏崇殑璇濓紝鍒欏叧闂澶囩鐞嗙晫闈�
this.closeDeviceManagForm = true;
@@ -302,11 +302,11 @@
HdlThreadLogic.Current.RunMain(() =>
{
- if (UserCenterResourse.DicActionForm.ContainsKey("DeviceListMainForm") == false)
+ if (HdlFormLogic.Current.IsFormOpen("DeviceListMainForm") == false)
{
//鍒锋柊涓荤敾闈�
var form = new Device.DeviceListMainForm();
- this.AddFromAndRemoveNowForm(form);
+ this.AddFormAndCloseNowForm(form);
}
else
{
@@ -460,7 +460,7 @@
public override int FormActionAgainEvent()
{
//杩涘埌杩欎釜鐣岄潰,鐞嗚涓婂墠鍥炵殑缃戝叧id鏄湁鐨�,濡傛灉涓虹┖浜�,搴旇鏄綋鍓嶇殑缃戝叧琚В缁戜簡
- if (GatewayResourse.AppOldSelectGatewayId == string.Empty)
+ if (HdlGatewayResourse.AppOldSelectGatewayId == string.Empty)
{
//鍏抽棴璁惧鍒楄〃
this.closeDeviceManagForm = true;
--
Gitblit v1.8.0