2020-05-11-1

陈嘉乐

2020-05-11 26cee91cc3332e09db5cadb9faf76612b1b0c081

2020-05-11-1

修改弹窗更新状态

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

@@ -1,34 +1,31 @@
<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/ZigBee/Device/ZbGateway.cs">
    <Files>
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1441" Column="43" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="10" Column="36" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="12" Column="40" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="772" Column="10" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="151" Column="49" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="31" Column="46" />
      <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="2757" Column="81" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="876" Column="49" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="78" Column="45" />
      <File FileName="Shared/Phone/UserView/HomePage.cs" Line="44" Column="56" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs" Line="712" Column="50" />
      <File FileName="Shared/Phone/ZigBee/Device/ZbGateway.cs" Line="215" Column="7" />
    </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="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="LogicView" expanded="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="DoorLock" expanded="True">
                    <Node name="DoorLockCommonInfo.cs" selected="True" />
                  </Node>
                  <Node name="Logic" expanded="True" />
                </Node>
                <Node name="ZigBee" expanded="True">
                  <Node name="Common" expanded="True" />
                  <Node name="Device" expanded="True" />
                  <Node name="Device" expanded="True">
                    <Node name="ZbGateway.cs" selected="True" />
                  </Node>
                </Node>
              </Node>
            </Node>

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

Binary files differ

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

@@ -29,7 +29,6 @@
        FrameLayout listLogicFl = new FrameLayout();
        ///常开自动化列表上下滑动的控件
        VerticalRefreshLayout verticalRefresh = new VerticalRefreshLayout();

        public async void Show()
        {
            #region  界面的布局代码
@@ -141,7 +140,7 @@

            var addIconclickBtn = new Button
            {
                Width = Application.GetRealWidth(90+69+63),
                Width = Application.GetRealWidth(90 + 69 + 63),
                Height = Application.GetRealHeight(69),
                X = Application.GetRealWidth(800),
                Y = Application.GetRealHeight(60),
@@ -202,6 +201,21 @@
            };
            Read(true);
            #endregion

            DoorLockCommonInfo.LogicAction = (_bool) =>
            {

                try
                {
                    Application.RunOnMainThread(() =>
                    {
                        Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
                        ModeView();
                    });
                }
                catch { }
            };

        }
        /// <summary>
        /// 常开模式开关切换图标界面
@@ -611,35 +625,6 @@
                };

            }
        }


        //public static Action<bool> action1=DoorLockCommonInfo.LogicAction;
     

        /// <summary>
        /// 定时更新常开模式(防止通过门锁关闭没及时刷新状态)
        /// </summary>
        //System.Threading.Thread updateThread;
        //public void UpdateModeIcon()
        //{
        //    updateThread = new System.Threading.Thread(() =>
        //    {
        //        while (this.Parent != null)
        //        {
        //            System.Threading.Thread.Sleep(1000);
        //            Application.RunOnMainThread(() =>
        //            {
        //                try
        //                {
        //                    ModeView();
        //                }
        //                catch { }
                //            });
        //        }
        //    });
        //    updateThread.Start();
        //}


    }
}

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

@@ -770,6 +770,7 @@
        /// </summary>
        public void ClickHandle()
        {
          
            //门锁标题
            btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);