Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs

@@ -38,7 +38,7 @@
        /// 收藏按钮
        /// </summary>
        private Button collectionBtn;
   

        /// <summary>
        /// 开关
        /// </summary>
@@ -47,7 +47,7 @@
        /// 滑条
        /// </summary>
        private WaveSeekBar levelSeekBar;
  


        private Button StatuBtn;
        /// <summary>
@@ -185,7 +185,7 @@
                                        break;
                                }
                            }
                            

                        }
                    }
                    catch (Exception ex)
@@ -196,7 +196,7 @@
            }
            else if (typeTag == "OnlineStatusChange")
            {
               

            }
        }

@@ -448,6 +448,8 @@


            InitProgressBtn(itemView);

            InitProgressBtn(itemView);

            switchBtn = new Button()
            {
                Y = Application.GetRealHeight(1005),