2019-11-05-1

WJC

2019-11-05 863b530a1b95d59aee08d1cfa791ee8a1984596c

2019-11-05-1

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

@@ -2,13 +2,13 @@
  <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/LogicCommunalPage.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Send.cs">
    <Files>
      <File FileName="Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs" Line="45" Column="31" />
      <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="1929" Column="22" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="17" Column="33" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="905" Column="14" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="718" Column="47" />
      <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" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -18,13 +18,10 @@
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True" />
                    <Node name="LogicCommunalPage.cs" selected="True" />
                    <Node name="Send.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="DoorLock" expanded="True" />
                </Node>
                <Node name="UserCenter" expanded="True" />
                <Node name="ZigBee" expanded="True">
                  <Node name="Device" expanded="True" />
                </Node>

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

Binary files differ

 ZigbeeApp/GateWay.Ios/Resources/Phone/.DS_Store

Binary files differ

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

@@ -16,23 +16,12 @@
        Button selectedIcon = new Button();
        public static Action action;
        public static bool edit=false;
        Dictionary<string, string> deviceConditionsInfo = new Dictionary<string, string>();
        Dictionary<string, string> userdictionary = new Dictionary<string, string>();
      

        public async void Show(CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo=null)
        {
         
            if (!edit)
            {
                deviceConditionsInfo.Add("Type", "1");
                deviceConditionsInfo.Add("IsValid", "1");
                deviceConditionsInfo.Add("MacAddr", common.DeviceAddr);
                deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
                deviceConditionsInfo.Add("Cluster_ID", "64529");
                deviceConditionsInfo.Add("AttriButeData1", "2");
                deviceConditionsInfo.Add("Range", "0");
                editdeviceConditionsInfo = deviceConditionsInfo;
            }
           
            UserView.HomePage.Instance.ScrollEnabled = false;
            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
            #region  最上面的布局代码
@@ -214,8 +203,8 @@
                    };
                    lockRow.AddChidren(Btncomplete);
                    #endregion

                    string SelectedDeviceStatuscondition = "";
                    ///定两个变量记录之前的只值；
                    string userId = "", openMode = "", accountname="", SelectedDeviceStatuscondition = "";
                    lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50);
                    lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
                    for (int i = 0; i < user.UserIdMode.Count; i++)
@@ -285,48 +274,27 @@
                            selectedIcon.Visible = false;
                            selectedIcon = doorlockSelected;
                            doorlockSelected.Visible = true;
                            userId = userifon.UserId;
                            openMode = userifon.OpenMode.ToString();
                            accountname = Btntitle.Text + doorlockBtn.Text;
                            //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                            if (deviceConditionsInfo.ContainsKey("AttriButeId"))
                            {
                                deviceConditionsInfo.Remove("AttriButeId");
                            }
                            if (deviceConditionsInfo.ContainsKey("AttriButeData2"))
                            {
                                deviceConditionsInfo.Remove("AttriButeData2");
                            }
                            deviceConditionsInfo.Add("AttriButeId", userifon.OpenMode.ToString());
                            deviceConditionsInfo.Add("AttriButeData2", userifon.UserId);

                            if (userdictionary.ContainsKey("Account"))
                            {
                                userdictionary.Remove("Account");
                            }
                            if (userdictionary.ContainsKey("Type"))
                            {
                                userdictionary.Remove("Type");
                            }
                            if (userdictionary.ContainsKey("UserId"))
                            {
                                userdictionary.Remove("UserId");
                            }
                            userdictionary.Add("Account", Btntitle.Text+doorlockBtn.Text);
                            userdictionary.Add("Type", "1");
                            userdictionary.Add("UserId", userifon.UserId);
                        };
                        doorlockRow.MouseUpEventHandler += doorlockclick;
                        doorlockBtn.MouseUpEventHandler += doorlockclick;
                        doorlockSelected.MouseUpEventHandler += doorlockclick;
                        doorlockfra.MouseUpEventHandler += doorlockclick;
                        if (edit&&editdeviceConditionsInfo!=null)

                        if (edit && editdeviceConditionsInfo != null)
                        {
                            deviceConditionsInfo = editdeviceConditionsInfo;
                            
                            if (editdeviceConditionsInfo["AttriButeData2"] == userifon.UserId.ToString())
                            {
                                selectedIcon.Visible = false;
                                selectedIcon = doorlockSelected;
                                doorlockSelected.Visible = true;
                            }
                          

                        }

                    }
@@ -334,7 +302,21 @@

                    Btncomplete.MouseUpEventHandler += (sender3, e3) =>
                    {
                    
                        var deviceConditionsInfo = new Dictionary<string, string>();
                        var userdictionary = new Dictionary<string, string>();
                        deviceConditionsInfo.Add("Type", "1");
                        deviceConditionsInfo.Add("IsValid", "1");
                        deviceConditionsInfo.Add("MacAddr", common.DeviceAddr);
                        deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
                        deviceConditionsInfo.Add("Cluster_ID", "64529");
                        deviceConditionsInfo.Add("AttriButeData1", "2");
                        deviceConditionsInfo.Add("Range", "0");
                        deviceConditionsInfo.Add("AttriButeId", openMode);
                        deviceConditionsInfo.Add("AttriButeData2", userId);
                        userdictionary.Add("Account",accountname);
                        userdictionary.Add("Type", "1");
                        userdictionary.Add("UserId", userId);

                        if (SelectedDeviceStatuscondition != "")
                        {
                            bool add = false;

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

@@ -943,7 +943,7 @@
                    for (int j = 0; j < doorlockifonlist.Count; j++)
                    {
                        ///查找成员以及成员门锁触发源(1按键/3卡/15指纹)
                        if (doorlockifonlist[j].CloudAccountId == membershipifon.SubAccountDistributedMark)
                        if (membershipifon.SubAccountDistributedMark == doorlockifonlist[j].CloudAccountId)
                        {
                            LockMode lockMode = new LockMode();
                            lockMode.OpenMode = doorlockifonlist[j].OpenLockMode;