2020-05-19-3

陈嘉乐

2020-05-19 34f902db7b768114f6aec18706debbb7ffb5d7f2

2020-05-19-3

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

@@ -1,20 +1,49 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="505" Column="79" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" />
      <File FileName="GateWay.Droid/Assets/Language.ini" />
      <File FileName="Shared/R.cs" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" />
      <File FileName="Shared/Common/Logic.cs" />
      <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="351" Column="8" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="266" Column="57" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="720" Column="71" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="174" Column="50" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1043" Column="38" />
      <File FileName="Shared/Common/Logic.cs" Line="1" Column="1" />
    </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="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True" />
                    <Node name="LogicView" expanded="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True">
                    <Node name="Controls" expanded="True">
                      <Node name="MessageControls" expanded="True" />
                    </Node>
                  </Node>
                  <Node name="DoorLock" expanded="True">
                    <Node name="UserDoorLockPage.cs" selected="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />

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

Binary files differ

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

@@ -65,6 +65,7 @@

            timeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {

                TimeView();
            };
            functionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>

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

@@ -80,7 +80,7 @@
                    {
                        //进来更新一次值
                        logicId = logic.LogicId;
                        timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
                        timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"])/3600;
                        timeLong = int.Parse(logic.Conditions[0]["TriggerTime"]);

                    }
@@ -322,33 +322,35 @@
                    string text4 = Language.StringByID(MyInternationalizationString.numberSone);
                    string text5 = Language.StringByID(MyInternationalizationString.hour1);
                    string text6 = Language.StringByID(MyInternationalizationString.executeSone);
                    string year = "";
                    string month = "";
                    int days =0;
                    int hour =0;
                    int minute =0;
                    
                    if (_if)
                    {

                        ///第一次进来读取网关时间；
                        var datetime = GetLocalTime(timeLong);
                        ///有时效性常开才显示时间条件文本
                        var y = datetime.Year.ToString();//那一年
                        var m = datetime.Month.ToString();//那一月
                        var d = datetime.ToString("dd");//那一天
                        var h = int.Parse(datetime.ToString("HH"));//小时                   
                        int minute = datetime.Minute;//分钟
                        timeTextBtn.Text = text1 + y + text2 + m + text3 + d + text4 + h + text5 + minute.ToString() + text6;

                        year = datetime.Year.ToString();//那一年
                        month = datetime.Month.ToString();//那一月
                        days = int.Parse(datetime.ToString("dd"));//那一天
                        hour = int.Parse(datetime.ToString("HH"));//小时                   
                        minute = datetime.Minute;//分钟
                    }
                    else
                    {

                        ///有时效性常开才显示时间条件文本
                        var y = DateTime.Now.Year.ToString();//那一年
                        var m = DateTime.Now.Month.ToString();//那一月
                        ///在当前界面编辑显示系统时间(不能每一次编辑都去网关拿数据)
                        year = DateTime.Now.Year.ToString();//那一年
                        month = DateTime.Now.Month.ToString();//那一月
                        var d = DateTime.Now.ToString("dd");//那一天
                        var h = int.Parse(DateTime.Now.ToString("HH"));//小时
                        int dayInt = (h + timeValue) / 24;//算出几天后执行
                        int hour = (h + timeValue) % 24;//算出几天后那个时间执行
                        int days = int.Parse(d) + dayInt;
                        int minute = DateTime.Now.Minute;//分钟
                        timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
                        int dayInt = (h + timeValue) / 24;//设置时间+当前系统时间是否超出24小时
                        hour = (h + timeValue) % 24;//设置时间+当前系统时间是否超出24小时剩下多少小时
                        days = int.Parse(d) + dayInt;//当前系统天数+执行后天数
                        minute = DateTime.Now.Minute;//分钟
                    }
                    timeTextBtn.Text = text1 + year + text2 + month + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
                }