From 82a773d1783549caca563831aac8affc059deedf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 10:56:13 +0800
Subject: [PATCH] 合并了全部的代码，IOS 图片需要从新引入工程
---
ZigbeeApp/Shared/R.cs | 96 +++++++++++++++++++++++++++++++++---------------
1 files changed, 66 insertions(+), 30 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index e922717..477029d 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -288,6 +288,17 @@
public readonly static int ModifyTempPasswordTip2 = 201;
public readonly static int FirstFloor = 202;
public readonly static int GwResponseOvertime = 203;
+ public readonly static int CloudServerResponseOvertime = 204;
+ public readonly static int SureToFreezeAccount = 205;
+ public readonly static int FreezeFailed = 206;
+ public readonly static int UnFreezeFailed = 207;
+ public readonly static int DoorLockShare = 208;
+ public readonly static int EntryCurrentUnlockMethod = 209;
+ public readonly static int SureGiveAccessToSubaccount = 210;
+ public readonly static int GiveAccessToSubaccountSuccess = 211;
+ public readonly static int GiveAccessToSubaccountFailed = 212;
+ public readonly static int AccountIsFreezed = 213;
+ public readonly static int NoAccess = 214;
public readonly static int RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -556,11 +567,15 @@
public readonly static int selecfoolr = 5368;
- #region 鐧诲綍娉ㄥ唽
- /// <summary>
- /// HDL Home
- /// </summary>
- public const int AppName = 10000;
+ #region 鐧诲綍娉ㄥ唽
+ /// <summary>
+ /// HDL Home
+ /// </summary>
+ public const int AppName = 10000;
+ /// <summary>
+ /// 甯哥敤
+ /// </summary>
+ public const int Favorite = 10001;
/// <summary>
@@ -1068,10 +1083,7 @@
- /// <summary>
- /// 鍠滅埍
- /// </summary>
- public static readonly int Favorite = 100000;
+
public static readonly int OK = 10005;
@@ -1667,10 +1679,6 @@
/// </summary>
public const int uCurtainMotor = 15079;
/// <summary>
- /// 瀹夐槻鍔熻兘
- /// </summary>
- public const int uSecurityFunction = 15084;
- /// <summary>
/// 璁惧绫诲瀷
/// </summary>
public const int uDeviceType = 15085;
@@ -2055,9 +2063,9 @@
/// </summary>
public const int uSharedDevice = 15083;
/// <summary>
- /// 鍏变韩鎴块棿
+ /// 鏈垎閰�
/// </summary>
- public const int uSharedRoom = 15084;
+ public const int uUnallocated = 15084;
/// <summary>
/// 閰嶇疆鍏变韩璁惧
/// </summary>
@@ -3203,9 +3211,9 @@
/// </summary>
public const int uGatewayType = 15520;
/// <summary>
- /// 璁惧纭欢鐗堟湰
+ /// 纭欢鐗堟湰
/// </summary>
- public const int uDeviceHardwareVersion = 15521;
+ public const int uHardwareVersion = 15521;
/// <summary>
/// 缃戝叧鍥轰欢鐗堟湰
/// </summary>
@@ -3231,9 +3239,9 @@
/// </summary>
public const int uDeviceImageId = 15527;
/// <summary>
- /// 缃戝叧闀滃儚ID
+ /// 闀滃儚ID
/// </summary>
- public const int uGatewayImageId = 15528;
+ public const int uImageId = 15528;
/// <summary>
/// 铏氭嫙椹卞姩闀滃儚ID
/// </summary>
@@ -3305,7 +3313,7 @@
/// <summary>
/// 鍥轰欢鏃ユ湡
/// </summary>
- public const int uGatewayHardwareDate = 15548;
+ public const int uHardwareDate = 15548;
/// <summary>
/// 娌℃湁鍙戠幇鏂扮綉鍏�,璇锋鏌ョ綉鍏抽摼鎺ユ槸鍚︽甯�
/// </summary>
@@ -3523,17 +3531,9 @@
/// </summary>
public const int uPleaseSelectNetwork = 15614;
/// <summary>
- /// 鍚� 绉�
+ /// 璇疯緭鍏iFi瀵嗙爜
/// </summary>
- public const int uNameHadSpace = 15615;
- /// <summary>
- /// 瀵� 鐮�
- /// </summary>
- public const int uPasswordHadSpace = 15616;
- /// <summary>
- /// 璇疯緭鍏ョ綉缁滃瘑鐮�
- /// </summary>
- public const int uPleaseInputNetworkPassword = 15617;
+ public const int uPleaseInputWifiPassword = 15617;
/// <summary>
/// 瀵嗙爜閿欒锛岃閲嶆柊杈撳叆
/// </summary>
@@ -4650,6 +4650,42 @@
/// 鑳佽揩瀵嗙爜璁剧疆鎴愬姛
/// </summary>
public const int uSetCoercePasswordSuccess = 15897;
+ /// <summary>
+ /// 鑾峰彇绌鸿皟妯″紡澶辫触
+ /// </summary>
+ public const int uGetAcModeFail = 15898;
+ /// <summary>
+ /// 璁剧疆绌鸿皟妯″紡澶辫触
+ /// </summary>
+ public const int uSetAcModeFail = 15899;
+ /// <summary>
+ /// 缁х画娣诲姞缃戝叧
+ /// </summary>
+ public const int uContinuteToAddGateway = 15900;
+ /// <summary>
+ /// 杩斿洖涓婚〉
+ /// </summary>
+ public const int uGobackToHomePage = 15901;
+ /// <summary>
+ /// 娣诲姞鏅鸿兘缃戝叧鎴愬姛
+ /// </summary>
+ public const int uAddgatewaySuccess = 15902;
+ /// <summary>
+ /// UDP妯″紡(鎺ㄨ崘)
+ /// </summary>
+ public const int uUdpModeRecommend = 15903;
+ /// <summary>
+ /// AP妯″紡
+ /// </summary>
+ public const int uApMode = 15904;
+ /// <summary>
+ /// 璺宠浆鍒扮Щ鍔ㄨ澶�
+ /// </summary>
+ public const int uJumpToMobileDevice= 15905;
+ /// <summary>
+ /// WLAN璁剧疆杩炴帴瀹跺涵WiFi
+ /// </summary>
+ public const int uWlanConnectHomeWifi = 15906;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0