From c00da77d00a479fa5d022346a6d9075f90a5c087 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期六, 14 九月 2024 10:05:34 +0800
Subject: [PATCH] 退出登录时间调整,新风,音乐

---
 HDL_ON/UI/UI1-Login/LoginPage.cs |  222 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 143 insertions(+), 79 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 138474d..434c178 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -18,12 +18,14 @@
             //AddChidren(bodyView);
             bodyView = this;
             //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
-            bodyView.MouseDownEventHandler += (sender, e) => {
+            bodyView.MouseDownEventHandler += (sender, e) =>
+            {
                 Application.HideSoftInput();
             };
             pm = new HttpServerRequest();
 #if __ANDROID__
-            BaseActivity.HideKeyboardEvent = () => {
+            BaseActivity.HideKeyboardEvent = () =>
+            {
                 if (this.Y != 0)
                 {
                     Application.RunOnMainThread(() =>
@@ -36,12 +38,13 @@
                     });
                 }
             };
-            BaseActivity.ShowKeyboardEvent = () => {
+            BaseActivity.ShowKeyboardEvent = () =>
+            {
                 try
                 {
                     if (etPassword.Foucs)
                     {
-                     
+
                         new Thread(() =>
                         {
                             Thread.Sleep(100);
@@ -67,8 +70,9 @@
                 }
                 catch { }
             };
-            BaseActivity.SmsAction = (message) => {
-                Console.WriteLine($"鎺ユ敹鍒扮煭淇★細"+ message);
+            BaseActivity.SmsAction = (message) =>
+            {
+                Console.WriteLine($"鎺ユ敹鍒扮煭淇★細" + message);
 
                 string pattern = @"銆怘DL銆�.*(\d{6}).*";
 
@@ -80,7 +84,7 @@
                 {
                     string code = match.Groups[1].Value;
                     Console.WriteLine("楠岃瘉鐮佷负锛�" + code);
-                    if(loginType==0 && logintMode == 1)
+                    if (loginType == 0 && logintMode == 1)
                     {
                         etPassword.Text = code;
                     }
@@ -104,7 +108,8 @@
             }
 
 #if __ANDROID__
-            BaseActivity.HideKeyboardEvent = () => {
+            BaseActivity.HideKeyboardEvent = () =>
+            {
 
             };
             BaseActivity.ShowKeyboardEvent = () => { };
@@ -116,7 +121,7 @@
             //Application.HideSoftInput();
         }
 
-#region 灞�閮ㄥ彉閲�
+        #region 灞�閮ㄥ彉閲�
         /// <summary>
         /// 鐧诲綍绫诲瀷
         /// 0:鎵嬫満
@@ -135,9 +140,9 @@
         /// 鐭俊楠岃瘉鐮�
         /// </summary>
         string smsCode = "";
-#endregion
+        #endregion
 
-#region 鎺т欢鍒楄〃
+        #region 鎺т欢鍒楄〃
         /// <summary>
         /// 绛夊緟鎻愮ず
         /// </summary>
@@ -230,7 +235,7 @@
         /// 鏈嶅姟鍣ㄨ姹傚璞�
         /// </summary>
         HttpServerRequest pm;
-#endregion
+        #endregion
 
         string verAccount = "";
 
@@ -273,7 +278,8 @@
                 UnSelectedImagePath = "Public/Logo-bg.png"
             };
             bodyView.AddChidren(btnIcon_bg);
-            btnIcon_bg.MouseDownEventHandler += (sender, e) => {
+            btnIcon_bg.MouseDownEventHandler += (sender, e) =>
+            {
                 Application.HideSoftInput();
             };
 
@@ -281,7 +287,7 @@
             btnIcon_bg.MouseUpEventHandler += (sender, e) =>
             {
                 return;
-                
+
             };
 
             bool b = false;
@@ -302,17 +308,19 @@
                     //etAccount.Text = "455740454@qq.com";
                     //etAccount.Text = "13288623489";//缃楁檽涓�
                     //etAccount.Text = "18688414428";//澶╂渤3妤�
-                    //etAccount.Text = "pjh@hdlchina.com.cn";
                     //etAccount.Text = "12345678904";//2.0 娴嬭瘯  钀ょ煶
                     //etAccount.Text = "1272061968@qq.com";//涓囩鍩庡競涔嬪厜E鍖�8鏍�206
                     //etAccount.Text = "marketing@australindo.co.id";
                     //etAccount.Text = "13922115008";//鍒樻��
                     //etAccount.Text = "support7@hdlautomation.com";
                     etAccount.Text = "13336018868";
+                    etAccount.Text = "649362315@qq.com";//钄℃窇濞�
+                    //etAccount.Text = "18402017839";
+                    //etAccount.Text = "13414984501";//鍚存檽鑱�
+                    etAccount.Text = "13682244600";
+                    etAccount.Text = "pjh@hdlchina.com.cn";
                     etAccount.Text = "13580507523";
-                    etAccount.Text = "18402017839";
-
-
+                    etAccount.Text = "15313316909";
                 }
                 else
                 {
@@ -331,31 +339,34 @@
                 }
                 b = !b;
                 etPassword.Text = "123456";
-                if(etAccount.Text == "13336018868")
+                if (etAccount.Text == "13682244600")
                 {
-                    etPassword.Text = "zzy20020928";
+                    etPassword.Text = "asd123456789123";
                 }
-                else if(etAccount.Text == "13580507523")
+                else if (etAccount.Text == "18475593023")
                 {
                     etPassword.Text = "a123456";
-                }else if(etAccount.Text == "13288623489")
+                }
+                else if (etAccount.Text == "13288623489")
                 {
                     etPassword.Text = "luoxiaodong";
-                }else if(etAccount.Text == "15014291819")
+                }
+                else if (etAccount.Text == "15014291819")
                 {
                     etPassword.Text = "hdl123456";
-                }else if (etAccount.Text == "15262988048")
+                }
+                else if (etAccount.Text == "15262988048")
                 {
                     etPassword.Text = "15262988048";
                 }
                 else if (etAccount.Text == "649362315@qq.com")
                 {
                     etPassword.Text = "aa123456";
-                }else if(etAccount.Text == "dcai.assist@gmail.com")
-                {
-                    etPassword.Text = "GraniteTileS57";
                 }
-                //etPassword.Text = "Hdl85521566";
+                else if (etAccount.Text == "13580507523")
+                {
+                    etPassword.Text = "a123456";
+                }
                 btnLogin.IsSelected = true;
             };
 #endif
@@ -376,7 +387,7 @@
 
             btnEmailLogin = new Button()
             {
-                X = btnPhoneLogin.Right ,//+ Application.GetRealWidth(20),
+                X = btnPhoneLogin.Right,//+ Application.GetRealWidth(20),
                 Y = Application.GetRealHeight(177),
                 Width = Application.GetRealWidth(140),
                 Height = Application.GetRealHeight(40),
@@ -386,9 +397,9 @@
                 TextSize = CSS_FontSize.TextFontSize,
             };
             bodyView.AddChidren(btnEmailLogin);
-#endregion
+            #endregion
 
-#region 璐﹀彿濉啓
+            #region 璐﹀彿濉啓
             accountView = new FrameLayout()
             {
                 X = Application.GetRealWidth(28),
@@ -479,9 +490,9 @@
                 accountView.AddChidren(btnAccountIcon);
             }
 
-#endregion
+            #endregion
 
-#region 瀵嗙爜濉啓
+            #region 瀵嗙爜濉啓
             passwordView = new FrameLayout()
             {
                 X = Application.GetRealWidth(28),
@@ -522,11 +533,11 @@
                 PlaceholderText = Language.StringByID(StringId.PlsEntryPassword),
                 SecureTextEntry = true,
                 TextAlignment = TextAlignment.CenterLeft,
-                
+
             };
             passwordView.AddChidren(etPassword);
 
-#region 瀵嗙爜鐧诲綍-鎺т欢鍔犺浇
+            #region 瀵嗙爜鐧诲綍-鎺т欢鍔犺浇
             btnVisiblePassword = new Button()
             {
                 X = Application.GetRealWidth(223),
@@ -558,9 +569,9 @@
                 TextSize = 12,
             };
             passwordView.AddChidren(btnForgetPassword);
-#endregion
+            #endregion
 
-#region 楠岃瘉鐮佺櫥褰�-鎺т欢鍔犺浇
+            #region 楠岃瘉鐮佺櫥褰�-鎺т欢鍔犺浇
             btnGetVerificationCode = new Button()
             {
                 X = Application.GetRealWidth(219),
@@ -574,7 +585,7 @@
                 IsSelected = false,
             };
             passwordView.AddChidren(btnGetVerificationCode);
-#endregion
+            #endregion
 
             btnPasswordViewBottomLine = new Button()
             {
@@ -585,9 +596,9 @@
             };
             passwordView.AddChidren(btnPasswordViewBottomLine);
 
-#endregion
+            #endregion
 
-#region 娉ㄥ唽涓庡揩鎹风櫥褰�
+            #region 娉ㄥ唽涓庡揩鎹风櫥褰�
             btnRegister = new Button()
             {
                 X = Application.GetRealWidth(28),
@@ -614,7 +625,7 @@
             };
             bodyView.AddChidren(btnSwitchLoginMode);
 
-#endregion
+            #endregion
 
             btnLogin = new Button()
             {
@@ -656,7 +667,8 @@
                 }
             }
 
-            btnDomeLogin.MouseUpEventHandler = (sender, e) => {
+            btnDomeLogin.MouseUpEventHandler = (sender, e) =>
+            {
 
                 MainPage.NoLoginMode = true;
 #if DEBUG
@@ -666,13 +678,13 @@
                 //妤煎眰鎴块棿鍒楄〃
                 var floor1 = new SpatialInfo("FLOOR") { roomName = "F1", parentId = DB_ResidenceData.Instance.CurrentRegion.id };
                 floor1.SaveRoomFile();
-#region 鎴块棿涓� -- 瀹㈠巺
+                #region 鎴块棿涓� -- 瀹㈠巺
                 //澶勭悊鎴块棿鍒楄〃
 
                 var room1 = new Room()
                 {
                     roomId = "1405771366041378818",
-                    roomName = Language.CurrentLanguage == "Chinese"? "娲楁墜闂�" : "Restroom",
+                    roomName = Language.CurrentLanguage == "Chinese" ? "娲楁墜闂�" : "Restroom",
                     roomImage = "Classification/Room/Roombg.png",
                     uid = "47c98953-6fd4-4379-88b9-4b748963504f",
                     roomType = "ROOM",
@@ -700,7 +712,7 @@
                 var room3 = new Room()
                 {
                     roomId = "1405771193802285057",
-                    roomName = Language.CurrentLanguage == "Chinese"? "椁愬巺" : "Restaurant",
+                    roomName = Language.CurrentLanguage == "Chinese" ? "椁愬巺" : "Restaurant",
                     roomImage = "Classification/Room/Roombg.png",
                     uid = "ed7fc784-aace-44b8-97a3-bc3e727e598b",
                     roomType = "ROOM",
@@ -714,7 +726,7 @@
                 var room4 = new Room()
                 {
                     roomId = "1405771024583090178",
-                    roomName = Language.CurrentLanguage == "Chinese"? "瀹㈠巺" : "Drawing room",
+                    roomName = Language.CurrentLanguage == "Chinese" ? "瀹㈠巺" : "Drawing room",
                     roomImage = "Classification/Room/Roombg.png",
                     uid = "9191a3a2-026f-4667-a0b1-e3af699e7295",
                     roomType = "ROOM",
@@ -746,15 +758,15 @@
                 SpatialInfo.CurrentSpatial.RoomList.Add(room4);
 
 
-#region 瀹㈠巺
-#region 鍔熻兘
+                #region 瀹㈠巺
+                #region 鍔熻兘
                 var lightRgb1 = new Function()
                 {
                     sid = "light10000000000",
                     deviceId = "light10000000000",
-                    name = Language.CurrentLanguage == "Chinese"?  "瀹㈠巺姘涘洿鐏�1": "RGB light 1",
+                    name = Language.CurrentLanguage == "Chinese" ? "瀹㈠巺姘涘洿鐏�1" : "RGB light 1",
                     spk = SPK.LightRGB,
-                    roomIds = new List<string>() { "1405771024583090178"},
+                    roomIds = new List<string>() { "1405771024583090178" },
                     collect = true,
                     attributes = new List<FunctionAttributes>()
                     {
@@ -776,7 +788,7 @@
                     deviceId = "light2",
                     name = Language.CurrentLanguage == "Chinese" ? "瀹㈠巺姘涘洿鐏�2" : "RGB light 2",
                     spk = SPK.LightRGB,
-                    roomIds = new List<string>() { "1405771024583090178"},
+                    roomIds = new List<string>() { "1405771024583090178" },
                     attributes = new List<FunctionAttributes>()
                     {
                         new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -793,7 +805,7 @@
                     deviceId = "light3",
                     name = Language.CurrentLanguage == "Chinese" ? "闃呰鐏�" : "CCT light",
                     spk = SPK.LightCCT,
-                    roomIds = new List<string>() { "1405771024583090178"},
+                    roomIds = new List<string>() { "1405771024583090178" },
                     attributes = new List<FunctionAttributes>()
                     {
                         new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -825,7 +837,7 @@
                     deviceId = "light5",
                     name = Language.CurrentLanguage == "Chinese" ? "寮�鍏崇伅" : "light 2",
                     spk = SPK.LightSwitch,
-                    roomIds = new List<string>() { "1405771024583090178"},
+                    roomIds = new List<string>() { "1405771024583090178" },
                     attributes = new List<FunctionAttributes>()
                     {
                         new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -839,7 +851,7 @@
                     deviceId = "curtain1",
                     name = Language.CurrentLanguage == "Chinese" ? "寮�鍚堝笜" : "Curtain 1",
                     spk = SPK.CurtainTrietex,
-                    roomIds = new List<string>() { "1405771024583090178"},
+                    roomIds = new List<string>() { "1405771024583090178" },
                     attributes = new List<FunctionAttributes>()
                     {
                         new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -853,7 +865,7 @@
                     deviceId = "curtain2",
                     name = Language.CurrentLanguage == "Chinese" ? "鍗峰笜" : "Curtain 2",
                     spk = SPK.CurtainRoller,
-                    roomIds = new List<string>() { "1405771024583090178"},
+                    roomIds = new List<string>() { "1405771024583090178" },
                     attributes = new List<FunctionAttributes>()
                     {
                         new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -886,7 +898,7 @@
                     deviceId = "floorheat1",
                     name = Language.CurrentLanguage == "Chinese" ? "鍦版殩" : "Floorheat 1",
                     spk = SPK.FloorHeatStandard,
-                    roomIds = new List<string>() { "1405771024583090178"},
+                    roomIds = new List<string>() { "1405771024583090178" },
                     attributes = new List<FunctionAttributes>()
                     {
                         new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -1050,11 +1062,39 @@
 
                 FunctionList.List.Functions.Add(new Function
                 {
+                    name = "娴嬭瘯-閲戣寕鍏変紡鍌ㄨ兘",
+                    extend = "jinmaot1rue",
+                    spk = SPK.InverterJinmao,
+                    collect = true,
+                    attributes = new List<FunctionAttributes>()
+                    {
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.pv_power.ToString(),value =new List<string>(){ "on","off" }, curValue="28",state = "28" },
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.pv_electricity_today.ToString(),value = new List<string>(){ "0" },curValue ="20",state = "20"},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.pv_electricity_month.ToString(),value = new List<string>(){ "0" },curValue ="500",state = "500"},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.pv_electricity.ToString(),value = new List<string>(){ "0" },curValue ="2100",state = "2100"},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.system_status.ToString(),value = new List<string>(){ "0" },curValue = InverterJinmao_Attr_SystemStatusEnum.run.ToString(),state = InverterJinmao_Attr_SystemStatusEnum.run.ToString()},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.ess_status.ToString(),value = new List<string>(){ "0" },curValue = InverterJinmao_Attr_EssStatusEnum.charge.ToString(),state = InverterJinmao_Attr_EssStatusEnum.charge.ToString()},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.ess_charge_power.ToString(),value = new List<string>(){ "0" },curValue ="100",state = "100"},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.ess_discharg_power.ToString(),value = new List<string>(){ "0" },curValue ="100",state = "100"},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.battery_soc.ToString(),value = new List<string>(){ "0" },curValue ="100",state = "100"},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.load_active_power.ToString(),value = new List<string>(){ "0" },curValue ="100",state = "100"},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.load_electricity_today.ToString(),value = new List<string>(){ "0" },curValue ="100",state = "100"},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.load_electricity_month.ToString(),value = new List<string>(){ "0" },curValue ="200",state = "200"},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.load_electricity.ToString(),value = new List<string>(){ "0" },curValue ="1000",state = "1000"},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.coal.ToString(),value = new List<string>(){ "0" },curValue ="1021210",state = "1021210"},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.co2.ToString(),value = new List<string>(){ "0" },curValue ="1031300",state = "1031300"},
+                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.trees.ToString(),value = new List<string>(){ "0" },curValue ="121310",state = "121310"},
+                    }
+                });
+
+                FunctionList.List.Functions.Add(new Function
+                {
                     name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
                     spk = SPK.AcstParent,
-                    //collect = true,
+                    extend = "jinmaotrue",
+                    collect = true,
                     attributes = new List<FunctionAttributes>()
-                {
+                    {
                     new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
                     new FunctionAttributes(){ key = AcstParent_AttrEnum.mode.ToString(),curValue = AcstParent_Attr_ModeValueEnum.cool.ToString(),state = AcstParent_Attr_ModeValueEnum.cool.ToString(),
                          value = new List<string>
@@ -1084,7 +1124,7 @@
                     new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"},
                     new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"},
                     new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"},
-                }
+                    }
                 });
 
                 FunctionList.List.Functions.Add(new Function
@@ -1139,18 +1179,41 @@
                     new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
                 }
                 });
+                
                 FunctionList.List.Functions.Add(new Function
                 {
                     name = "瀛愭帶-5",
                     spk = SPK.AcstSub,
                     sid = "0000005",
                     attributes = new List<FunctionAttributes>()
+                    {
+                        new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+                        new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+                        new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+                        new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+                    }
+                });
+
+                FunctionList.List.Functions.Add(new Function
                 {
-                    new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
-                    new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
-                    new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
-                    new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
-                }
+                    name = "鐑按鍣�-1",
+                    spk = SPK.WaterHeaterJinmao,
+                    sid = "0000000001",
+                    attributes = new List<FunctionAttributes>()
+                    {
+                        new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.co2.ToString(),curValue = "522222",state = "522222" },
+                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.energy_electricity.ToString(),curValue = "144400",state = "144400" },
+                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.flow.ToString(),curValue = "2",state = "2" },
+                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.mode.ToString(),curValue = "economic",state = "economic" },
+                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.mode_free.ToString(),curValue = "true",state = "true" },
+                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.recycl_volume.ToString(),curValue = "10",state = "10" },
+                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.set_temp.ToString(),curValue = "25",state = "25" },
+                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.temp.ToString(),curValue = "23",state = "23" },
+                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.trees.ToString(),curValue = "11228",state = "11228" },
+                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.volume.ToString(),curValue = "100",state = "100" },
+
+                    },
                 });
 
 
@@ -1188,6 +1251,7 @@
                 {
                     name = "娴嬭瘯娓╂帶鍣�",
                     spk = SPK.HvacCac,
+                    collect = true,
                     attributes = new List<FunctionAttributes>
                 {
                     new FunctionAttributes(){ key = "on_off",curValue = "on",state = "on" },
@@ -1643,9 +1707,9 @@
 
                 };
                 scene2.SaveSceneFile();
-#endregion
-#endregion
-#region 椁愬巺
+                #endregion
+                #endregion
+                #region 椁愬巺
                 var lightSwitch3 = new Function()
                 {
                     sid = "light6",
@@ -1749,8 +1813,8 @@
                     }
                 };
                 scene4.SaveSceneFile();
-#endregion
-#region 鍗у
+                #endregion
+                #region 鍗у
                 var ac = new Function()
                 {
                     sid = "ac1",
@@ -1812,7 +1876,7 @@
                 //    collect = false,
                 //};
                 //scene6.SaveSceneFile();
-#endregion
+                #endregion
 
 
                 var lightSwitch6 = new Function()
@@ -1830,12 +1894,12 @@
                 };
                 lightSwitch6.SaveFunctionFile();
 
-#endregion
+                #endregion
 
                 var fileList = Common.FileUtlis.Files.ReadFiles();
-                foreach(var file in fileList)
+                foreach (var file in fileList)
                 {
-                    FunctionList.List.IniFunctionList(file,true);
+                    FunctionList.List.IniFunctionList(file, true);
                 }
                 Room.CurrentSpatial.InitRoomListFunctions();
 
@@ -1850,13 +1914,13 @@
             account = etAccount.Text.Trim();
 
 
-#region 闅愮鏀跨瓥
+            #region 闅愮鏀跨瓥
             AddServiceAgreementControl(bodyView);
-#endregion
+            #endregion
 
         }
 
-#region 鈻� 鏈嶅姟鍗忚___________________________
+        #region 鈻� 鏈嶅姟鍗忚___________________________
         bool isAgreePrivacyPolicy = false;
         /// <summary>
         /// 娣诲姞鏈嶅姟鍗忚鎺т欢
@@ -1886,7 +1950,7 @@
                 X = Application.GetRealWidth(22),
             };
             frameRow.AddChidren(agreeView);
-            if(Language.CurrentLanguage == "Chinese")
+            if (Language.CurrentLanguage == "Chinese")
             {
                 agreeView.X = Application.GetRealWidth(52);
             }
@@ -2006,7 +2070,7 @@
 #if DEBUG
             return true;
 #endif
-            if(HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")
+            if (HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")
             {
                 return true;
             }
@@ -2019,6 +2083,6 @@
             return true;
         }
 
-#endregion
+        #endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0