2019-11-05-2

WJC

2019-11-05 dc7747b7997222a58ced3017bcfcf53c45e21359

2019-11-05-2

 ZigbeeApp/.DS_Store

Binary files differ

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

@@ -2,13 +2,10 @@
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Send.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicCommunalPage.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="540" Column="65" />
      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="21" Column="110" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="897" Column="58" />
      <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="329" Column="103" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -18,7 +15,7 @@
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="Send.cs" selected="True" />
                    <Node name="LogicCommunalPage.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True" />

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

Binary files differ

 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019101801" android:installLocation="auto" android:versionName="1.0.19101801">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019110501" android:installLocation="auto" android:versionName="1.0.19101801">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" />
    <permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />

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

@@ -302,6 +302,7 @@

                    Btncomplete.MouseUpEventHandler += (sender3, e3) =>
                    {
                        string userIdstr = "", openModestr="";
                        var deviceConditionsInfo = new Dictionary<string, string>();
                        var userdictionary = new Dictionary<string, string>();
                        deviceConditionsInfo.Add("Type", "1");
@@ -316,7 +317,16 @@
                        userdictionary.Add("Account",accountname);
                        userdictionary.Add("Type", "1");
                        userdictionary.Add("UserId", userId);

                        if (edit)
                        {
                            openModestr = editdeviceConditionsInfo["AttriButeId"];
                            userIdstr = editdeviceConditionsInfo["AttriButeData2"];
                        }
                        else
                        {
                            openModestr = deviceConditionsInfo["AttriButeId"];
                            userIdstr = deviceConditionsInfo["AttriButeData2"];
                        }
                        if (SelectedDeviceStatuscondition != "")
                        {
                            bool add = false;
@@ -326,13 +336,13 @@
                                {
                                    if ((Common.Logic.CurrentLogic.Conditions[i]["MacAddr"] == common.DeviceAddr) && (Common.Logic.CurrentLogic.Conditions[i]["Epoint"] == common.DeviceEpoint.ToString()))
                                    {
                                        if (Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"] == editdeviceConditionsInfo["AttriButeId"] && Common.Logic.CurrentLogic.Conditions[i]["AttriButeData2"] == editdeviceConditionsInfo["AttriButeData2"])
                                        if (Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"] == openModestr && Common.Logic.CurrentLogic.Conditions[i]["AttriButeData2"] == userIdstr)
                                        {
                                            Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
                                            Common.Logic.CurrentLogic.Conditions.Insert(i, deviceConditionsInfo);
                                            for (int j = 0; j < Common.Logic.CurrentLogic.Accounts.Count; j++)
                                            {
                                                if (Common.Logic.CurrentLogic.Accounts[j]["UserId"] == editdeviceConditionsInfo["AttriButeData2"])
                                                if (Common.Logic.CurrentLogic.Accounts[j]["UserId"] == userIdstr)
                                                {
                                                    Common.Logic.CurrentLogic.Accounts.RemoveAt(j);
                                                    Common.Logic.CurrentLogic.Accounts.Insert(j, userdictionary);