2020-05-18-3

陈嘉乐

2020-05-18 796c8eef0f690d0d04e14db1ecd3d365ed604017

2020-05-18-3

修改显示文本

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

@@ -1,19 +1,21 @@
<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/SoneLogicList.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="42" Column="36" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="786" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="453" Column="14" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1088" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="744" Column="32" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="302" Column="76" />
      <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="806" Column="15" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="224" Column="51" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="61" Column="23" />
      <File FileName="Shared/Common/Logic.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="328" Column="30" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="836" Column="41" />
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="67" Column="14" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="1088" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -31,7 +33,7 @@
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True" />
                    <Node name="SoneLogicList.cs" selected="True" />
                    <Node name="LogicView" expanded="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
@@ -40,7 +42,9 @@
                      <Node name="MessageControls" expanded="True" />
                    </Node>
                  </Node>
                  <Node name="DoorLock" expanded="True" />
                  <Node name="DoorLock" expanded="True">
                    <Node name="DoorLockCommonInfo.cs" selected="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
@@ -50,7 +54,9 @@
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <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.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />

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

Binary files differ

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

@@ -717,11 +717,12 @@
            timeConditionsInfo.Add("DelayTime", "0");
            timeConditionsInfo.Add("StartHour", h);
            timeConditionsInfo.Add("StartMin", m);
            timeConditionsInfo.Add("DoorLockOpenDelayTime", timeVlaue.ToString());
            timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue*60*60).ToString());
            //timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).ToString());
            Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
            actionsInfo.Add("LinkType", 8);
            actionsInfo.Add("DeviceAddr", common.DeviceAddr);
            actionsInfo.Add("Epoint", common.DeviceEpoint);
            actionsInfo.Add("Epoint", "200");
            actionsInfo.Add("PassData", "055704010113");//默认门锁常关

            Dictionary<string, string> accounts = new Dictionary<string, string>();

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

@@ -31,6 +31,11 @@
        /// 记录选中时间
        /// </summary>
        public int timeValue = 0;

        /// <summary>
        /// 时间戳
        /// </summary>
        public int timeLong = 0;
        public async void Show()
        {
           
@@ -73,6 +78,8 @@
                        //进来更新一次值
                        logicId = logic.LogicId;
                        timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
                        timeLong = int.Parse(logic.Conditions[0]["TriggerTime"]);

                    }
                    catch { }
                }
@@ -306,15 +313,16 @@
                if (logicId != 0)
                {
                    openModeFl.AddChidren(timeTextBtn);
                    var datetime = GetLocalTime(timeLong);
                    ///有时效性常开才显示时间条件文本
                    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"));//小时
                    int dayInt = (h + timeValue) / 24;//算出几天后执行
                    int hour = (h + timeValue) % 24;//算出几天后那个时间执行
                    int days = int.Parse(d) + dayInt;
                    int minute = DateTime.Now.Minute;//分钟
                    var y = datetime.Year.ToString();//那一年
                    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);
@@ -322,7 +330,7 @@
                    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;
                    timeTextBtn.Text = text1 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
                    timeTextBtn.Text = text1 + m + text3 + d + text4 + h + text5 + minute.ToString() + text6;
                }


@@ -663,5 +671,16 @@
            }
        }
     
        /// <summary>
        /// 将UNIX时间戳转换成系统时间(精确到秒)
        /// <returns></returns>
        public DateTime GetLocalTime(int unixTimeStamp)
        {
            DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
            long lTime = long.Parse(unixTimeStamp + "0000000");
            TimeSpan toNow = new TimeSpan(lTime);
            DateTime dtResult = dtStart.Add(toNow);
            return dtResult;
        }
    }
}