2020-04-08-1

WJC

2020-04-08 679c2a4c459c7ad0e9f727ad4196c0754716c28f

2020-04-08-1

11

 .DS_Store

Binary files differ

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

@@ -1,27 +1,22 @@
<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/SkipView.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/TimePage.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="272" Column="18" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="186" Column="78" />
      <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="158" Column="48" />
      <File FileName="Shared/Phone/Device/Logic/TimePage.cs" Line="338" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Category" expanded="True" />
                <Node name="CommonForm" expanded="True" />
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="LogicView" expanded="True" />
                    <Node name="SkipView.cs" selected="True" />
                    <Node name="TimePage.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="DoorLock" expanded="True" />
                </Node>
              </Node>
            </Node>

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

Binary files differ

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

@@ -528,6 +528,7 @@
5379=暂无联动事件{\r\n} 请点击右上角添加
5380=常开模式
5381=添加条件或者添加功能为空
5382=查看




 ZigbeeApp/Home.Ios/Resources/Language.ini

@@ -528,6 +528,8 @@
5379=暂无联动事件{\r\n} 请点击右上角添加
5380=常开模式
5381=添加条件或者添加功能为空
5382=查看





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

@@ -28,14 +28,23 @@
            #region  View布局代码
            TopView view = new TopView();
            this.AddChidren(view.TopRowView());
            if (Common.Logic.CurrentLogic.LogicId != 0)

            if (Yes)
            {
                view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.editautomation);
                view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.look);
            }
            else
            {
                view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.newautomation);
                if (Common.Logic.CurrentLogic.LogicId != 0)
                {
                    view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.editautomation);
                }
                else
                {
                    view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.newautomation);
                }
            }
            
            view.clickBtn.MouseDownEventHandler += (sender, e) =>
            {
                // UserView.HomePage.Instance.ScrollEnabled = true;//恢复左滑
@@ -151,7 +160,7 @@
                        UserView.HomePage.Instance.PageIndex += 1;
                        timePage.str1 = conditions["StartHour"] + ":" + conditions["StartMin"] + "-" + conditions["StopHour"] + ":" + conditions["StopMin"];
                        timePage.IsEditor = true;
                        timePage.Show();
                        timePage.Show(true);
                    }
                };


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

@@ -482,6 +482,9 @@
                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                };
                logicRowlayout.AddRightView(edit);
                if (logic.LogicType==2) {
                    edit.TextID=MyInternationalizationString.look;
                }
                edit.MouseUpEventHandler += (sender, e) =>
                {
                    Common.Logic.CurrentLogic = logic;
@@ -733,7 +736,7 @@
        }

        ///<summary>
        /// 是否存在S-one逻辑方法(true为存在)
        /// s-one门锁是否存在自动化的方法(true为存在)
        /// </summary>
        public static async System.Threading.Tasks.Task<bool> Exist(int valueInt=2)
        {
@@ -754,7 +757,7 @@
        }

        ///<summary>
        /// s-one门锁确认取消发送的方法
        /// s-one门锁确认取消(使满足条件所有逻辑失能一次)发送的方法
        /// </summary>
        public static async void LockCloseLogic(CommonDevice common)
        {
@@ -763,7 +766,7 @@
            int m= int.Parse(DateTime.Now.ToString("mm"));
            //转化为多少分钟;
            int s = h * 60 + m;
            List<Common.Logic> logicList = new List<Common.Logic>();
            var logicList = new List<Common.Logic>();
            logicList.Clear();
            var Idlist = await Send.GetLogicId(2);
            if (Idlist.Count != 0)

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

@@ -19,7 +19,7 @@
        public string str1;

        Dictionary<string, string> timeBucketConditionsInfo = new Dictionary<string, string>();
        public void Show()
        public void Show(bool _if=false)
        {

            #region  上面的布局代码
@@ -335,11 +335,21 @@
                }

                //LogicIfon.logicIfon.Addconditions(timeBucketConditionsInfo,timeBucketConditionsInfo.Type);
                if (_if) {
                    //跳到S-one门锁
                    var oneLogic = new OneLogic { };
                    UserView.HomePage.Instance.AddChidren(oneLogic);
                    UserView.HomePage.Instance.PageIndex += 1;
                    oneLogic.Show(false);

                var logicCommunalPage = new LogicCommunalPage { };
                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                UserView.HomePage.Instance.PageIndex += 1;
                logicCommunalPage.Show(() => { });
                }
                else
                {
                    var logicCommunalPage = new LogicCommunalPage { };
                    UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                    UserView.HomePage.Instance.PageIndex += 1;
                    logicCommunalPage.Show(() => { });
                }
            };
        }


 ZigbeeApp/Shared/R.cs

@@ -718,6 +718,7 @@
        public readonly static int tiplocktextnull = 5379;
        public readonly static int openmode = 5380;
        public readonly static int addnull = 5381;
        public readonly static int look = 5382;

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