| .vs/Santan-OnPro-Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Assets/.DS_Store | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Assets/Phone/Classification/Room/HomePagebg.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/.DS_Store | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Phone/Classification/Room/HomePagebg.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.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> HDL-ON_Android/Assets/.DS_StoreBinary files differ
HDL-ON_Android/Assets/Phone/Classification/Room/HomePagebg.pngHDL-ON_iOS/Resources/.DS_StoreBinary files differ
HDL-ON_iOS/Resources/Phone/Classification/Room/HomePagebg.pngHDL_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) => //{
