From da5999ee08de8f6267a4ed491b79b36649c52186 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 27 十二月 2021 11:52:22 +0800
Subject: [PATCH] 备份

---
 HDL_ON/UI/UI1-Login/LoginPage.cs |   63 ++++++++++++++++---------------
 1 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index d1720bf..fcf307c 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -168,6 +168,9 @@
         /// </summary>
         public void LoadView(UserInfo userInfo = null)
         {
+#if __Android__
+            OnAppConfig.Instance.isAgreePrivacyPolicy = false;
+#endif
             var btnIcon = new Button()
             {
                 X = Application.GetRealWidth(28),
@@ -252,7 +255,7 @@
             };
 #endif
 
-            #region 鐧诲綍鏂瑰紡閫夋嫨
+#region 鐧诲綍鏂瑰紡閫夋嫨
             btnPhoneLogin = new Button()
             {
                 X = Application.GetRealWidth(28),
@@ -278,9 +281,9 @@
                 TextSize = CSS_FontSize.TextFontSize,
             };
             bodyView.AddChidren(btnEmailLogin);
-            #endregion
+#endregion
 
-            #region 璐﹀彿濉啓
+#region 璐﹀彿濉啓
             accountView = new FrameLayout()
             {
                 X = Application.GetRealWidth(28),
@@ -368,9 +371,9 @@
                 accountView.AddChidren(btnAccountIcon);
             }
 
-            #endregion
+#endregion
 
-            #region 瀵嗙爜濉啓
+#region 瀵嗙爜濉啓
             passwordView = new FrameLayout()
             {
                 X = Application.GetRealWidth(28),
@@ -414,7 +417,7 @@
             };
             passwordView.AddChidren(etPassword);
 
-            #region 瀵嗙爜鐧诲綍-鎺т欢鍔犺浇
+#region 瀵嗙爜鐧诲綍-鎺т欢鍔犺浇
             btnVisiblePassword = new Button()
             {
                 X = Application.GetRealWidth(223),
@@ -446,9 +449,9 @@
                 TextSize = 12,
             };
             passwordView.AddChidren(btnForgetPassword);
-            #endregion
+#endregion
 
-            #region 楠岃瘉鐮佺櫥褰�-鎺т欢鍔犺浇
+#region 楠岃瘉鐮佺櫥褰�-鎺т欢鍔犺浇
             btnGetVerificationCode = new Button()
             {
                 X = Application.GetRealWidth(219),
@@ -462,7 +465,7 @@
                 IsSelected = false,
             };
             passwordView.AddChidren(btnGetVerificationCode);
-            #endregion
+#endregion
 
             btnPasswordViewBottomLine = new Button()
             {
@@ -473,9 +476,9 @@
             };
             passwordView.AddChidren(btnPasswordViewBottomLine);
 
-            #endregion
+#endregion
 
-            #region 娉ㄥ唽涓庡揩鎹风櫥褰�
+#region 娉ㄥ唽涓庡揩鎹风櫥褰�
             btnRegister = new Button()
             {
                 X = Application.GetRealWidth(28),
@@ -502,7 +505,7 @@
             };
             bodyView.AddChidren(btnSwitchLoginMode);
 
-            #endregion
+#endregion
 
             btnLogin = new Button()
             {
@@ -547,7 +550,7 @@
                 //妤煎眰鎴块棿鍒楄〃
                 var floor1 = new SpatialInfo("FLOOR") { roomName = "F1", parentId = DB_ResidenceData.Instance.CurrentRegion.id };
                 floor1.SaveRoomFile();
-                #region 鎴块棿涓� -- 瀹㈠巺
+#region 鎴块棿涓� -- 瀹㈠巺
                 //澶勭悊鎴块棿鍒楄〃
 
                 var room1 = new Room()
@@ -627,8 +630,8 @@
                 SpatialInfo.CurrentSpatial.RoomList.Add(room4);
 
 
-                #region 瀹㈠巺
-                #region 鍔熻兘
+#region 瀹㈠巺
+#region 鍔熻兘
                 var lightRgb1 = new Function()
                 {
                     sid = "light1",
@@ -754,8 +757,8 @@
                     },
                 };
                 fh.SaveFunctionFile();
-                #endregion
-                #region 鍦烘櫙
+#endregion
+#region 鍦烘櫙
                 var scene1 = new Scene()
                 {
                     sid = "scene1",
@@ -907,9 +910,9 @@
 
                 };
                 scene2.SaveSceneFile();
-                #endregion
-                #endregion
-                #region 椁愬巺
+#endregion
+#endregion
+#region 椁愬巺
                 var lightSwitch3 = new Function()
                 {
                     sid = "light6",
@@ -1013,8 +1016,8 @@
                     }
                 };
                 scene4.SaveSceneFile();
-                #endregion
-                #region 鍗у
+#endregion
+#region 鍗у
                 var ac = new Function()
                 {
                     sid = "ac1",
@@ -1053,7 +1056,7 @@
                 //    collect = false,
                 //};
                 //scene6.SaveSceneFile();
-                #endregion
+#endregion
 
 
                 var lightSwitch6 = new Function()
@@ -1071,7 +1074,7 @@
                 };
                 lightSwitch6.SaveFunctionFile();
 
-                #endregion
+#endregion
 
                 var fileList = Common.FileUtlis.Files.ReadFiles();
                 foreach(var file in fileList)
@@ -1090,7 +1093,7 @@
             LoadEventList();
             account = etAccount.Text.Trim();
 
-            #if DEBUG1211
+#if DEBUG1211
             //鏈湴妯″紡
             Button btnLocalMode = new Button()
             {
@@ -1112,15 +1115,15 @@
 
             MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());
 
-            #endif
+#endif
 
-            #region 闅愮鏀跨瓥
+#region 闅愮鏀跨瓥
             AddServiceAgreementControl(bodyView);
-            #endregion
+#endregion
 
         }
 
-        #region 鈻� 鏈嶅姟鍗忚___________________________
+#region 鈻� 鏈嶅姟鍗忚___________________________
         bool isAgreePrivacyPolicy = false;
         /// <summary>
         /// 娣诲姞鏈嶅姟鍗忚鎺т欢
@@ -1263,6 +1266,6 @@
             return true;
         }
 
-        #endregion
+#endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0