合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs

@@ -13,36 +13,26 @@


        /// <summary>

        /// 画面显示(底层会固定调用此方法，借以完成画面创建)

        /// </summary>

        /// <param name="i_deviceDiv">设备区分</param>
        public void ShowForm(string i_deviceDiv)
        /// </summary>
        public void ShowForm()
        {
            //设置头部信息
            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uSearchHelp));

            //初始化中部信息
            this.InitMiddleFrame(i_deviceDiv);
            this.InitMiddleFrame();
        }

        /// <summary>

        /// 初始化中部信息

        /// </summary>

        /// <param name="deviceDiv">设备区分</param>
        private void InitMiddleFrame(string i_deviceDiv)
        /// </summary>
        private void InitMiddleFrame()
        {

            //清空bodyFrame

            this.ClearBodyFrame();



            if (i_deviceDiv == "Device")

            {

                //初始化设备帮助控件

                this.InitDeviceHelpControl();

            }

            else

            {

                //初始化网关帮助控件

                this.InitGatewayHelpControl();

            }
            //初始化设备帮助控件

            this.InitDeviceHelpControl();
        }



        /// <summary>

@@ -52,6 +42,7 @@
        {

            //设备添加指引

            var btnHelp1 = new NormalViewControl(942, 60, true);

            btnHelp1.IsBold = true;

            btnHelp1.TextID = R.MyInternationalizationString.uAddDeviceHelp1;

            btnHelp1.X = ControlCommonResourse.XXLeft;

            btnHelp1.Y = Application.GetRealHeight(58);

@@ -91,14 +82,6 @@
            btnHelp5.TextSize = 12;

            btnHelp5.TextColor = UserCenterColor.Current.TextGrayColor3;

            bodyFrameLayout.AddChidren(btnHelp5);

        }



        /// <summary>

        /// 初始化网关帮助控件

        /// </summary>

        private void InitGatewayHelpControl()

        {



        }



        #endregion