合并了新代码

黄学彪

2020-08-11 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb

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

@@ -14,7 +14,7 @@
        /// 构造函数
        /// </summary>
        /// <param name="device"></param>
        /// <param name="deviceBindType">1:新风;2:温度传感器;3:湿度传感器;4:PM2.5传感器;5:空调目标</param>
        /// <param name="deviceBindType">1:新风;2:温度传感器;3:湿度传感器;4:PM2.5传感器;5:空调目标,6:地暖目标【暂时没做，因为没有该设备，后期增加】</param>
        /// <param name="bindDev">绑定目标 </param>
        public PaneTargetsBaseForm(CommonDevice device, CommonDevice bindDev, DeviceBind.BindInfo.BindType deviceBindType)
        {
@@ -68,6 +68,7 @@
        /// 3:湿度传感器
        /// 4:PM2.5传感器
        /// 5:空调目标
        /// 6:地暖目标【暂时没做，因为没有该设备，后期增加】
        /// </summary>
        DeviceBind.BindInfo.BindType curDeviceBindType = 0;
        /// <summary>
@@ -131,6 +132,10 @@
        /// </summary>
        public Action<string> actionAcTarget = null;
        /// <summary>
        /// Fh绑定目标回调
        /// </summary>
        public Action<string> actionFhTarget = null;
        /// <summary>
        /// 是否能刷新
        /// </summary>
        private bool canFresh = false;
@@ -172,6 +177,9 @@
                    break;
                case DeviceBind.BindInfo.BindType.AC:
                    titleText = Language.StringByID(R.MyInternationalizationString.AcTargets);
                    break;
                case DeviceBind.BindInfo.BindType.Fh:
                    titleText = Language.StringByID(R.MyInternationalizationString.uFloorHeatingTarget);
                    break;
            }
            this.TopFrameLayout(this, titleText);
@@ -260,7 +268,7 @@
                TextAlignment = TextAlignment.CenterLeft,
            };
            bottomTipPicFrameLayout.AddChidren(btnTipText);
            bottomTipPicFrameLayout.Width = btnTipPicFrameLayout.Width + Application.GetMinReal(2) + btnTipText.GetTextWidth();
            bottomTipPicFrameLayout.Width = btnTipPicFrameLayout.Width + Application.GetMinReal(12) + btnTipText.GetTextWidth();
            bottomTipPicFrameLayout.Gravity = Gravity.CenterHorizontal;

            EventHandler<MouseEventArgs> eHandlerEmptyTargets = (sender, e) =>
@@ -389,7 +397,7 @@
                    }
                }

                if (index == roomTempList.Count - 1 && index > 3)
                if (index == roomTempList.Count - 1 && index > 2)
                {
                    var btnRoomFrameLayoutEmpty = new FrameLayout
                    {