From dc0309e64f02227d8e1468b7326c07955f804612 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 22 六月 2022 11:22:18 +0800
Subject: [PATCH] 修改引用路径

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs |  746 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 505 insertions(+), 241 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 9b0f7c9..8d233fd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -11,9 +11,23 @@
     {
         #region  鏈湴鍙橀噺
         /// <summary>
+        /// 鏇存柊鈥滈�昏緫甯稿紑鈥濈晫闈㈢殑鍥炶皟
+        /// </summary>
+        public static Action<bool> LogicAction = null;
+        /// <summary>
+        /// 鏇存柊褰撳墠闂ㄩ攣娑夊強鐨勭姸鎬併�愪富瑕佺敤浜庨棬閿佹搷浣滃父寮�妯″紡鐨勫洖璋冦��
+        /// </summary>
+        public static Action<string, bool> UpdateCurrentDoorlockAction = null;
+        /// <summary>
         /// 缃戝叧锛堥棬閿侊級鎵�鍦ㄧ殑鏃堕棿
         /// </summary>
         public static DateTime DoorlockZoneTime = DateTime.Now;
+        /// <summary>
+        /// 鎵�鏈夐棬閿佷腑鐨勫父寮�妯″紡鍊糩鐢ㄤ簬鎺ㄩ�佹煡璇紝鎻愮ず闂ㄩ攣澶辨晥锛�
+        /// keys:闂ㄩ攣mac+epoint value:鏄惁甯稿紑妯″紡
+        /// ture:甯稿紑锛� false:鍏抽棴
+        /// </summary>
+        public static Dictionary<string, bool?> DoorLockNormallyMode = new Dictionary<string, bool?> { };
         /// <summary>
         /// 甯稿紑妯″紡鎵ц鏃堕棿
         /// </summary>
@@ -74,13 +88,33 @@
         /// 澶辨晥鏁堟棩鏈熲�滅鈥�
         /// </summary>
         public static int InValidDateSecond = 0;
-        #endregion
 
         /// <summary>
-        /// 鑾峰彇褰撳墠闂ㄩ攣鐨勫父寮�妯″紡
+        /// 闂ㄩ攣鎿嶄綔绫诲瀷
+        /// </summary>
+        public enum DoorLockMessType
+        {
+            /// <summary>
+            /// app鎿嶄綔
+            /// </summary>
+            AppOperate = 0,
+            /// <summary>
+            /// 閫氳繃闂ㄩ攣鎿嶄綔璁惧涓婃姤
+            /// </summary>
+            DeviceReport = 1,
+            /// <summary>
+            /// 閫氳繃鏈嶅姟鍣ㄦ帹閫�
+            /// </summary>
+            ServicePush = 2,
+        }
+        #endregion
+
+        #region 甯稿紑妯″紡 API
+        /// <summary>
+        /// 鑾峰彇褰撳墠闂ㄩ攣鐨勫父寮�妯″紡 
         /// </summary>
         /// <param name="doorLock:褰撳墠闂ㄩ攣"></param> 
-        /// <returns></returns> 
+        /// <returns>null:娌℃湁鍥炲  锛� true:闂ㄩ攣甯稿紑锛沠alse锛氶棬閿佸父鍏�</returns> 
         public static async System.Threading.Tasks.Task<bool?> GetNormallyOpenMode(ZigBee.Device.DoorLock doorLock)
         {
             bool? IsDoorLockNormallyMode = null;
@@ -108,19 +142,379 @@
         /// 闂ㄩ攣鏄惁鏀寔甯稿紑[杩欓噷鏆傛椂鍙湁S-One闂ㄩ攣鏀寔锛孒06C涓嶆敮鎸�, 鍚庢湡閫氳繃鑳藉姏鍊兼敮鎸乚
         /// </summary>
         /// <param name="doorLock:褰撳墠闂ㄩ攣"></param> 
-        /// <returns></returns> 
+        /// <returns>true:鏀寔甯稿紑锛沠alse锛� 涓嶆敮鎸佸父寮�</returns> 
         public static bool CanNormallyOpen(ZigBee.Device.DoorLock doorLock)
         {
             var listDevice = new List<CommonDevice> { };
             listDevice.Add(doorLock);
             var devTemp = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
-            if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
+            if (devTemp.ConcreteType != DeviceConcreteType.IntelligentLocks_H06C)
             {
                 return true;
             }
             return false;
         }
 
+        /// <summary>
+        /// 璁剧疆鏈湴闂ㄩ攣鐨勫父寮�妯″紡鍊�
+        /// </summary>
+        public static void NormallyOpenModeValue(ZigBee.Device.DoorLock doorLock, bool value)
+        {
+            doorLock.IsDoorLockNormallyMode = value;
+            if (DoorLockCommonInfo.DoorLockNormallyMode.ContainsKey(doorLock.DeviceAddr + doorLock.DeviceEpoint))
+            {
+                DoorLockCommonInfo.DoorLockNormallyMode[doorLock.DeviceAddr + doorLock.DeviceEpoint] = value;
+            }
+            else
+            {
+                DoorLockCommonInfo.DoorLockNormallyMode.Add(doorLock.DeviceAddr + doorLock.DeviceEpoint, value);
+            }
+        }
+
+        /// <summary>
+        /// 甯稿紑妯″紡澶辨晥澶勭悊銆愬脊绐椼��
+        /// </summary>
+        /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
+        /// <param name="doorLockMessType">瀵艰嚧闂ㄩ攣澶辨晥鐨勬搷浣滅被鍨�</param>
+        /// <param name="haveLogic">缃戝叧涓槸鍚﹀瓨鍦ㄩ�昏緫甯稿紑妯″紡</param> 
+        /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
+        /// <param name="type">1:纭甯稿紑妯″紡宸茬粡寮�鍚紱0:甯稿紑妯″紡澶辨晥鎻愮ず</param>
+        public static async void NomallyOpenModeInvalidDialog(ZigBee.Device.DoorLock doorLock, DoorLockMessType doorLockMessType, bool haveLogic, Action<bool> action = null, int type = 0)
+        {
+            //甯稿紑妯″紡鍙兘涓讳汉鎿嶄綔
+            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+            {
+                Application.RunOnMainThread(() =>
+                {
+                    string msg0 = Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate);
+                    ShowTipMsg(msg0);
+                });
+                return;
+            }
+
+            //甯稿紑妯″紡灏嗚鍙栨秷寮圭獥
+            string msg = Language.StringByID(R.MyInternationalizationString.NomallyModeIsCanceled).Replace("{0}", "\r\n");
+            var confirm = Language.StringByID(R.MyInternationalizationString.SureCancel);
+            var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.NomallyOpenMode, msg, confirm);
+
+            if (haveLogic)
+            {
+                //鏈夐�昏緫璁剧疆鐨勫脊绐�
+                alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.CancelNomallyOpenModeWithLogic, msg, confirm);
+            }
+            alert.Show();
+
+            alert.MsgControlClickEvent += async () =>
+            {
+                if (doorLockMessType == DoorLockMessType.DeviceReport || doorLockMessType == DoorLockMessType.ServicePush)
+                {
+                    //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷 
+                    DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
+                    if (LogicAction != null)
+                    {
+                        LogicAction(false);
+                    }
+                    if (haveLogic)
+                    {
+                        //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.DelAllLogic(doorLock);
+                    }
+                }
+                else
+                {
+                    //淇濇寔甯稿紑
+                    NormallyOpenModeValue(doorLock, true);
+                }
+                action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                action = null;
+            };
+
+            alert.CancelClickEvent += async () =>
+            {
+                if (doorLockMessType == DoorLockMessType.DeviceReport || doorLockMessType == DoorLockMessType.ServicePush)
+                {
+                    //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑�
+                    Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
+
+                    //app閲嶆柊寮�鍚�滃父寮�妯″紡鈥�
+                    var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
+                    if (result == null || result.defaultControlResponseData == null)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
+                            ShowTipMsg(msg0);
+                            NormallyOpenModeValue(doorLock, false);
+                            CommonPage.Loading.Hide();
+                        });
+                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                        action = null;
+                        if (LogicAction != null)
+                        {
+                            LogicAction(false);
+                        }
+                        return;
+                    }
+                    if (result.defaultControlResponseData.status != 0)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            string msg1 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeFailed);
+                            ShowTipMsg(msg1);
+                            NormallyOpenModeValue(doorLock, false);
+                            CommonPage.Loading.Hide();
+                        });
+
+                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                        action = null;
+                        if (LogicAction != null)
+                        {
+                            LogicAction(false);
+                        }
+                        return;
+                    }
+                    else
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            string msg0 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeSuccess);
+                            ShowTipMsg(msg0);
+                            NormallyOpenModeValue(doorLock, true);
+                            CommonPage.Loading.Hide();
+                            if (LogicAction != null)
+                            {
+                                LogicAction(true);
+                            }
+                        });
+                    }
+                }
+                else
+                {
+                    //app鎿嶄綔涓嶅彇娑堚�滃父寮�妯″紡鈥� 
+                    DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
+                }
+                action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                action = null;
+            };
+
+            alert.ConfirmClickEvent += async () =>
+            {
+                if (doorLockMessType == DoorLockMessType.DeviceReport || doorLockMessType == DoorLockMessType.ServicePush)
+                {
+                    NormallyOpenModeValue(doorLock, false);
+                    if (LogicAction != null)
+                    {
+                        LogicAction(false);
+                    }
+                    if (haveLogic)
+                    {
+                        //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.DelAllLogic(doorLock);
+                    }
+                }
+                else
+                {
+                    //app鎿嶄綔鍙栨秷鈥滃父寮�妯″紡鈥�
+                    Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
+                    var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
+                    if (result == null || result.defaultControlResponseData == null)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            ShowTipMsg(Language.StringByID(R.MyInternationalizationString.GwResponseOvertime));
+                            CommonPage.Loading.Hide();
+                        });
+                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                        action = null;
+                        if (LogicAction != null)
+                        {
+                            LogicAction(false);
+                        }
+                        return;
+                    }
+                    if (result.defaultControlResponseData.status != 0)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            string msg1 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeFailed);
+                            ShowTipMsg(msg1);
+                            CommonPage.Loading.Hide();
+                        });
+                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                        action = null;
+                        if (LogicAction != null)
+                        {
+                            LogicAction(false);
+                        }
+                        return;
+                    }
+                    else
+                    {
+                        //娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
+                        HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(doorLock, 9002, string.Empty);
+                        //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔� 
+                        NormallyOpenModeValue(doorLock, false);
+                        //鍒犻櫎璁剧疆甯稿紑妯″紡鍒涘缓鐨勯�昏緫
+                        if (haveLogic)
+                        {
+                            //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+                            var resTemp1 = await Shared.Phone.Device.Logic.SkipView.DelAllLogic(doorLock);
+                        }
+                        Application.RunOnMainThread(() =>
+                        {
+                            string msg2 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
+                            ShowTipMsg(msg2);
+                            CommonPage.Loading.Hide();
+                        });
+                        if (LogicAction != null)
+                        {
+                            LogicAction(false);
+                        }
+                    }
+                }
+                action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                action = null;
+            };
+        }
+
+        /// <summary>
+        /// 鍒犻櫎甯稿紑妯″紡
+        /// </summary>
+        /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
+        /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
+        /// <returns></returns>
+        public static async System.Threading.Tasks.Task<bool> DelNormallyOpenMode(ZigBee.Device.DoorLock doorLock, Action action = null)
+        {
+            //app鎿嶄綔鍙栨秷鈥滃父寮�妯″紡鈥� 
+            var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
+            if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
+            {
+                action?.Invoke();
+                return false;
+            }
+
+            if (result.defaultControlResponseData.status == 0)
+            {
+                //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔� 
+                NormallyOpenModeValue(doorLock, false);
+                action?.Invoke();
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 璁剧疆甯稿紑妯″紡
+        /// </summary>
+        /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
+        /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
+        /// <returns></returns>
+        public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
+        {
+            //app璁剧疆鈥滃父寮�妯″紡鈥濆け璐� 
+            var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
+            if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
+            {
+                return false;
+            }
+
+            if (result.defaultControlResponseData.status == 0)
+            {
+                //app璁剧疆鈥滃父寮�妯″紡鈥濇垚鍔�  
+                NormallyOpenModeValue(doorLock, false);
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 鍚姩甯稿紑妯″紡銆愬脊绐椼��
+        /// </summary>
+        /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
+        /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
+        public static async void NomallyOpenModeStartDialog(ZigBee.Device.DoorLock doorLock, Action action)
+        {
+            //甯稿紑妯″紡鍙兘涓讳汉鎿嶄綔ZigBee.Device.DoorLock doorLock
+            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+            {
+                Application.RunOnMainThread(() =>
+                {
+                    string msg0 = Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate);
+                    ShowTipMsg(msg0);
+                });
+                return;
+            }
+
+            //璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁堝浜庢墦寮�鐘舵�侊紝纭寮�鍚紵 
+            string msg = Language.StringByID(R.MyInternationalizationString.SetDoorLockNomallyOpen).Replace("{0}", "\r\n");
+            var confirm = Language.StringByID(R.MyInternationalizationString.Confrim);
+            var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, confirm);
+            alert.Show();
+
+            alert.ConfirmClickEvent += async () =>
+            {
+                NomallyOpenModeInvalidTimeDialog(doorLock, action);
+            };
+        }
+
+        /// <summary>
+        /// 甯稿紑妯″紡澶辨晥鏃堕棿澶勭悊銆愬脊绐椼��
+        /// </summary>
+        public static async void NomallyOpenModeInvalidTimeDialog(ZigBee.Device.DoorLock doorLock, Action action)
+        {
+            //澶辨晥璁剧疆 
+            string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
+            var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
+            var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
+            alertTimeInValidSetting.Show();
+
+            alertTimeInValidSetting.InvalidTimeAction += async (obj) =>
+            {
+                //甯稿紑妯″紡澶辨晥鏃堕棿璁剧疆鎴愬姛
+                var temp = int.Parse(obj);
+                DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
+
+                Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
+                var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
+                if (result == null || result.defaultControlResponseData == null)
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
+                        ShowTipMsg(msg0);
+                        CommonPage.Loading.Hide();
+                    });
+                    return;
+                }
+                if (result.defaultControlResponseData.status != 0)
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        string msg1 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeFailed);
+                        ShowTipMsg(msg1);
+                        CommonPage.Loading.Hide();
+                    });
+                    return;
+                }
+                else
+                {
+                    //娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
+                    HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(doorLock, 9001, string.Empty);
+                    DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
+                    action?.Invoke();
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Hide();
+                    });
+                }
+
+                //娓╁眳鍩庢柟娉曪紵锛燂紵
+                //姝ゅ鏄惁瑕佸垱寤哄父寮�妯″紡鐨勭壒娈婇�昏緫
+            };
+        }
+        #endregion
+
+        #region 闊抽噺
         /// <summary>
         /// 闂ㄩ攣鏄惁鏀寔闊抽噺[杩欓噷鏆傛椂鍙湁S-One闂ㄩ攣鏀寔锛孒06C涓嶆敮鎸侊紝鍚庢湡閫氳繃鑳藉姏鍊兼敮鎸乚
         /// </summary>
@@ -131,12 +525,14 @@
             var listDevice = new List<CommonDevice> { };
             listDevice.Add(doorLock);
             var devTemp = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
-            if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
+            if (devTemp.ConcreteType != DeviceConcreteType.IntelligentLocks_H06C)
             {
                 return true;
             }
             return false;
         }
+
+        #endregion
 
         #region 浠庝簯绔幏鍙栫殑鏂规硶 
         /// <summary>
@@ -211,26 +607,28 @@
                     var SubAccounListTemp = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
                     var SubAccounListDictionary = new Dictionary<string, Shared.Phone.UserCenter.MemberInfoRes> { };
 
-                    foreach (var member in SubAccounListTemp)
-                    {
-                        //鍒ゆ柇涓�涓处鎴风粦瀹氫簡閭鐨勬儏鍐�
-                        if (SubAccounListDictionary.ContainsKey(member.DistributedMark) == true
-                        || member.Account == UserCenterResourse.UserInfo.Phone
-                        || member.Account == UserCenterResourse.UserInfo.Email)
-                        {
-                            //濡傛灉鏄畠鑷繁鐨勮瘽锛屼笉鏄剧ず,璐︽埛鍜岀粦瀹氱殑閭鍙樉绀哄叾涓箣涓�
-                            continue;
+                    if (SubAccounListTemp != null)
+                    {
+                        foreach (var member in SubAccounListTemp)
+                        {
+                            //鍒ゆ柇涓�涓处鎴风粦瀹氫簡閭鐨勬儏鍐�
+                            if (SubAccounListDictionary.ContainsKey(member.DistributedMark) == true
+                            || member.Account == UserCenterResourse.UserInfo.Phone
+                            || member.Account == UserCenterResourse.UserInfo.Email)
+                            {
+                                //濡傛灉鏄畠鑷繁鐨勮瘽锛屼笉鏄剧ず,璐︽埛鍜岀粦瀹氱殑閭鍙樉绀哄叾涓箣涓�
+                                continue;
+                            }
+                            //鍘绘帀瀛愯处鎴蜂腑鏅�氭垚鍛橈紝鐣欎笅鎷ユ湁绠$悊鍛樻潈闄愮殑鎴愬憳
+                            //锛堝洜涓哄垎閰嶈处鎴风粰鏅�氭垚鍛橈紝鏅�氭垚鍛樺湪app涓笉鑳借繘鍏ヨ澶囩鐞嗛偅閲岋紝鎵�浠ユ病鍙戞煡鐪嬩富浜哄垎閰嶅璐︽埛锛�
+                            if (member.AccountType != 1)
+                            {
+                                continue;
+                            }
+
+                            SubAccounListDictionary.Add(member.DistributedMark, member);
                         }
-                        //鍘绘帀瀛愯处鎴蜂腑鏅�氭垚鍛橈紝鐣欎笅鎷ユ湁绠$悊鍛樻潈闄愮殑鎴愬憳
-                        //锛堝洜涓哄垎閰嶈处鎴风粰鏅�氭垚鍛橈紝鏅�氭垚鍛樺湪app涓笉鑳借繘鍏ヨ澶囩鐞嗛偅閲岋紝鎵�浠ユ病鍙戞煡鐪嬩富浜哄垎閰嶅璐︽埛锛�
-                        if (member.AccountType != 1)
-                        {
-                            continue;
-                        }
-
-                        SubAccounListDictionary.Add(member.DistributedMark, member);
                     }
-
                     foreach (var addMemberID in SubAccounListDictionary.Keys)
                     {
                         SubAccounList.Add(SubAccounListDictionary[addMemberID]);
@@ -655,81 +1053,81 @@
         /// <summary>
         ///  鑾峰彇浜戠瀛樺偍鐨勯棬閿佹垚鍛樹俊鎭�
         /// </summary>
-        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLockAccountlist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj, int curPage)
-        {
-            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
-            {
-                //  璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
-                var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
-                if (UserCenterResourse.UserInfo.AuthorityNo != 1)
-                {
-                    localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
-                    localDoorLockObj.IsOtherAccountCtrl = true;
-                }
-                localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark;
-                {
-                    localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
-                }
-                if (doorLock.DeviceAddr != null)
-                {
-                    localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
-                }
-                var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
-                pageSetting.Page = curPage;
-                localDoorLockObj.pageSetting = pageSetting;
-                var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
-                if (getDoorLockInfoList != null)
-                {
-                    foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
-                    {
-                        var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
-                        if (curDoorLockUser.DoorLockLocalUserId != null)
-                        {
-                            doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
-                            doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
-                            doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
-                        }
-                        doorLockObj.PrimaryId = curDoorLockUser.Id;
-                        doorLockObj.EntryTime = curDoorLockUser.EntryTime;
-                        doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
-                        if (doorLock.localDoorLockAccountList.ContainsKey(curDoorLockUser.CloudAccountId) == false)
-                        {
-                            doorLock.localDoorLockAccountList.Add(doorLockObj.ConnectedAccount, doorLockObj);
-                        }
-                        else
-                        {
-                            doorLock.localDoorLockAccountList[curDoorLockUser.DoorLockLocalUserId] = doorLockObj;
-                        }
-                    }
-                }
-                return doorLock.localDoorLockUserList;
-            }));
-        }
+        //public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLockAccountlist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj, int curPage)
+        //{
+        //    return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
+        //    {
+        //        //  璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
+        //        var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
+        //        if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+        //        {
+        //            localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+        //            localDoorLockObj.IsOtherAccountCtrl = true;
+        //        }
+        //        localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark;
+        //        {
+        //            localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+        //        }
+        //        if (doorLock.DeviceAddr != null)
+        //        {
+        //            localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+        //        }
+        //        var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
+        //        pageSetting.Page = curPage;
+        //        localDoorLockObj.pageSetting = pageSetting;
+        //        var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
+        //        if (getDoorLockInfoList != null)
+        //        {
+        //            foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
+        //            {
+        //                var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+        //                if (curDoorLockUser.DoorLockLocalUserId != null)
+        //                {
+        //                    doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
+        //                    doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
+        //                    doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
+        //                }
+        //                doorLockObj.PrimaryId = curDoorLockUser.Id;
+        //                doorLockObj.EntryTime = curDoorLockUser.EntryTime;
+        //                doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
+        //                if (doorLock.localDoorLockAccountList.ContainsKey(curDoorLockUser.CloudAccountId) == false)
+        //                {
+        //                    doorLock.localDoorLockAccountList.Add(doorLockObj.ConnectedAccount, doorLockObj);
+        //                }
+        //                else
+        //                {
+        //                    doorLock.localDoorLockAccountList[curDoorLockUser.DoorLockLocalUserId] = doorLockObj;
+        //                }
+        //            }
+        //        }
+        //        return doorLock.localDoorLockUserList;
+        //    }));
+        //}
 
         /// <summary>
         ///  鑾峰彇鏈湴鍖归厤鎴愬憳鐨勯棬閿佺敤鎴蜂俊鎭垪琛�
         /// </summary>
-        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetMatchDoorlockAccountList(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
-        {
-            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
-            {
-                var curAccountDoorLockUserList = new Dictionary<int, ZigBee.Device.DoorLock.LocaDoorLockObj>();
-                foreach (var curUserId in doorLock.localDoorLockAccountList.Keys)
-                {
-                    var curDoorLockUser = doorLock.localDoorLockAccountList[curUserId];
+        //public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetMatchDoorlockAccountList(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
+        //{
+        //    return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
+        //    {
+        //        var curAccountDoorLockUserList = new Dictionary<int, ZigBee.Device.DoorLock.LocaDoorLockObj>();
+        //        foreach (var curUserId in doorLock.localDoorLockAccountList.Keys)
+        //        {
+        //            var curDoorLockUser = doorLock.localDoorLockAccountList[curUserId];
 
-                    if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
-                    {
-                        continue;
-                    }
-                    else
-                    {
-                        curAccountDoorLockUserList.Add(curDoorLockUser.UserID, curDoorLockUser);
-                    }
-                }
-                return curAccountDoorLockUserList;
-            }));
-        }
+        //            if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
+        //            {
+        //                continue;
+        //            }
+        //            else
+        //            {
+        //                curAccountDoorLockUserList.Add(curDoorLockUser.UserID, curDoorLockUser);
+        //            }
+        //        }
+        //        return curAccountDoorLockUserList;
+        //    }));
+        //}
 
         /// <summary>
         /// 鐢熸垚6浣嶄复鏃跺瘑鐮�
@@ -740,6 +1138,16 @@
             string password = "";
             password = new Random().Next(100000, 999999).ToString();
             return password;
+        }
+
+        //// <summary>
+        /// 鍙栧緱鏌愭湀鐨勬渶鍚庝竴澶�
+        /// </summary>
+        /// <param name="datetime">瑕佸彇寰楁湀浠芥渶鍚庝竴澶╃殑鏃堕棿</param>
+        /// <returns></returns>
+        public static DateTime LastDayOfMonth(DateTime datetime)
+        {
+            return datetime.AddDays(1 - datetime.Day).AddMonths(1).AddDays(-1);
         }
 
         /// <summary>
@@ -856,7 +1264,7 @@
         /// 鏄剧ず閿欒淇℃伅绐楀彛
         /// </summary>
         /// <param name="msg"></param>
-        private void ShowErrorMsg(string msg)
+        private static void ShowErrorMsg(string msg)
         {
             Application.RunOnMainThread(() =>
             {
@@ -869,7 +1277,7 @@
         /// 鏄剧ずTip淇℃伅绐楀彛
         /// </summary>
         /// <param name="msg"></param>
-        private void ShowTipMsg(string msg)
+        private static void ShowTipMsg(string msg)
         {
             Application.RunOnMainThread(() =>
             {
@@ -878,150 +1286,6 @@
             });
         }
 
-        #endregion
-
-        public enum DoorLockMessType
-        {
-            /// <summary>
-            /// app鎿嶄綔
-            /// </summary>
-            AppOperate = 0,
-            /// <summary>
-            /// 璁惧涓婃姤
-            /// </summary>
-            DeviceReport = 1,
-            /// <summary>
-            /// 鏈嶅姟鍣ㄦ帹閫�
-            /// </summary>
-            ServicePush = 2,
-        }
-
-        /// <summary>
-        /// 甯稿紑妯″紡澶辨晥澶勭悊
-        /// </summary>
-        public static async void NomallyOpenModeInvalidDialog(ZigBee.Device.DoorLock doorLock, DoorLockMessType doorLockMessType, Action action)
-        {
-            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
-            {
-                return;
-            }
-            string msg = Language.StringByID(R.MyInternationalizationString.NomallyModeIsCanceled).Replace("{0}", "\r\n");
-            var confirm = Language.StringByID(R.MyInternationalizationString.SureCancel);
-            var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.NomallyOpenMode, msg, confirm);
-            var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist();
-
-            if (resTemp == 1)
-            {
-                //鏈夐�昏緫璁剧疆鐨勫脊绐�
-                alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.CancelNomallyOpenModeWithLogic, msg, confirm);
-            }
-            alert.Show();
-            alert.MsgControlClickEvent += async () =>
-            {
-                if (doorLockMessType == DoorLockMessType.DeviceReport || doorLockMessType == DoorLockMessType.ServicePush)
-                {
-                    //鍙栨秷甯稿紑
-                    NormallyOpenModeValue(doorLock, false);
-                }
-                else
-                {
-                    //淇濇寔甯稿紑
-                    NormallyOpenModeValue(doorLock, true);
-                }
-                action?.Invoke();
-                action = null;
-            };
-            alert.CancelClickEvent += async () =>
-            {
-                if (doorLockMessType == DoorLockMessType.DeviceReport || doorLockMessType == DoorLockMessType.ServicePush)
-                {
-                    var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
-                    if (result == null || result.defaultControlResponseData == null)
-                    {
-                        string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
-                        Application.RunOnMainThread(() =>
-                        {
-                            new Tip() { MaxWidth = 150, Text = msg0, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                        });
-                        NormallyOpenModeValue(doorLock, false);
-                        return;
-                    }
-                    if (result.defaultControlResponseData.status != 0)
-                    {
-                        string msg1 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeFailed);
-                        Application.RunOnMainThread(() =>
-                        {
-                            new Tip() { MaxWidth = 150, Text = msg1, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                        });
-                        NormallyOpenModeValue(doorLock, false);
-                        return;
-                    }
-                    else
-                    {
-                        NormallyOpenModeValue(doorLock, true);
-                    }
-                }
-                else
-                {
-                    NormallyOpenModeValue(doorLock, true);
-                }
-                action?.Invoke();
-                action = null;
-            };
-            alert.ConfirmClickEvent += async () =>
-            {
-                if (doorLockMessType == DoorLockMessType.DeviceReport || doorLockMessType == DoorLockMessType.ServicePush)
-                {
-                    NormallyOpenModeValue(doorLock, false);
-                }
-                else
-                {
-                    var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
-                    if (result == null || result.defaultControlResponseData == null)
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                        });
-                        return;
-                    }
-                    if (result.defaultControlResponseData.status != 0)
-                    {
-                        string msg1 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeFailed);
-                        Application.RunOnMainThread(() => { });
-
-                        new Tip() { MaxWidth = 150, Text = msg1, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                        return;
-                    }
-                    else
-                    {
-                        NormallyOpenModeValue(doorLock, false);
-                        string msg2 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
-                        Application.RunOnMainThread(() =>
-                        {
-                            new Tip() { MaxWidth = 150, Text = msg2, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                        });
-                    }
-                }
-                action?.Invoke();
-                action = null;
-            };
-        }
-
-        /// <summary>
-        /// 闂ㄩ攣甯稿紑妯″紡鍊�
-        /// </summary>
-        public static void NormallyOpenModeValue(ZigBee.Device.DoorLock doorLock, bool value)
-        {
-            string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
-            if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
-            {
-                doorLock.IsDoorLockNormallyMode[key] = value;
-            }
-            else
-            {
-                doorLock.IsDoorLockNormallyMode.Add(key, value);
-            }
-        }
+        #endregion 
     }
 }

--
Gitblit v1.8.0