首次合并了全部的代码

黄学彪

2019-10-15 2bf5ec775cb57d8015bee58c745a1e48081ff1b1

 ZigbeeApp/Shared/R.cs

@@ -255,6 +255,20 @@
        public readonly static int DelLocalBindListThenAddAgain2 = 170;
        public readonly static int DelLocalBindListThenAddAgain3 = 171;
        //面板绑定以上
        public readonly static int IcCard = 172;
        public readonly static int Password = 173;
        public readonly static int Fingerprint = 174;
        public readonly static int ModigfyFailed = 175;
        public readonly static int OnlyBeDeletedOnTheDevice = 176;
        public readonly static int Undistributed = 177;
        public readonly static int AfterThirtySeconds = 178;
        //门锁验证密码失败
        public readonly static int OperrateFailed = 179;
        public readonly static int RemoteUnlockBindSucessTip1 = 180;
        public readonly static int RemoteUnlockBindSucessTip2 = 181;
        public readonly static int CLose = 182;
        public readonly static int Opening = 183;
        public readonly static int DoorLockOpen = 184;

        public readonly static int RemindSetting = 548;
        public readonly static int AddNewUser = 650;
@@ -487,6 +501,32 @@
        public readonly static int button3 = 5302;
        public readonly static int button4 = 5303;
        public readonly static int doyouwanttodelete = 5304;
        public readonly static int onoff = 5305;
        public readonly static int unattendedtime = 5306;
        public readonly static int unattendedtime1 = 5307;
        public readonly static int closetimeout = 5308;
        public readonly static int closetime = 5309;
        public readonly static int weekly = 5340;
        public readonly static int selectweek = 5341;
        public readonly static int doorLock = 5342;
        public readonly static int userlist = 5343;
        public readonly static int lockpassword = 5344;
        public readonly static int fingerprint = 5345;
        public readonly static int ic = 5346;
        public readonly static int Airswitch = 5347;
        public readonly static int createtimetext = 5348;
        public readonly static int adddelay = 5349;
        public readonly static int logiccool = 5350;
        public readonly static int logicheat = 5351;
        public readonly static int logicauto = 5352;
        public readonly static int logicdry = 5353;
        public readonly static int logicfanonly = 5354;
        public readonly static int logiclow = 5355;
        public readonly static int logicmedium = 5356;
        public readonly static int logichigh = 5357;
        public readonly static int logictemplate = 5358;
        public readonly static int onlight = 5359;
        public readonly static int offlight = 5360;



@@ -788,16 +828,27 @@
        /// <summary>
        /// 秒
        /// </summary>
        public static readonly int Second = 13114;
        public const int Second = 13114;
        /// <summary>
        /// 分钟
        /// </summary>
        public static readonly int Minute = 13115;
        public const int Minute = 13115;
        /// <summary>
        /// 小时
        /// </summary>
        public static readonly int Hour = 13116;

        public const int Hour = 13116;
        /// <summary>
        /// 未分配
        /// </summary>
        public const int Unallocated = 13117;
        /// <summary>
        /// 全选
        /// </summary>
        public const int AllSelect = 13118;
        /// <summary>
        /// 添加到
        /// </summary>
        public const int AddTo = 13119;

        #endregion

@@ -1936,7 +1987,7 @@
        /// </summary>
        public const int uGarrison = 15191;

        /// <summary>

        /// 确定要授权该账号为主账号?

        /// 确定授权「{0}」成为管理员?

        /// </summary>

        public const int uUpSubAccountLevel = 15192;
        /// <summary>

@@ -3995,7 +4046,30 @@
        /// 编辑房间

        /// </summary>

        public const int uEditorRoom = 15771;



        /// <summary>
        /// 获取中...
        /// </summary>
        public const int uGetting = 15772;

        /// <summary>

        /// 存在非法字符「{0}」

        /// </summary>

        public const int uErrorFieldIsEsixt = 15773;

        /// <summary>

        /// 不存在该账户，请重新输入

        /// </summary>

        public const int uMemberIsNotEsixtAndInputAgain = 15774;

        /// <summary>

        /// 返回

        /// </summary>

        public const int uGoBack = 15775;

        /// <summary>

        /// 还没有共享区域给成员{0}可点击右上角“+”添加

        /// </summary>

        public const int uNotShardComtentMsg = 15776;

        /// <summary>

        /// 确认删除共享房间？

        /// </summary>

        public const int uDeleteShardRoomMsg = 15777;



        //★★★★下面这些是接口的返回信息翻译,从18000开始★★★★

        /// <summary>