2020-05-18-2

陈嘉乐

2020-05-18 5da99fed2eb0d08b6338064da5f998891252c7b8

2020-05-18-2

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

@@ -1,15 +1,19 @@
<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/UserDoorLockPage.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="39" Column="69" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="810" Column="32" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="11" Column="36" />
      <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="GateWay.Droid/Assets/Language.ini" Line="547" Column="13" />
      <File FileName="Shared/R.cs" Line="842" Column="55" />
      <File FileName="Home.Ios/Resources/Language.ini" Line="554" Column="1" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1061" Column="29" />
      <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/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" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -22,10 +26,12 @@
              <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="SoneLogicList.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
@@ -34,9 +40,7 @@
                      <Node name="MessageControls" expanded="True" />
                    </Node>
                  </Node>
                  <Node name="DoorLock" expanded="True">
                    <Node name="UserDoorLockPage.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/DoorLockLogic/LockLogicList.cs

@@ -103,7 +103,7 @@
                        //for (int a = 0; a < logic.Accounts.Count; a++)
                        //{
                        //    //Option4是设备mac；Option2是设备端口；
                        //    if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
                        //    if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr)
                        //    {
                        //        //查找是否是那个门锁；
                        //        //如果不是该门锁联动事件不显示出来;
@@ -318,29 +318,17 @@
        /// <returns></returns>
        private bool Exist(Common.Logic logic)
        {
            bool yes = false;
            for (int j = 0; j < logic.Accounts.Count; j++)
            {
                //Option4是设备mac；Option2是设备端口；
                if (logic.Accounts[j]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
                if (logic.Accounts[j]["Option4"].ToString() == Send.CurrentDoorLock.DeviceAddr)
                {
                    //查找是否是那个门锁；
                    //如果不是该门锁联动事件不显示出来;
                    yes = false;
                    return true;
                }
                else
                {
                    yes = true;
                }
                //if (logic.Accounts[j]["Account"].ToString() == Config.Instance.Guid)
                //{
                //    //查找自己账号下的创建联动事件；
                //    yes = true;
                //    break;
                //}

            }
            return yes;
            return false;
        }
    }
}

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

@@ -833,7 +833,7 @@
                        }
                        if (LogicView.IfString._SoneLogic == if_logic)
                        {
                            //Sone门锁联动事件逻辑列表
                            //Sone门锁常开模式逻辑列表
                            Common.Logic.SoneLogicList.Add(CurrentLogic);

                        }

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

@@ -35,20 +35,17 @@
                    if (topic == $"{gatewayID}/Logic/GetLogicList_Respon")
                    {

                        Console.WriteLine("打印逻辑返回数据1====");
                        var list = jObjectdata["Data"]["LogicList"];
                        if (list == null)
                        {
                            return;
                        }
                        Console.WriteLine("打印逻辑返回数据2====");
                        foreach (var listIfon in list)
                        {
                            var logicId = int.Parse(listIfon["LogicId"].ToString());
                            logicIdList.Add(logicId);
                           
                        }
                        Console.WriteLine("打印逻辑返回数据3===="+logicIdList.Count.ToString());

                    }
                };

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

@@ -841,22 +841,18 @@
        /// <returns></returns>
        public static bool ExistLogic(Common.Logic logic, ZigBee.Device.DoorLock doorLock)
        {
            bool yes = false;
            for (int j = 0; j < logic.Accounts.Count; j++)
            {
                //Option4是设备mac；Option2是设备端口；
                if (logic.Accounts[j]["Option4"].ToString() != doorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != doorLock.DeviceEpoint.ToString())
                if (logic.Accounts[j]["Option4"].ToString() == doorLock.DeviceAddr)
                {
                    //查找是否是那个门锁；
                    //如果不是该门锁联动事件不显示出来;
                    yes = false;
                    return true;
                }
                else
                {
                    yes = true;
                }

            }
            return yes;
            return false;
        }

    }

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

@@ -501,6 +501,10 @@
            verticalRefresh.RemoveAll();
            foreach (var logic in Common.Logic.SoneLogicList)
            {
                if (!SkipView.ExistLogic(logic, Send.CurrentDoorLock))
                {
                    continue;
                }
                #region  自动化布局View
                ///自动化父控件
                var fLayoutLogic = new FrameLayout
@@ -591,7 +595,7 @@
                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                };
                logicRow.AddRightView(edit);
               

                ///删除
                var del = new Button
                {