2020-05-07-3

陈嘉乐

2020-05-07 70fe48768ea3695780f4b2ae32e940d50bb580c7

2020-05-07-3

 .DS_Store

Binary files differ

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

@@ -1,45 +1,54 @@
<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/UserCenter/CommonBase/Logic/UserCenterLogic.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/R.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="789" Column="9" />
      <File FileName="Shared/Phone/ZigBee/Common/Config.cs" Line="4" Column="11" />
      <File FileName="Shared/Common/House.cs" Line="29" Column="23" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="251" Column="54" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="12" Column="2" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="114" Column="31" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="343" Column="61" />
      <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="7" Column="2" />
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="96" Column="71" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs" Line="221" Column="19" />
      <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="22" Column="17" />
      <File FileName="Shared/Common/Logic.cs" Line="8" Column="6" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs" Line="118" Column="46" />
      <File FileName="Shared/Phone/Category/SelectFloorForm.cs" Line="168" Column="1" IsPinned="True" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="21" Column="24" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="271" Column="15" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="148" Column="118" />
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="22" Column="12" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1055" Column="70" />
      <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="41" Column="36" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs" Line="100" Column="22" />
      <File FileName="GateWay.Droid/Assets/Language.ini" Line="549" Column="1" />
      <File FileName="Shared/R.cs" Line="127" Column="64" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" 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="Category" expanded="True" />
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True" />
                  <Node name="Logic" expanded="True">
                    <Node name="LogicView" expanded="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True">
                    <Node name="Common" expanded="True" />
                    <Node name="Logic" expanded="True">
                      <Node name="UserCenterLogic.cs" selected="True" />
                    <Node name="Controls" expanded="True">
                      <Node name="MessageControls" expanded="True" />
                    </Node>
                  </Node>
                  <Node name="DoorLock" expanded="True" />
                  <Node name="Residence" expanded="True" />
                </Node>
                <Node name="ZigBee" expanded="True">
                  <Node name="Common" expanded="True" />
                  <Node name="Device" expanded="True" />
                </Node>
              </Node>
              <Node name="R.cs" selected="True" />
            </Node>
          </Node>
        </State>

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

Binary files differ

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

@@ -546,6 +546,12 @@
5397=时间为空
5398=只支持数字输入

5399=关闭失败
5400=开启失败
5401=添加失败
5402=时效性常开设置
5403=时执行

10000=HDL Home
10001=常用


 ZigbeeApp/Home.Ios/Resources/Language.ini

@@ -545,6 +545,13 @@
5396=或
5397=时间为空
5398=只支持数字输入
5399=关闭失败
5400=开启失败
5401=添加失败
5402=时效性常开设置
5403=时执行



10000=HDL Home
10001=常用

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

@@ -18,6 +18,8 @@
        }
        public void Show()
        {

           
            #region  界面的布局代码
            TopView view = new TopView();
            this.AddChidren(view.TopRowView());

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

@@ -281,8 +281,8 @@


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

            };


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

@@ -20,6 +20,31 @@
            {
                case 0:
                    {
                        //  if (doorLock == null)
                        //  {
                        //      ///防止抛异常
                        //      Send.CurrentDoorLock = new DoorLock();
                        //  }
                        //  ///备注：WJC的
                        ////  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();
                        //  addLogicPage.action += (w) =>
                        //  {
                        //      //doorLock.IsDoorLockNormallyMode = w;
                        //      /////留给徐梅用的
                        //      //UpdateNomallyOpenStatus();
                        //  };


                        //new一个新逻辑对象；
                        //新增正常自动化入口
                        Common.Logic.CurrentLogic = new Common.Logic();

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

@@ -16,11 +16,7 @@
        {
            Tag = "SoneLogic";
        }
        /// <summary>
        /// 
        /// </summary>
        /// <param name="action">给徐梅刷新界面用的</param>
        /// <param name="bool_If"></param>
        /// 给徐梅刷新界面用的
        public Action<bool> action;
        public async void Show()
        {
@@ -33,13 +29,11 @@
            view.clickBtn.MouseDownEventHandler += (sender, e) =>
            {
                UserView.HomePage.Instance.ScrollEnabled = true;
                RemoveFromParent();
                if (action != null)
                {
                    action(Send.CurrentDoorLock.IsDoorLockNormallyMode);
                }

                RemoveFromParent();

            };

            var middle = new FrameLayout
@@ -67,8 +61,6 @@
                Y = Application.GetRealHeight(92),
                Width = Application.GetMinRealAverage(294),
                Height = Application.GetMinRealAverage(294),
                UnSelectedImagePath = "ZigeeLogic/noMode.png",
                SelectedImagePath = "ZigeeLogic/openMode.png",
            };
            fLayout.AddChidren(modeIconBtn);

@@ -78,7 +70,7 @@
                var logic = await SkipView.GetLogicIfon();

                fLayout.Height = Application.GetRealHeight(780);//改变高度
                modeIconBtn.IsSelected = true;//改变图标状态
                modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//改变图标状态
                ///第二级父控件
                var openModeFl = new FrameLayout
                {
@@ -116,11 +108,12 @@
                        var soneLogicList = new SoneLogicList();
                        UserView.HomePage.Instance.AddChidren(soneLogicList);
                        UserView.HomePage.Instance.PageIndex += 1;
                        soneLogicList.Show();

                        soneLogicList.Show();
                        soneLogicList.action = action;

                    }
                    else
                    {
                        LogicView.TipView.ShowFlashTip("关闭失败");
                        LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.closeFailed));
                    }

                };
@@ -129,12 +122,11 @@
                var timeTextBtn = new Button
                {
                    Y = Application.GetRealHeight(127 + 69),
                    X = Application.GetRealWidth(225),
                    Width = Application.GetRealWidth(634),
                    X = Application.GetRealWidth(125),
                    Width = Application.GetRealWidth(634+200),
                    Height = Application.GetRealHeight(60),
                    TextSize = 15,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Text = "时效性常开设置12:20",
                };
                if (logic != null)
                {
@@ -144,15 +136,21 @@
                ///时效性常开只有一个条件;
                try
                {
                    var y = DateTime.Now.ToString("yy");//那一年
                    var m = DateTime.Now.ToString("mm");//那一月
                    
                    var y = DateTime.Now.Year.ToString();//那一年
                    var m = DateTime.Now.Month.ToString();//那一月
                    var d = DateTime.Now.ToString("dd");//那一天
                    var h = int.Parse(DateTime.Now.ToString("HH"));//当前系统时间
                    var me = DateTime.Now.ToLongDateString();
                    var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
                    int dayInt = (h + timeInt) / 24;//算出几天后执行
                    int hour = (h + timeInt) % 24;//算出几天后那个时间执行
                    timeTextBtn.Text = "时效性常开设置" + y + "年" + m + "月" + d + dayInt + "号" + timeInt + "时" + "执行";
                    int days = int.Parse(d) + dayInt;
                    string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
                    string text2= Language.StringByID(MyInternationalizationString.yearSone);
                    string text3 = Language.StringByID(MyInternationalizationString.monthSone);
                    string text4= Language.StringByID(MyInternationalizationString.numberSone);
                    string text5= Language.StringByID(MyInternationalizationString.executeSone);
                    timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
                }
                catch { }

@@ -160,7 +158,7 @@
            else
            {
                fLayout.Height = Application.GetRealHeight(645);//改变高度
                modeIconBtn.IsSelected = false;//改变图标状态
                modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//改变图标状态
                ///第二级父控件
                var modeFl = new FrameLayout
                {
@@ -215,7 +213,7 @@
                               var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
                                 if (!result)
                                 {
                                     LogicView.TipView.ShowFlashTip("开启失败");
                                     LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed));
                                     return;
                                 }
                                 else
@@ -225,8 +223,10 @@
                                   var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//添加一条失效逻辑
                                   if (!addResult)
                                     {
                                         ///可欣说如果常开模式开，创建自动化失败，那么将要发一条常开模式关闭命令;
                                         UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
                                         ///提示失败
                                         LogicView.TipView.ShowFlashTip("添加失败");
                                         LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
                                         return;
                                     }

                                     Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
@@ -235,6 +235,13 @@
                                     UserView.HomePage.Instance.AddChidren(soneLogicList);
                                     UserView.HomePage.Instance.PageIndex += 1;
                                     soneLogicList.Show();
                                      soneLogicList.action= action;
                                     //soneLogicList.action += (c) => {
                                     //    if (action != null)
                                     //    {
                                     //        action(Send.CurrentDoorLock.IsDoorLockNormallyMode);
                                     //    }
                                     //};

                                 }
                             }
@@ -398,7 +405,7 @@
        /// </summary>
        /// <param name="verticalRefresh"></param>
        RowLayout selectedRow = new RowLayout() { Tag = "0" };//记录左滑状态
        int i = 1;
        int a = 1;
        private void RefreshView(VerticalRefreshLayout verticalRefresh)
        {
            verticalRefresh.RemoveAll();
@@ -418,7 +425,7 @@
                    LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                    SubViewWidth = Application.GetRealWidth(184),//改变编辑控件宽度多少；
                    Tag = i.ToString(),
                    Tag = a.ToString(),
                };
                fLayout.AddChidren(logicRow);
                //左滑菜单事件
@@ -430,7 +437,7 @@
                    }
                    selectedRow = logicRow;
                };
                i++;
                a++;
                ///显示逻辑名称的控件

                var nameBtn = new Button
                {

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

old mode 100755
new mode 100644
@@ -1024,18 +1024,17 @@
        /// </summary>
        private async void NomallyOpenDialog()
        {
            #region 后续版本
            //if (UserCenterResourse.UserInfo.AuthorityNo != 1)
            //{
            //    this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
            //    return;
            //}
            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
            {
                this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
                return;
            }

            //if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
            //{
            //    SystemSecondAuthentication();
            //    return;
            //}
            if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
            {
                SystemSecondAuthentication();
                return;
            }

            action = () =>
            {
@@ -1064,8 +1063,7 @@
                    UpdateNomallyOpenStatus();

                };

            };

            //HdlCheckLogic.Current.CheckSecondarySecurity(action);

            #endregion
            HdlCheckLogic.Current.CheckSecondarySecurity(action);





        }

 ZigbeeApp/Shared/R.cs

old mode 100755
new mode 100644
@@ -835,6 +835,13 @@
        public readonly static int or = 5396;
        public readonly static int timeNull = 5397;
        public readonly static int numberInput = 5398;
        public readonly static int closeFailed = 5399;
        public readonly static int openFailed = 5400;
        public readonly static int addFailed = 5401;
        public readonly static int timeSensitive = 5402;
        public readonly static int executeSone = 5403;



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