合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs

@@ -457,18 +457,11 @@
                    }
                    if (isExistScene)
                    {
                        curSceneUI = HdlSceneLogic.Current.GetSceneUIBySceneId(bindDevice.BindScenesId);

                        curSceneUI = HdlSceneLogic.Current.GetSceneUIBySceneId(bindDevice.BindScenesId);
                        devicePic.UnSelectedImagePath = "Scene/SceneIcon.png";
                        if (curSceneUI == null)
                        {
                            if (string.IsNullOrEmpty(bindDevice.ESName))
                            {
                                btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + "ID" + "_" + bindDevice.BindScenesId.ToString();
                            }
                            else
                            {
                                btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + bindDevice.ESName;
                            }
                            btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + "ID" + "_" + bindDevice.BindScenesId.ToString();
                        }
                        else
                        {
@@ -524,13 +517,13 @@
                                            btnFloorRoomNameText = tempDevFloorName + "," + tempDevRoomName;
                                        }
                                    }
                                }

                                }
                                else
                                {
                                    btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
                                }


                                devicePic.UnSelectedImagePath = tempDev.IconPath;


                                devicePic.UnSelectedImagePath = tempDev.IconPath;
                                devicePic.Text = "";

                                if (string.IsNullOrEmpty(tempDev.DeviceEpointName))
@@ -557,8 +550,8 @@
                    rowLayout.frameTable.AddBottomLine();
                    var btnDel = rowLayout.AddDeleteControl();
                    btnDel.ButtonClickEvent += (sender, e) =>
                    {

                        RemoveTargets(bindDevice, btnDel);

                    {
                        RemoveTargets(bindDevice, btnDel);
                    };
                    #endregion
                }
@@ -1003,7 +996,7 @@
        /// <param name="btnDel"></param>
        /// <returns></returns>
        private int RemoveTargets(BindListResponseObj bindDevice, Button btnDel)
        {

        {
            int result = -1;
            var delDevice = new DelDeviceBindData();
            delDevice.DeviceAddr = currentKey.DeviceAddr;