2020-05-28-1

陈嘉乐

2020-05-18 3292b5b7fe6c14476df002d78bf186e80f2aab08

2020-05-28-1

 .DS_Store

Binary files differ

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

@@ -1,13 +1,10 @@
<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/Device/Logic/SkipView.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="323" Column="92" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="52" Column="62" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="63" Column="61" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="618" Column="41" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="891" Column="60" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="489" Column="36" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="10" Column="2" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -18,7 +15,7 @@
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True" />
                    <Node name="SoneLogicList.cs" selected="True" />
                    <Node name="SkipView.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
@@ -27,6 +24,7 @@
                      <Node name="MessageControls" expanded="True" />
                    </Node>
                  </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

@@ -526,6 +526,20 @@
                                    accounts.Add(location);
                                }
                                break;
                            case 8:
                                {
                                    var accounts1 = new JObject();
                                    if (dictionary.ContainsKey("Option4"))
                                    {
                                        accounts1.Add("Option4", dictionary["Option4"]);
                                    }
                                    if (dictionary.ContainsKey("Option2"))
                                    {
                                        accounts1.Add("Option2", int.Parse(dictionary["Option2"]));
                                    }
                                    accounts.Add(accounts1);
                                }
                                break;
                        }

                    }

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

@@ -725,6 +725,7 @@
            actionsInfo.Add("PassData", "055704010113");//默认门锁常关

            Dictionary<string, string> accounts = new Dictionary<string, string>();
            accounts.Add("Type", "8");
            accounts.Add("Option4", common.DeviceAddr.ToString());//用于判断识别是哪个门锁;
            accounts.Add("Option2", common.DeviceEpoint.ToString());


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

@@ -164,6 +164,7 @@
                actionsInfo.Add("Epoint", "200");
                actionsInfo.Add("PassData", "055704010113");//默认门锁常关
                Dictionary<string, string> accounts = new Dictionary<string, string>();
                accounts.Add("Type", "8");
                accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//用于判断识别是哪个门锁;
                accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
                //new一个新逻辑对象；