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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs

@@ -210,6 +210,11 @@
                    btnOpen.TextColor = UserCenterColor.Current.TextColor1;

                    seekBar.Enable = true;

                    seekBar.ProgressColor = 0xfffdb500;

                    if (seekBar.Progress == 0)

                    {

                        seekBar.Progress = 100;

                        btnPersent.Text = "100%";

                    }



                    //关 不可用

                    btnClose.TextColor = UserCenterColor.Current.TextGrayColor3;