Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs

@@ -30,7 +30,7 @@
        /// </summary>

        public bool SetCanSelect

        {

            set 
            set

            {

                m_SetCanSelect = value;

            }

@@ -111,7 +111,7 @@


            var form = new BottomItemSelectForm();

            form.CancelCallEvent = true;//允许取消

            form.AddForm(title, listText, nowSelectNo - 1);

            form.AddForm(title, listText, null, nowSelectNo - 1);

            form.FinishSelectEvent += (selectNo) =>

            {

                if (selectNo == nowSelectNo - 1)

@@ -128,7 +128,7 @@
                {

                    //设置功能类型到网关

                    var result = Common.LocalDevice.Current.SendDeviceFunctionTypeToGateway(this.device, (DeviceFunctionType)nowSelectNo);

                    


                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        if (result == true)

@@ -137,7 +137,7 @@
                            this.RefreshDfunctionType();



                            //设备改变功能类型的话,主页需要重新刷新

                            UserView.UserPage.Instance.RefreshForm = true;

                            UserView.UserPage.Instance.RefreshAllForm = true;



                            //调用回调函数

                            this.FinishSelectEvent?.Invoke(nowSelectNo);