2019-12-13-2

WJC

2019-12-13 9c6bd67d66859e48f0e794cd2746aef9310ce71d

2019-12-13-2

最新代码

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

@@ -1,12 +1,10 @@
<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicDevicePage.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicCommunalPage.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="20" Column="31" />
      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="750" Column="59" />
      <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="2059" Column="53" />
      <File FileName="Shared/Common/ZigbeeColor.cs" Line="315" Column="53" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="766" Column="70" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -22,8 +20,9 @@
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Category" expanded="True" />
                  <Node name="Logic" expanded="True">
                    <Node name="LogicDevicePage.cs" selected="True" />
                    <Node name="LogicCommunalPage.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
@@ -31,6 +30,7 @@
                    <Node name="Bind" expanded="True" />
                  </Node>
                </Node>
                <Node name="UserView" expanded="True" />
                <Node name="ZigBee" expanded="True">
                  <Node name="Device" expanded="True" />
                </Node>

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs

@@ -94,7 +94,17 @@
                //关闭刷新View；
                middle.EndHeaderRefreshing();
            };
            Read();
            //Read();
            CommonPage.Loading.Start();
            new System.Threading.Thread(() =>
            {
                Application.RunOnMainThread(() =>
                {
                    Read();
                    CommonPage.Loading.Hide();
                });
            })
            { IsBackground = true }.Start();

        }
        /// <summary>

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

@@ -1992,7 +1992,7 @@
                }

                Common.Logic.CurrentLogic.LogicName = name;

                bool succeed = false;
                //判断是新添加逻辑(默认0)还是修改逻辑
                CommonPage.Loading.Start();
                if (Common.Logic.CurrentLogic.LogicId == 0)
@@ -2001,6 +2001,7 @@
                    var logicifon = await Send.AddModifyLogic(Common.Logic.CurrentLogic);
                    if (logicifon != null && logicifon.LogicId != 0)
                    {
                        succeed = true;
                        Common.Logic.CurrentLogic.LogicId = logicifon.LogicId;
                        Common.Logic.LogicList.Add(Common.Logic.CurrentLogic);
                    }
@@ -2008,10 +2009,18 @@
                else
                {
                    //发送修改逻辑命令
                    Send.AddModifyLogic(Common.Logic.CurrentLogic);
                   var modlogic=Send.AddModifyLogic(Common.Logic.CurrentLogic);
                    //编辑默认成功（不考虑网络情况）；
                    succeed = true;
                }

                CommonPage.Loading.Hide();

                if (!succeed) {
                    //网关回复失败，不关闭界面，让它停留当前界面；
                    //（原因：考虑到失败重新编辑原来数据给用户带来了麻烦）
                    ///提示：添加自动化失败；
                    return;
                }
                UserView.HomePage.Instance.RemoveViewByTag("Logic");
                Category.Category.instance?.RefreshBodyView();
           

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

@@ -99,7 +99,18 @@
                //关闭刷新View；
                middle.EndHeaderRefreshing();
            };
            Read();
            //Read();

            CommonPage.Loading.Start();
            new System.Threading.Thread(() =>
           {
               Application.RunOnMainThread(() =>
               {
                   Read();
                   CommonPage.Loading.Hide();
               });
           })
            { IsBackground = true }.Start();
        }
        /// <summary>
        /// 读取当前门锁的云端数据；
@@ -119,14 +130,12 @@
                }

            }
            CommonPage.Loading.Start();
            if (!d)
            {
                var allMemberslist = await Send.AllMembers(common.DeviceAddr);
                Send.LockList.AddRange(allMemberslist);
            }
            UserList(macport);
            CommonPage.Loading.Hide();
        }
        /// <summary>
        /// 成员列表的方法