From 566d92a603bed74f2263edcdefae54dc5d6a6813 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 17 四月 2024 16:34:36 +0800
Subject: [PATCH] 更新备份

---
 HDL-ON_Android/Assets/.DS_Store                                |    0 
 .vs/Santan-OnPro-Project/xs/UserPrefs.xml                      |   52 +++++++++++++----
 HDL-ON_Android/Assets/Phone/Classification/Room/HomePagebg.png |    0 
 HDL-ON_iOS/Resources/.DS_Store                                 |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs             |   94 +++++++++++++++---------------
 HDL-ON_iOS/Resources/Phone/Classification/Room/HomePagebg.png  |    0 
 6 files changed, 87 insertions(+), 59 deletions(-)

diff --git a/.vs/Santan-OnPro-Project/xs/UserPrefs.xml b/.vs/Santan-OnPro-Project/xs/UserPrefs.xml
index e425954..95f9aee 100644
--- a/.vs/Santan-OnPro-Project/xs/UserPrefs.xml
+++ b/.vs/Santan-OnPro-Project/xs/UserPrefs.xml
@@ -1,15 +1,14 @@
 锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
-  <MonoDevelop.Ide.ItemProperties.APP__IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008120-000C75860E88C01E" Xamarin.HotReload.MonoInterpreterErrorInfoBar.APP__IOS.HideInfoBar="True" />
   <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.SelectDevice" />
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.DebuggingService.PinnedWatches />
-  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
+  <MonoDevelop.Ide.ItemProperties.APP__Android PreferredExecutionTarget="Android.SelectDevice" Xamarin.HotReload.WrongLinkerErrorInfoBar.APP__Android.HideInfoBar="True" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs">
     <Files>
       <File FileName="HDL-ON_Android/SplashActivity.cs" />
-      <File FileName="SiriIntents/Server/HttpUtil.cs" Line="24" Column="45" />
-      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="12" Column="2" />
-      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="226" Column="50" />
-      <File FileName="SiriKit/Data/NSUserDefaultsHelper.cs" Line="7" Column="65" />
+      <File FileName="SiriIntents/Server/HttpUtil.cs" />
+      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="662" Column="13" />
+      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1585" Column="102" />
+      <File FileName="SiriKit/Data/NSUserDefaultsHelper.cs" />
       <File FileName="HDL-ON_iOS/Base.lproj/Intents.intentdefinition" />
       <File FileName="SiriKit/Base.lproj/Intents.intentdefinition" />
       <File FileName="HDL-ON_iOS/Other/SkipControl.cs" />
@@ -27,23 +26,52 @@
       <File FileName="HDL-ON_iOS/Info.plist" />
       <File FileName="HDL-ON_iOS/Entitlements.plist" />
       <File FileName="SiriIntentsUI/Entitlements.plist" />
+      <File FileName="HDL_ON/Common/R.cs" Line="784" Column="45" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs" Line="75" Column="23" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs" Line="104" Column="1" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" Line="829" Column="52" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs" Line="694" Column="49" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
-          <Node name="Santan-OnPro-Project">
-            <Node name="SiriIntentsUI" selected="True" />
-            <Node name="SiriKit">
-              <Node name="Data" expanded="True" />
+          <Node name="Santan-OnPro-Project" expanded="True">
+            <Node name="APP_Android">
+              <Node name="Assets" expanded="True" />
+              <Node name="Other" expanded="True">
+                <Node name="JPush" expanded="True" />
+              </Node>
+              <Node name="Resources" expanded="True" />
+            </Node>
+            <Node name="APP_IOS">
+              <Node name="Other" expanded="True" />
+            </Node>
+            <Node name="HDL_ON">
+              <Node name="Common" expanded="True" />
+              <Node name="DAL" expanded="True">
+                <Node name="Server" expanded="True" />
+              </Node>
+              <Node name="UI">
+                <Node name="UI1-Login" expanded="True" />
+                <Node name="UI2">
+                  <Node name="4-PersonalCenter">
+                    <Node name="AboutOn" expanded="True" />
+                    <Node name="PirDevice" expanded="True">
+                      <Node name="PirMethod.cs" selected="True" />
+                    </Node>
+                  </Node>
+                </Node>
+              </Node>
             </Node>
           </Node>
         </State>
       </Pad>
     </Pads>
   </MonoDevelop.Ide.Workbench>
+  <MonoDevelop.Ide.ItemProperties.APP__IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" Xamarin.HotReload.MonoInterpreterErrorInfoBar.APP__IOS.HideInfoBar="True" />
   <MultiItemStartupConfigurations />
-  <MonoDevelop.Ide.ItemProperties.APP__Android PreferredExecutionTarget="Android.SelectDevice" Xamarin.HotReload.WrongLinkerErrorInfoBar.APP__Android.HideInfoBar="True" />
   <MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.1.2" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />
   </MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/HDL-ON_Android/Assets/.DS_Store b/HDL-ON_Android/Assets/.DS_Store
index 238be4a..a115ec8 100644
--- a/HDL-ON_Android/Assets/.DS_Store
+++ b/HDL-ON_Android/Assets/.DS_Store
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/Classification/Room/HomePagebg.png b/HDL-ON_Android/Assets/Phone/Classification/Room/HomePagebg.png
index a183c95..27b2852 100644
--- a/HDL-ON_Android/Assets/Phone/Classification/Room/HomePagebg.png
+++ b/HDL-ON_Android/Assets/Phone/Classification/Room/HomePagebg.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/.DS_Store b/HDL-ON_iOS/Resources/.DS_Store
index 505f067..9b2b885 100644
--- a/HDL-ON_iOS/Resources/.DS_Store
+++ b/HDL-ON_iOS/Resources/.DS_Store
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/Classification/Room/HomePagebg.png b/HDL-ON_iOS/Resources/Phone/Classification/Room/HomePagebg.png
index a183c95..27b2852 100644
--- a/HDL-ON_iOS/Resources/Phone/Classification/Room/HomePagebg.png
+++ b/HDL-ON_iOS/Resources/Phone/Classification/Room/HomePagebg.png
Binary files differ
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs
index 001bc82..701d71b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs
@@ -50,57 +50,57 @@
             };
             bodyView.AddChidren(serverBtn);
 
-            var tipBtn = new Button()
-            {
-                X = Application.GetRealWidth(40),
-                Y = serverBtn.Bottom + Application.GetRealHeight(12),
-                Width = Application.GetRealWidth(295),
-                Height = Application.GetRealHeight(80),
-                TextAlignment = TextAlignment.TopLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.TextFontSize,
-                //Text = "*鏈嶅姟鍣ㄦ槸鎮ㄥ綋鍓嶄簯绔暟鎹瓨鍌ㄧ殑鎵�鍦ㄥ尯鍩燂紝鏃犻渶蹇呰锛屾垜浠笉寤鸿鍙戠敓杩佺Щ",
-                TextID = StringId.CurrentAccountServerOwnershipTip,
-                IsMoreLines = true
+            //var tipBtn = new Button()
+            //{
+            //    X = Application.GetRealWidth(40),
+            //    Y = serverBtn.Bottom + Application.GetRealHeight(12),
+            //    Width = Application.GetRealWidth(295),
+            //    Height = Application.GetRealHeight(80),
+            //    TextAlignment = TextAlignment.TopLeft,
+            //    TextColor = CSS_Color.FirstLevelTitleColor,
+            //    TextSize = CSS_FontSize.TextFontSize,
+            //    //Text = "*鏈嶅姟鍣ㄦ槸鎮ㄥ綋鍓嶄簯绔暟鎹瓨鍌ㄧ殑鎵�鍦ㄥ尯鍩燂紝鏃犻渶蹇呰锛屾垜浠笉寤鸿鍙戠敓杩佺Щ",
+            //    TextID = StringId.CurrentAccountServerOwnershipTip,
+            //    IsMoreLines = true
 
-            };
-            bodyView.AddChidren(tipBtn);
+            //};
+            //bodyView.AddChidren(tipBtn);
 
-            var callBtn = new TextButton()
-            {
-                X = Application.GetRealWidth(40),
-                Y = Application.GetRealHeight(606),
-                Width = Application.GetRealWidth(168),
-                Height = Application.GetRealHeight(22),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.TextualColor,
-                TextSize = CSS_FontSize.TextFontSize,
-                //Text = "*鑻ラ渶瑕佽縼绉绘湇鍔″櫒锛岃鎷ㄦ墦",
-                TextID = StringId.ToMigrateTheServerPleaseCall,
+            //var callBtn = new TextButton()
+            //{
+            //    X = Application.GetRealWidth(40),
+            //    Y = Application.GetRealHeight(606),
+            //    Width = Application.GetRealWidth(168),
+            //    Height = Application.GetRealHeight(22),
+            //    TextAlignment = TextAlignment.CenterLeft,
+            //    TextColor = CSS_Color.TextualColor,
+            //    TextSize = CSS_FontSize.TextFontSize,
+            //    //Text = "*鑻ラ渶瑕佽縼绉绘湇鍔″櫒锛岃鎷ㄦ墦",
+            //    TextID = StringId.ToMigrateTheServerPleaseCall,
 
-            };
-            bodyView.AddChidren(callBtn);
-            callBtn.Width = callBtn.GetTextWidth() + Application.GetRealWidth(2);
+            //};
+            //bodyView.AddChidren(callBtn);
+            //callBtn.Width = callBtn.GetTextWidth() + Application.GetRealWidth(2);
 
-            var phoneBtn = new TextButton()
-            {
-                X = callBtn.Right + Application.GetRealHeight(2),
-                Y = Application.GetRealHeight(606),
-                Width = Application.GetRealWidth(200),
-                Height = Application.GetRealHeight(22),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.MainColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                Text = "400-855-8535",
-                IsBold = true
-            };
-            bodyView.AddChidren(phoneBtn);
-            if(Language.CurrentLanguage != "Chinese")
-            {
-                phoneBtn.Y = Application.GetRealHeight(566);
-                phoneBtn.Y = callBtn.Bottom;
-                phoneBtn.X = callBtn.X;
-            }
+            //var phoneBtn = new TextButton()
+            //{
+            //    X = callBtn.Right + Application.GetRealHeight(2),
+            //    Y = Application.GetRealHeight(606),
+            //    Width = Application.GetRealWidth(200),
+            //    Height = Application.GetRealHeight(22),
+            //    TextAlignment = TextAlignment.CenterLeft,
+            //    TextColor = CSS_Color.MainColor,
+            //    TextSize = CSS_FontSize.SubheadingFontSize,
+            //    Text = "400-855-8535",
+            //    IsBold = true
+            //};
+            //bodyView.AddChidren(phoneBtn);
+            //if(Language.CurrentLanguage != "Chinese")
+            //{
+            //    phoneBtn.Y = Application.GetRealHeight(566);
+            //    phoneBtn.Y = callBtn.Bottom;
+            //    phoneBtn.X = callBtn.X;
+            //}
 
             //phoneBtn.MouseUpEventHandler += (sender, e) =>
             //{

--
Gitblit v1.8.0