2020-05-19-1

陈嘉乐

2020-05-19 d01084d99dd3cf12e89bb32135f84f13970500f9

2020-05-19-1

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

@@ -1,58 +1,23 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Method.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1088" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="742" Column="13" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="677" Column="45" />
      <File FileName="GateWay.Droid/Assets/Language.ini" Line="547" Column="13" />
      <File FileName="Shared/R.cs" Line="842" Column="55" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1061" Column="30" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="197" Column="18" />
      <File FileName="Shared/Common/Logic.cs" Line="66" Column="98" />
      <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="328" Column="29" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="767" Column="50" />
      <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" />
    </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 name="Method.cs" selected="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>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches>
    <Watch file="../../../Shared/Phone/Device/Logic/SoneLogicList.cs" line="315" offsetX="-1" offsetY="-1" expression="timeLong" liveUpdate="False" />
  </MonoDevelop.Ide.DebuggingService.PinnedWatches>
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />

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

Binary files differ

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

@@ -316,6 +316,12 @@
                if (logicId != 0)
                {
                    openModeFl.AddChidren(timeTextBtn);
                    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.hour1);
                    string text6 = Language.StringByID(MyInternationalizationString.executeSone);
                    if (_if)
                    {

@@ -326,23 +332,12 @@
                        var m = datetime.Month.ToString();//那一月
                        var d = datetime.ToString("dd");//那一天
                        var h = int.Parse(datetime.ToString("HH"));//小时
                                                                   // int dayInt = (h + timeValue) / 24;//算出几天后执行
                                                                   // int hour = (h + timeValue) % 24;//算出几天后那个时间执行
                                                                   // int days = int.Parse(d) + dayInt;
                        int minute = datetime.Minute;//分钟
                        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.hour1);
                        string text6 = Language.StringByID(MyInternationalizationString.executeSone);
                        timeTextBtn.Text = text1 + y + text2 + m + text3 + d + text4 + h + text5 + minute.ToString() + text6;

                    }
                    else
                    {



                        ///有时效性常开才显示时间条件文本
                        var y = DateTime.Now.Year.ToString();//那一年
                        var m = DateTime.Now.Month.ToString();//那一月
@@ -352,12 +347,6 @@
                        int hour = (h + timeValue) % 24;//算出几天后那个时间执行
                        int days = int.Parse(d) + dayInt;
                        int minute = DateTime.Now.Minute;//分钟
                        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.hour1);
                        string text6 = Language.StringByID(MyInternationalizationString.executeSone);
                        timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
                    }
                }
@@ -481,10 +470,10 @@
            listLogicFl.Width = Application.GetRealWidth(1022);
            listLogicFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;

           // verticalRefresh.Y = Application.GetRealHeight(187); 
           // verticalRefresh.X = Application.GetRealWidth(46);
            verticalRefresh.Y = Application.GetRealHeight(187); 
            verticalRefresh.X = Application.GetRealWidth(46);
            verticalRefresh.Height = listLogicFl.Height - Application.GetRealHeight(187);//动态改动上下滑动view高度;
            //verticalRefresh.Width = listLogicFl.Width - Application.GetRealWidth(46);
            verticalRefresh.Width = listLogicFl.Width - Application.GetRealWidth(46);
        }
        /// <summary>
        /// 读取自动化列表数据；