2020-05-18-4

陈嘉乐

2020-05-18 e96e11d6f8b965ea522c983e040d41e3b9ef105a

2020-05-18-4

查找出自动化为什么丢失，网关回复type错误；

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

@@ -1,21 +1,18 @@
<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/DoorLock/DoorLockCommonInfo.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Method.cs">
    <Files>
      <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="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="806" Column="15" />
      <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" />
      <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" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -34,6 +31,7 @@
                  <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">
@@ -42,9 +40,7 @@
                      <Node name="MessageControls" expanded="True" />
                    </Node>
                  </Node>
                  <Node name="DoorLock" expanded="True">
                    <Node name="DoorLockCommonInfo.cs" selected="True" />
                  </Node>
                  <Node name="DoorLock" expanded="True" />
                </Node>
              </Node>
            </Node>

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

Binary files differ

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

@@ -531,6 +531,10 @@
                            case 8:
                                {
                                    var accounts1 = new JObject();
                                    if (dictionary.ContainsKey("Type"))
                                    {
                                        accounts1.Add("Type", dictionary["Type"]);
                                    }
                                    if (dictionary.ContainsKey("Option4"))
                                    {
                                        accounts1.Add("Option4", dictionary["Option4"]);

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

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

        /// <summary>
        /// 标记显示执行日期(用网关的，还是用系统的时间)
        /// </summary>
        public bool _if = false;
        /// <summary>
        /// 时间戳
        /// </summary>
@@ -94,7 +97,6 @@
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
            };
            middle.AddChidren(fLayout);
            ModeView();
            #endregion
            #region 常开自动化
            ///第三块第一级父控件
@@ -108,7 +110,7 @@
            };
            middle.AddChidren(listLogicFl);
            listLogicFl.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);

            ModeView();
            ///添加常开自动化的父控件
            var addLogicfL = new FrameLayout
            {
@@ -282,6 +284,7 @@
                                Send.DelLogic(logicId);
                            }
                            Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
                            _if = false;
                            ModeView();
                        }
                        else
@@ -304,8 +307,8 @@
                var timeTextBtn = new Button
                {
                    Y = Application.GetRealHeight(127 + 69),
                    X = Application.GetRealWidth(125),
                    Width = Application.GetRealWidth(634 + 200),
                    X = Application.GetRealWidth(86),//125
                    Width = Application.GetRealWidth(907),//634 + 200
                    Height = Application.GetRealHeight(60),
                    TextSize = 15,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -313,6 +316,10 @@
                if (logicId != 0)
                {
                    openModeFl.AddChidren(timeTextBtn);
                    if (_if)
                    {

                        ///第一次进来读取网关时间；
                    var datetime = GetLocalTime(timeLong);
                    ///有时效性常开才显示时间条件文本
                    var y = datetime.Year.ToString();//那一年
@@ -329,8 +336,30 @@
                    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;
                    timeTextBtn.Text = text1 + m + text3 + d + text4 + h + text5 + minute.ToString() + text6;
                        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();//那一月
                        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;//分钟
                        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;
                    }
                }


@@ -419,6 +448,7 @@
                                          logicId = addResult;
                                          timeValue = int.Parse(str);
                                          Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
                                          _if = false;
                                          ModeView();
                                          ///添加APP开启常开模式的历史记录
                                          UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
@@ -450,6 +480,11 @@
            listLogicFl.Height = Application.GetRealHeight(Method.H - 184) - fLayout.Height;
            listLogicFl.Width = Application.GetRealWidth(1022);
            listLogicFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;

           // 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);
        }
        /// <summary>
        /// 读取自动化列表数据；

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

@@ -1058,6 +1058,7 @@
                UserView.HomePage.Instance.AddChidren(addLogicPage);
                UserView.HomePage.Instance.PageIndex += 1;
                addLogicPage.Show();
                addLogicPage._if = true;
                addLogicPage.action += (w) =>
                {
                    doorLock.IsDoorLockNormallyMode = w;