新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

@@ -9,7 +9,7 @@
namespace Shared.Phone.UserCenter.DeviceBind
{
    /// <summary>
    /// 按键管理
    /// 普通面板的绑定界面【可绑定多个目标】
    /// </summary>
    public class BindTargetsPage : BindCommonLayout
    {
@@ -85,7 +85,7 @@
                    localDeviceList.Clear();
                    scList.Clear();
                    //获取本地设备列表
                    foreach (var dev in Shared.Common.LocalDevice.Current.listAllDevice)
                    foreach (var dev in HdlDeviceCommonLogic.Current.listAllDevice)
                    {
                        localDeviceList.Add(dev);
                    }
@@ -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
                }
@@ -629,7 +622,7 @@
            btnDel.ButtonClickEvent += async (sender, e) =>
            {
                string msg = Language.StringByID(R.MyInternationalizationString.ClearAllTargets).Replace("{0}", "\r\n");
                var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
                var alert = new ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
                alert.Show();
                //使用确认型弹框时,的回调函数
                alert.ConfirmClickEvent += () =>
@@ -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;