合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

 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")
            {
               

            }
        }

@@ -314,7 +314,7 @@
            UserView.HomePage.Instance.AddChidren(detailInfo);
            UserView.HomePage.Instance.PageIndex += 1;
            detailInfo.Show(device, room);
            detailInfo.action = () =>
            detailInfo.EditAction = (d,r) =>
            {
                Show(device, room);
            };
@@ -448,6 +448,8 @@

            InitProgressBtn(itemView);

            InitProgressBtn(itemView);

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