场景编辑操作修改

wxr

2022-08-30 ab2e9523bfaff199584fbae3797b38e81fd591de

场景编辑操作修改

 Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs

@@ -56,8 +56,11 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
#if DEBUG
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
#else
        public const string GlobalRequestHttpsHost = "https://bahrain-gateway.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
#endif
        /// <summary>
        /// 
        /// </summary>

 Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs

@@ -203,7 +203,7 @@
                    Application.RunOnMainThread (() => {
                        MainPage.Loading.Hide ();
#if DEBUG
                        upLoadLink = true;
                        //upLoadLink = true;
#endif

                        //平台迁移数据处理 wxr 2022-06-14 13:37:49

 Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs

@@ -198,7 +198,6 @@
                        };
                        sceneView.AddChidren (btnSceneName);
                        var btnBGC = new Button () {
                            //UnSelectedImagePath = "Item/sss.png",
                            UnSelectedImagePath = "Item/Transparent.png",
                            SelectedImagePath = "Item/SceneSettingBackground.png",
                            TextAlignment = TextAlignment.BottomCenter,
@@ -208,15 +207,27 @@
                        };
                        sceneView.AddChidren (btnBGC);

                        btnBGC.MouseLongEventHandler += (sender, e) => {
                        var btnSetSceneIcon = new Button () {
                            UnSelectedImagePath = "Item/More2.png",
                            SelectedImagePath = "Item/Transparent.png",
                            Height = Application.GetRealHeight (50),
                            Width = Application.GetRealWidth (60),
                            X = Application.GetRealWidth (240),
                            Y = Application.GetRealHeight (10),
                        };
                        sceneView.AddChidren (btnSetSceneIcon);

                        btnSetSceneIcon.MouseUpEventHandler += (sender, e) => {//MouseLongEventHandler
                            //if (string.IsNullOrEmpty (scene.Name))
                            //    return;
                            btnSetSceneIcon.IsSelected = true;
                            LongPressFrameLayout = new FrameLayout () {
                                BackgroundColor = SkinStyle.Current.SceneTransparentBackColor,
                            };
                            sceneView.AddChidren (LongPressFrameLayout);
                            LongPressFrameLayout.MouseUpEventHandler += (sender2, e2) => {
                                LongPressFrameLayout.RemoveFromParent ();
                                btnSetSceneIcon.IsSelected = false;
                            };

                            var btnEditor = new Button () {

 Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserScenePage.cs

@@ -137,7 +137,6 @@
                        sceneView.AddChidren (btnSceneName);
                    
                        var btnBGC = new Button () {
                            //UnSelectedImagePath = "Item/sss.png",
                            UnSelectedImagePath = "Item/Transparent.png",
                            SelectedImagePath = "Item/SceneSettingBackground.png",
                            TextAlignment = TextAlignment.BottomCenter,
@@ -147,14 +146,28 @@
                        };
                        sceneView.AddChidren (btnBGC);

                        btnBGC.MouseLongEventHandler += (sender, e) => {
                        var btnSetSceneIcon = new Button () {
                            UnSelectedImagePath = "Item/More2.png",
                            SelectedImagePath = "Item/Transparent.png",
                            Height = Application.GetRealHeight (50),
                            Width = Application.GetRealWidth (60),
                            X = Application.GetRealWidth(240),
                            Y = Application.GetRealHeight(10),
                        };


                        sceneView.AddChidren (btnSetSceneIcon);
                        //btnBGC.MouseLongEventHandler += (sender, e) => {
                        btnSetSceneIcon.MouseUpEventHandler += (sender, e) => {
                            if (string.IsNullOrEmpty (scene.Name))
                                return;
                            btnSetSceneIcon.IsSelected = true;
                            LongPressFrameLayout = new FrameLayout () {
                                BackgroundColor = SkinStyle.Current.SceneTransparentBackColor,
                            };
                            LongPressFrameLayout.MouseUpEventHandler += (sender2, e2) => {
                                LongPressFrameLayout.RemoveFromParent ();
                                btnSetSceneIcon.IsSelected = false;
                            };
                            sceneView.AddChidren (LongPressFrameLayout);


 Crabtree/SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs

@@ -223,8 +223,10 @@

            if (!getTimerList () || sss) {
                var dd = GetTimerBackupBean ();
                if (dd != null) {
                TimerBakeupFileDetailedInformation (dd.id);
            }
            }

            //6.标记迁移数据完成
            HttpServerRequest.Current.Mark (UserConfig.Instance.CurrentRegion.Id);