2019.12.3

gxc

2019-12-03 a7a6907b3df65db9c4b2bb1237f709db5c985b52

 ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs

@@ -23,7 +23,7 @@
        /// <summary>
        /// sceneImg
        /// </summary>
        private Button sceneImg;
        private ImageView sceneImg;

        /// <summary>
        /// SceneCategoryView
@@ -64,15 +64,16 @@
            };
            AddChidren(sceneRowLayout);

            sceneImg = new Button()
            sceneImg = new ImageView()
            {
                X = Application.GetRealWidth(179),
                Width = Application.GetRealWidth(844),
                Height = Application.GetRealHeight(400),
                UnSelectedImagePath = scene.IconPath,
                ImagePath = scene.IconPathType == 0 ? scene.IconPath : System.IO.Path.Combine(Config.Instance.FullPath, scene.IconPath),
                Radius = (uint)Application.GetRealHeight(17)
            };
            sceneRowLayout.AddChidren(sceneImg);
            sceneImg.SetViewShadow(true);

            var leftFL = new FrameLayout
            {
@@ -314,19 +315,18 @@
                CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.ControlSceneFail);
            }

            var times = scene.SceneDelayTime;
            scene.RemainTime = times;
            scene.RemainTime = scene.SceneDelayTime;
            scene.SceneDelayTime = 0;
            new System.Threading.Thread(() =>
            {
                while (times > 0)
                while (scene.RemainTime > 0)
                {
                    System.Threading.Thread.Sleep(1000);
                    Application.RunOnMainThread(() =>
                    {
                        SetTimeText(CommonFormResouce.GetTimeString(times));
                        SetTimeText(CommonFormResouce.GetTimeString(scene.RemainTime));
                    });
                    times -= 1;
                    scene.RemainTime -= 1;
                }
                Application.RunOnMainThread(() =>
                {