2020-04-30

陈嘉乐

2020-04-30 ee888ab45a850245b1e1372375ba9040316086ab

2020-04-30

 .DS_Store

Binary files differ

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -1,40 +1,44 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicView/TipView.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="214" Column="31" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="326" Column="22" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs" Line="179" Column="15" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="19" Column="22" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="8" Column="43" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs" Line="442" Column="18" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs" Line="483" Column="19" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="43" Column="74" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="28" Column="26" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="214" Column="45" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs" Line="205" Column="48" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1068" Column="64" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="783" Column="38" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="10" Column="21" />
      <File FileName="Shared/Phone/Device/Logic/CustomText.cs" Line="26" Column="82" />
      <File FileName="Shared/Common/ZigbeeColor.cs" Line="354" Column="62" />
      <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/FunView.cs" Line="28" Column="65" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs" Line="161" Column="45" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="834" Column="50" />
      <File FileName="Shared/R.cs" Line="559" Column="23" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="119" Column="23" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="608" Column="22" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs" Line="138" Column="60" />
      <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="42" Column="41" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True" />
            <Node name="GateWay.Droid" expanded="True">
              <Node name="Assets" expanded="True" />
            </Node>
            <Node name="Home.IOS" expanded="True">
              <Node name="Resources" expanded="True" />
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="LogicView" expanded="True">
                      <Node name="TipView.cs" selected="True" />
                    </Node>
                    <Node name="LogicView" expanded="True" />
                    <Node name="SoneLogicList.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True">
                    <Node name="Common" expanded="True" />
                    <Node name="Controls" expanded="True">
                      <Node name="BaseCommonControl" expanded="True">
                        <Node name="Base" expanded="True" />
@@ -42,10 +46,6 @@
                      <Node name="MessageControls" expanded="True" />
                      <Node name="NormalControls" expanded="True" />
                    </Node>
                    <Node name="Logic" expanded="True" />
                  </Node>
                  <Node name="Device" expanded="True">
                    <Node name="Bind" expanded="True" />
                  </Node>
                  <Node name="DoorLock" expanded="True" />
                </Node>

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

@@ -536,7 +536,15 @@
5387=号
5388=常开自动化
5389=时效性常开设置

5390=失效设置
5391=小时
5392=门锁始终打开
5393=设置常开模式后，您的门锁将始终{0}处于打开状态，确认开启？ 
5394=不能小于1小时
5395=大于12小时
5396=或
5397=时间为空
5398=只支持数字输入

10000=HDL Home
10001=常用

 ZigbeeApp/Home.Ios/Resources/Language.ini

@@ -536,8 +536,15 @@
5387=号
5388=常开自动化
5389=时效性常开设置


5390=失效设置
5391=小时
5392=门锁始终打开
5393=设置常开模式后，您的门锁将始终{0}处于打开状态，确认开启？ 
5394=不能小于1小时
5395=大于12小时
5396=或
5397=时间为空
5398=只支持数字输入

10000=HDL Home
10001=常用

 ZigbeeApp/Shared/Common/ZigbeeColor.cs

@@ -367,6 +367,7 @@
        public uint LogicListWeekTextColor = 0xFF666666;
        public uint LogicTipColor = 0xFF333443;
        public uint LogicTipTextColor= 0xFFcccccc;
        public uint LogicEditTextBackgroundColor=0xFFD1D1D3;
        #endregion
    }
}

 ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs

@@ -5,12 +5,23 @@
{
    public class TipView
    {
     

        public void ShowTip(FrameLayout fLayout)
        /// <summary>
        /// 确定框
        /// </summary>
        /// <param name="action"></param>
        public static void ShowConfrimTip(Action action)
        {
            

            ///主控件
            Dialog dialog = new Dialog();
            dialog.Show();
            ///背景的父控件
            FrameLayout fLayout = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
            dialog.AddChidren(fLayout);
            fLayout.MouseUpEventHandler += (sender, e) =>
            {
                dialog.Close();
            };
            ///弹框父控件
            FrameLayout tipFLayout = new FrameLayout
            {
                X = Application.GetRealWidth(144),
@@ -18,17 +29,17 @@
                Width = Application.GetRealWidth(792),
                Height = Application.GetRealHeight(351 + 127),
                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                Radius = (uint)Application.GetRealHeight(17)
            };
            fLayout.AddChidren(tipFLayout);
            tipFLayout.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft| HDLUtils.RectCornerTopRight| HDLUtils.RectCornerBottomLeft| HDLUtils.RectCornerBottomRight);

            ///上面快的父控件
            FrameLayout topFrame = new FrameLayout
            {
                Width = Application.GetRealWidth(792),
                Height = Application.GetRealHeight(351),
            };
            tipFLayout.AddChidren(topFrame);

            ///提示控件
            Button tipBtn = new Button
            {
                TextID = R.MyInternationalizationString.Tip,
@@ -41,11 +52,10 @@
                Width = Application.GetRealWidth(492),
            };
            topFrame.AddChidren(tipBtn);


            ///自定义文本控件
            Button tipTextBtn = new Button
            {
                Text=Language.StringByID(R.MyInternationalizationString.SetDoorLockNomallyOpen).Replace("{0}", "\r\n"),
                Text = Language.StringByID(R.MyInternationalizationString.SetDoorLockNomallyOpen).Replace("{0}", "\r\n"),
                TextAlignment = TextAlignment.Center,
                TextColor = ZigbeeColor.Current.LogicTipTextColor,
                TextSize = 14,
@@ -56,7 +66,7 @@
                IsMoreLines = true,
            };
            topFrame.AddChidren(tipTextBtn);

            ///下面快的父控件
            FrameLayout bottomFrame = new FrameLayout
            {
                Y = topFrame.Bottom,
@@ -65,7 +75,7 @@
            };
            tipFLayout.AddChidren(bottomFrame);


            ///取消控件
            Button cancelBtn = new Button
            {
                TextAlignment = TextAlignment.Center,
@@ -74,10 +84,11 @@
                Height = Application.GetRealHeight(127),
                Width = Application.GetRealWidth(397),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
                Text="123",
                TextID = R.MyInternationalizationString.cancel,
            };
            bottomFrame.AddChidren(cancelBtn);
            cancelBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft );
            cancelBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft);
            ///确认控件
            Button okBtn = new Button
            {
                TextAlignment = TextAlignment.Center,
@@ -85,16 +96,320 @@
                TextSize = 14,
                X = cancelBtn.Right,
                Height = Application.GetRealHeight(127),
                Width = bottomFrame.Width- cancelBtn.Width, 
                Width = bottomFrame.Width - cancelBtn.Width,
                BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
                Text = "456",
                TextID = R.MyInternationalizationString.confrim,
            };
            bottomFrame.AddChidren(okBtn);
            okBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomRight);
            cancelBtn.MouseUpEventHandler += (sender,e) => {
                fLayout.RemoveFromParent();
            ///取消点击事件
            cancelBtn.MouseUpEventHandler += (sender, e) =>
            {
                dialog.Close();
            };
            ///确认点击事件
            okBtn.MouseUpEventHandler += (sender, e) =>
            {
                dialog.Close();
                action();
            };
        }
        /// <summary>
        /// 输入框
        /// </summary>
        /// <param name="_if">是否需要取消按钮</param>
        /// <param name="action"></param>
        public static void ShowInputTip(bool _if, Action<string> action)
        {

            ///主控件
            Dialog dialog = new Dialog();
            dialog.Show();
            ///背景的父控件
            FrameLayout fLayout = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
            dialog.AddChidren(fLayout);
            fLayout.MouseUpEventHandler += (sender, e) =>
            {
                dialog.Close();
            };
            ///弹框父控件
            FrameLayout tipFLayout = new FrameLayout
            {
                X = Application.GetRealWidth(144),
                Y = Application.GetRealHeight(706),
                Width = Application.GetRealWidth(792),
                Height = Application.GetRealHeight(351 + 127),
                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                Radius = (uint)Application.GetRealHeight(17)
            };
            fLayout.AddChidren(tipFLayout);
            ///上面快的父控件
            FrameLayout topFrame = new FrameLayout
            {
                Width = Application.GetRealWidth(792),
                Height = Application.GetRealHeight(351),
            };
            tipFLayout.AddChidren(topFrame);
            ///提示控件
            Button tipBtn = new Button
            {
                Y = Application.GetRealHeight(69),
                X = Application.GetRealWidth(150),
                Height = Application.GetRealHeight(63),
                Width = Application.GetRealWidth(492),
               TextID = R.MyInternationalizationString.invalidSetting,
                TextAlignment = TextAlignment.Center,
                TextColor = ZigbeeColor.Current.LogicTipColor,
                TextSize = 16,

            };
            topFrame.AddChidren(tipBtn);
            ///文本1控件
            Button Text1Btn = new Button
            {
                Y = Application.GetRealHeight(187),
                X = Application.GetRealWidth(50),
                Height = Application.GetRealHeight(58),
                Width = Application.GetRealWidth(242 + 94),
                TextID = R.MyInternationalizationString.lockOpen,
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                TextSize = 14,

            };
            topFrame.AddChidren(Text1Btn);
            ///输入文本框
            EditText editTime = new EditText()
            {
                X = Application.GetRealWidth(409),
                Y = Application.GetRealHeight(173),
                Height = Application.GetRealHeight(81),
                Width = Application.GetRealWidth(132),
                Radius = (uint)Application.GetMinRealAverage(17),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.Center,
                TextSize = 14,
                Text = "12",
                IsNumberKeyboardType=true,//只输入数字的属性
            };
            topFrame.AddChidren(editTime);
            ///文本2控件
            Button Text2Btn = new Button
            {
                Y = Application.GetRealHeight(187),
                X = Application.GetRealWidth(564),
                Height = Application.GetRealHeight(58),
                Width = Application.GetRealWidth(51 + 100),
                TextID = R.MyInternationalizationString.hour,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                TextSize = 14,

            };
            topFrame.AddChidren(Text2Btn);

            ///下面快的父控件
            FrameLayout bottomFrame = new FrameLayout
            {
                Y = topFrame.Bottom,
                Width = Application.GetRealWidth(792),
                Height = Application.GetRealHeight(127),
            };
            tipFLayout.AddChidren(bottomFrame);
            ///取消控件
            Button cancelBtn = new Button
            {
                TextAlignment = TextAlignment.Center,
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                TextSize = 14,
                Height = Application.GetRealHeight(127),
                Width = Application.GetRealWidth(397),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
                TextID = R.MyInternationalizationString.cancel,
            };
            bottomFrame.AddChidren(cancelBtn);
            ///确认控件
            Button okBtn = new Button
            {
                TextAlignment = TextAlignment.Center,
                TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                TextSize = 14,
                X = cancelBtn.Right,
                Height = Application.GetRealHeight(127),
                Width = bottomFrame.Width - cancelBtn.Width,
                BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
                TextID = R.MyInternationalizationString.confrim,
            };
            bottomFrame.AddChidren(okBtn);

            if (_if) {
                cancelBtn.X = Application.GetRealWidth(0);
                cancelBtn.Width = Application.GetRealWidth(0);
                okBtn.X = Application.GetRealWidth(0);
                okBtn.Width = Application.GetRealWidth(792);
                okBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
            }
            else
            {
                cancelBtn.X = Application.GetRealWidth(0);
                cancelBtn.Width = Application.GetRealWidth(397);
                okBtn.X = Application.GetRealWidth(397);
                okBtn.Width = bottomFrame.Width - cancelBtn.Width;
                cancelBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft);
                okBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomRight);

            }
            ///取消点击事件
            cancelBtn.MouseUpEventHandler += (sender, e) =>
            {
                dialog.Close();
            };
            ///确认点击事件
            okBtn.MouseUpEventHandler += (sender, e) =>
            {
                if (string.IsNullOrEmpty(editTime.Text))
                {
                    ShowTip(Language.StringByID(R.MyInternationalizationString.timeNull),true);
                    return;
                }
                if (int.Parse(editTime.Text) < 1 || int.Parse(editTime.Text) > 12)
                {  ///限制输入数字范围;
                    string str = Language.StringByID(R.MyInternationalizationString.less) + Language.StringByID(R.MyInternationalizationString.or) + Language.StringByID(R.MyInternationalizationString.more);
                    ShowTip(str, true);
                    return;


                }
                dialog.Close();
                action(editTime.Text);
           };

        }
        /// <summary>
        /// 提示框
        /// </summary>
        public static void ShowTip(string tipText,bool _if )
        {
            ///主控件
            Dialog dialog = new Dialog();
            dialog.Show();
            ///背景的父控件
            FrameLayout fLayout = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
            dialog.AddChidren(fLayout);
            fLayout.MouseUpEventHandler += (sender, e) =>
            {
                dialog.Close();
            };
            ///弹框父控件
            FrameLayout tipFLayout = new FrameLayout
            {
                X = Application.GetRealWidth(144),
                Y = Application.GetRealHeight(706),
                Width = Application.GetRealWidth(792),
                Height = Application.GetRealHeight(351 + 127),
                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                Radius = (uint)Application.GetRealHeight(17)
            };
            fLayout.AddChidren(tipFLayout);
            ///上面快的父控件
            FrameLayout topFrame = new FrameLayout
            {
                Width = Application.GetRealWidth(792),
                Height = Application.GetRealHeight(351),
            };
            tipFLayout.AddChidren(topFrame);
            ///提示控件
            Button tipBtn = new Button
            {
                Y = Application.GetRealHeight(69),
                X = Application.GetRealWidth(150),
                Height = Application.GetRealHeight(63),
                Width = Application.GetRealWidth(492),
                TextID = R.MyInternationalizationString.tip,
                TextAlignment = TextAlignment.Center,
                TextColor = ZigbeeColor.Current.LogicTipColor,
                TextSize = 16,

            };
            topFrame.AddChidren(tipBtn);
            ///文本控件
            Button Text1Btn = new Button
            {
                Y = Application.GetRealHeight(187),
                X = Application.GetRealWidth(50),
                Height = Application.GetRealHeight(58),
                Width = Application.GetRealWidth(792-100),
                Text= tipText,
                TextAlignment = TextAlignment.Center,
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                TextSize = 14,

            };
            topFrame.AddChidren(Text1Btn);

            ///下面快的父控件
            FrameLayout bottomFrame = new FrameLayout
            {
                Y = topFrame.Bottom,
                Width = Application.GetRealWidth(792),
                Height = Application.GetRealHeight(127),
            };
            tipFLayout.AddChidren(bottomFrame);
            ///取消控件
            Button cancelBtn = new Button
            {
                TextAlignment = TextAlignment.Center,
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                TextSize = 14,
                Height = Application.GetRealHeight(127),
                Width = Application.GetRealWidth(397),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
                TextID = R.MyInternationalizationString.cancel,
            };
            bottomFrame.AddChidren(cancelBtn);
            ///确认控件
            Button okBtn = new Button
            {
                TextAlignment = TextAlignment.Center,
                TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                TextSize = 14,
                X = cancelBtn.Right,
                Height = Application.GetRealHeight(127),
                Width = bottomFrame.Width - cancelBtn.Width,
                BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
                TextID = R.MyInternationalizationString.confrim,
            };
            bottomFrame.AddChidren(okBtn);

            if (_if)
            {
                cancelBtn.X = Application.GetRealWidth(0);
                cancelBtn.Width = Application.GetRealWidth(0);
                okBtn.X = Application.GetRealWidth(0);
                okBtn.Width = Application.GetRealWidth(792);
                okBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
            }
            else
            {
                cancelBtn.X = Application.GetRealWidth(0);
                cancelBtn.Width = Application.GetRealWidth(397);
                okBtn.X = Application.GetRealWidth(397);
                okBtn.Width = bottomFrame.Width - cancelBtn.Width;
                cancelBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft);
                okBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomRight);

            }
            ///取消点击事件
            cancelBtn.MouseUpEventHandler += (sender, e) =>
            {
                dialog.Close();
            };
            ///确认点击事件
            okBtn.MouseUpEventHandler += (sender, e) =>
            {
                dialog.Close();
            };
        }
    }
}

 ZigbeeApp/Shared/Phone/Device/Logic/Method.cs

old mode 100755
new mode 100644
@@ -831,7 +831,7 @@
                var soneLogicList = new SoneLogicList();
                UserView.HomePage.Instance.AddChidren(soneLogicList);
                UserView.HomePage.Instance.PageIndex += 1;
                soneLogicList.Show();
                soneLogicList.Show(()=> { },false);
            }

        }

 ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs

@@ -36,7 +36,7 @@
                        var addLogicPage = new SoneLogicList();
                        UserView.HomePage.Instance.AddChidren(addLogicPage);
                        UserView.HomePage.Instance.PageIndex += 1;
                        addLogicPage.Show();
                        addLogicPage.Show(()=> { },false);

                        ////new一个新逻辑对象；
                        ////新增正常自动化入口
@@ -78,28 +78,7 @@
                        doorLockLogicList.Show();
                    }
                    break;
                case 2:
                    {
                        ///Sone门锁主入口
                        if (doorLock == null)
                        {
                            ///防止抛异常
                            doorLock = new DoorLock();
                        }
                        Send.CurrentDoorLock = doorLock;
                        ///进来刷新一次设备列表；
                        Common.Logic.LogicDviceList.Clear();
                        if (Common.Logic.LogicDviceList.Count == 0)
                        {
                            Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
                        }
                        var addLogicPage = new SoneLogicList();
                        UserView.HomePage.Instance.AddChidren(addLogicPage);
                        UserView.HomePage.Instance.PageIndex += 1;
                        addLogicPage.Show();
                     
                    }
                    break;
              
            }

        }
@@ -716,7 +695,7 @@
        #endregion

        /// <summary>
        /// 门锁取消设置用的方法(相当一个关闭常开模式按钮,分类-自动化-不需要显示该自动化)
        /// 门锁失效设置用的方法(相当一个关闭常开模式按钮,分类-自动化-不需要显示该自动化)
        /// </summary>
        /// <param name="timeVlaue">时间值</param>
        /// <param name="common">设备</param>
@@ -818,7 +797,25 @@
            return _if;
        }

     
        /// <summary>
        /// 常开模式开关
        /// </summary>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<bool> OpenMode(bool _if, DoorLock doorLock)
        {
            var result = await doorLock.SetNormallyOpenModeFuncAsync(_if);
            
            if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
            {
                return false;
            }
            if (result.defaultControlResponseData.status == 0)
            {
                //app确认取消“常开模式”成功 
                return true;
            }
            return false;
        }
    }
}


 ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs

@@ -11,12 +11,28 @@
        /// <summary>
        /// 给Sone门锁徐梅更新界面用的
        /// </summary>
        ///
        public SoneLogicList()
        {
            Tag = "SoneLogic";
        }
        public async void Show(Action action = null, bool bool_If = false)
        /// <summary>
        /// 
        /// </summary>
        /// <param name="action">给徐梅刷新界面用的</param>
        /// <param name="bool_If"></param>
        public async void Show(Action action, bool bool_If = false)
        {
            #region  徐梅叫这样做的
            string key = Send.CurrentDoorLock.DeviceAddr + "_" + Send.CurrentDoorLock.DeviceEpoint;
            if (Send.CurrentDoorLock.IsDoorLockNormallyMode.ContainsKey(key))
            {
                if (Send.CurrentDoorLock.IsDoorLockNormallyMode[key] == true)
                {
                    bool_If = true;
                }
            }
            #endregion
            #region  界面的布局代码
            UserView.HomePage.Instance.ScrollEnabled = false;//锁住左滑
            TopView view = new TopView();
@@ -102,23 +118,37 @@
                    alert.ConfirmClickEvent += async () =>

                    {

                        var bool_ = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(new ZigBee.Device.DoorLock { });
                        if (bool_)
                        {
                     Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock, action);

                        }
                        else { }
                        if (logic != null)
                        {
                            ///有可能只有常开模式，没有时效性自动化
                            ///没有判断的话，逻辑会为空，抛出异常;
                            Send.DelLogic(logic.LogicId);
                        }
                        this.RemoveFromParent();
                        var soneLogicList = new SoneLogicList();
                        UserView.HomePage.Instance.AddChidren(soneLogicList);
                        UserView.HomePage.Instance.PageIndex += 1;
                        soneLogicList.Show();

                     Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LogicAction += (d) => {
                            this.RemoveFromParent();
                            var soneLogicList = new SoneLogicList();
                            UserView.HomePage.Instance.AddChidren(soneLogicList);
                            UserView.HomePage.Instance.PageIndex += 1;
                            soneLogicList.Show(() => { }, false);

                        };

                        /////xm
                        //var result = await SkipView.OpenMode(false, Send.CurrentDoorLock);
                        //if (result)
                        //{
                        //    if (logic != null)
                        //    {
                        //        ///有可能只有常开模式，没有时效性自动化
                        //        ///没有判断的话，逻辑会为空，抛出异常;
                        //        Send.DelLogic(logic.LogicId);
                        //    }
                        //    this.RemoveFromParent();
                        //    var soneLogicList = new SoneLogicList();
                        //    UserView.HomePage.Instance.AddChidren(soneLogicList);
                        //    UserView.HomePage.Instance.PageIndex += 1;
                        //    soneLogicList.Show(()=>{ },false);
                        //}
                        //else {
                        //    ///提示失败
                        //}

                    };
                };

@@ -196,54 +226,66 @@
                };
                modeFl.AddChidren(nextIconBtn);

                var clickBtn = new Button
                {
                    Y = Application.GetRealHeight(478),
                    X = Application.GetRealWidth(58),
                    Height = Application.GetRealHeight(138),
                    Width = Application.GetRealWidth(1022),
                };
                // modeFl.AddChidren(clickBtn);
               

                nextIconBtn.MouseUpEventHandler += (sender, e) =>
              nextIconBtn.MouseUpEventHandler += (sender, e) =>
               {
                   Logic.LogicView.TipView tipView = new LogicView.TipView();

                   FrameLayout fLayout1 = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
                   this.AddChidren(fLayout1);
                   tipView.ShowTip(fLayout1);
                   //string msg = Language.StringByID(R.MyInternationalizationString.SetDoorLockNomallyOpen).Replace("{0}", "\r\n");
                   //var confirm = Language.StringByID(R.MyInternationalizationString.Confrim);
                   //var alert = new UserCenter.DoorLock.ShowDoorLockMsgControl(UserCenter.DoorLock.ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, confirm);
                   //alert.Show();
                   //alert.ConfirmClickEvent += () =>
                   // {
                   //     string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
                   //     var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
                   //     var alertTimeInValidSetting = new UserCenter.DoorLock.ShowDoorLockMsgControl(UserCenter.DoorLock.ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
                   //     alertTimeInValidSetting.Show();
                   //     alertTimeInValidSetting.InvalidTimeAction += async (obj) =>
                   //     {
                   Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidTimeDialog(Send.CurrentDoorLock, action);
                   Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LogicAction += (d) => {
                       this.RemoveFromParent();
                       var soneLogicList = new SoneLogicList();
                       UserView.HomePage.Instance.AddChidren(soneLogicList);
                       UserView.HomePage.Instance.PageIndex += 1;
                       soneLogicList.Show(() => { }, true);

                   //         var result = await new ZigBee.Device.DoorLock { }.SetNormallyOpenModeFuncAsync(true);
                   //         //var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
                   //     };
                   // };
                   };
                   #region 
                   /*
                   LogicView.TipView.ShowConfrimTip(() =>
                   {///再次确认
                       LogicView.TipView.ShowInputTip(true, async (str) =>
                       {///确认发送命令
                           try
                           {
                               ///xm
                               var result = await SkipView.OpenMode(true,Send.CurrentDoorLock);
                               if (!result)
                               {
                                   Application.RunOnMainThread(() =>
                                   {
                                     ///提示失败
                                   });
                                   return;
                               }
                               else
                               {
                                   ///因为有常开模式下才可以创建失效逻辑；
                                   SkipView.GetLogicAll();//删除之前所有失效逻辑
                                   var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//添加一条失效逻辑
                                   if (!addResult)
                                   {
                                       ///提示失败
                                       return;
                                   }
                                   this.RemoveFromParent();
                                   var soneLogicList = new SoneLogicList();
                                   UserView.HomePage.Instance.AddChidren(soneLogicList);
                                   UserView.HomePage.Instance.PageIndex += 1;
                                   soneLogicList.Show(() => { }, true);

                   //   //UserCenter.DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidTimeDialog(new ZigBee.Device.DoorLock { });
                               }
                           }
                           catch
                           {

                   //UserCenter.DoorLock.DoorLockCommonInfo.NomallyOpenModeStartDialog(new ZigBee.Device.DoorLock { }, () =>
                   //{
                   //});
                   // var d = await SkipView.LockAddModifyLogic(12, Send.CurrentDoorLock);
                           }
                       });

                   // var contr = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Tip, "sdgdgdfhfhfhgjggfg");
                   //contr.Show();
                   //contr.ConfirmClickEvent += () =>
                   //  {
                   //  };
                   });
                  */

                   //UserCenter.DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidTimeDialog();
                   #endregion
               };
            }


 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs

@@ -388,6 +388,8 @@
            }
            return false;
        }
    


        /// <summary>
        /// 启动常开模式【弹窗】

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs

@@ -1057,13 +1057,31 @@

            action = () =>
            {
                {
                    #region WJC
                    if (doorLock == null)
                    {
                        ///防止抛异常
                        doorLock = new ZigBee.Device.DoorLock();
                    }
                    Shared.Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
                    ///进来刷新一次设备列表；
                    Common.Logic.LogicDviceList.Clear();
                    if (Common.Logic.LogicDviceList.Count == 0)
                    {
                        Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
                    }
                    var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
                    UserView.HomePage.Instance.AddChidren(addLogicPage);
                    UserView.HomePage.Instance.PageIndex += 1;
                    addLogicPage.Show(() =>
                    {
                        UpdateNomallyOpenStatus();//徐梅的方法
                    });
                    //系统密码支持操作门锁后，调用温居城的界面【常开自动化】
                    #endregion
                }

                Shared.Phone.Device.Logic.SkipView.SkipAddLogic(2, doorLock);
                //系统密码支持操作门锁后，调用温居城的界面【常开自动化】
               // functionSetting.aaaAction = () =>
               //{
               //    UpdateNomallyOpenStatus();
               //};
            };
            HdlCheckLogic.Current.CheckSecondarySecurity(action);
            #endregion

 ZigbeeApp/Shared/R.cs

old mode 100755
new mode 100644
@@ -822,7 +822,15 @@
        public readonly static int numberSone = 5387;
        public readonly static int openAutomationSone = 5388;
        public readonly static int timeSetSone= 5389;

        public readonly static int invalidSetting = 5390;
        public readonly static int hour = 5391;
        public readonly static int lockOpen = 5392;
        public readonly static int setDoorLockOpen = 5393;
        public readonly static int less = 5394;
        public readonly static int more = 5395;
        public readonly static int or = 5396;
        public readonly static int timeNull = 5397;
        public readonly static int numberInput = 5398;

        #region 登录注册
        /// <summary>