From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 15 十二月 2021 09:01:53 +0800 Subject: [PATCH] 更新 --- HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/24361125.png | 0 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136.png | 0 HDL-ON_Android/Assets/Language.ini | 2 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422208.png | 0 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136-1.png | 0 DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll | 0 HDL-ON_iOS/HDL-ON_iOS.csproj | 28 +++++++------- HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320480.png | 0 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422688.png | 0 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960-1.png | 0 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/7501334.png | 0 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960.png | 0 HDL-ON_iOS/Info.plist | 4 +- HDL-ON_iOS/Resources/Language.ini | 2 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/26881242.png | 0 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/11252436.png | 0 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/22081242.png | 0 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 4 +- HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | 8 ++-- HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792828.png | 0 .vs/HDL_APP_Project/xs/UserPrefs.xml | 31 +++++++++------ HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/8281792.png | 0 22 files changed, 43 insertions(+), 36 deletions(-) diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml index b657bb2..7d67e6a 100644 --- a/.vs/HDL_APP_Project/xs/UserPrefs.xml +++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml @@ -1,27 +1,32 @@ -锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> +锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.SiriIntentUI> <MonoDevelop.MacDev.AppleDevelopmentTeam /> </MonoDevelop.Ide.ItemProperties.SiriIntentUI> + <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" /> <MonoDevelop.Ide.Workbench> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> + <Node name="DAL" expanded="True"> + <Node name="Server" expanded="True" /> + </Node> <Node name="UI" expanded="True"> - <Node name="BindingResidence" expanded="True" /> + <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> - <Node name="4-PersonalCenter" expanded="True"> - <Node name="MemberManagement" expanded="True" /> - </Node> + <Node name="4-PersonalCenter" expanded="True" /> </Node> </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> - <Node name="Resources" expanded="True"> - <Node name="layout" expanded="True" /> + <Node name="Assets" expanded="True" /> + </Node> + <Node name="HDL-ON_iOS" expanded="True"> + <Node name="References" expanded="True"> + <Node name="Shared.IOS.HDLLinphoneSDK" selected="True" /> </Node> - <Node name="Scan.cs" selected="True" /> + <Node name="Resources" expanded="True" /> </Node> <Node name="SiriIntents" expanded="True"> <Node name="Server" expanded="True" /> @@ -45,13 +50,15 @@ <String>HDLSiriIntentsUI/HDLSiriIntentsUI.csproj</String> <String>HDLSiriKit/HDLSiriKit.csproj</String> <String>SiriBinding/SiriBinding.csproj</String> - <String>HDL-ON_iOS/HDL-ON_iOS.csproj</String> </DisabledProjects> - <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> - <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" /> + <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" /> + <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/HDL-ON_iOS/ZXingOverlayView.cs" relfile="HDL-ON_iOS/ZXingOverlayView.cs" line="53" column="1" /> + <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HdlSiriKit/SkipControl.cs" relfile="HdlSiriKit/SkipControl.cs" line="28" column="1" /> + <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HdlSiriKit/SkipControl.cs" relfile="HdlSiriKit/SkipControl.cs" line="14" column="1" /> + <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs" line="333" column="1" /> + <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_Android/Scan.cs" relfile="HDL-ON_Android/Scan.cs" line="47" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> diff --git a/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll b/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll index d97e4df..db3126b 100644 --- a/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll +++ b/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll Binary files differ diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini index 8b1810a..8b816ae 100644 --- a/HDL-ON_Android/Assets/Language.ini +++ b/HDL-ON_Android/Assets/Language.ini @@ -1419,7 +1419,7 @@ 289=瑙i櫎鎵嬫満缁戝畾 290=璇诲彇鍘嗗彶鏁版嵁澶辫触 291=鏆傛棤宸叉敹钘忕殑鍦烘櫙 -292=鍏充簬ON+ +292=鍏充簬On Pro 293=鎴愬憳 294=绠$悊鍛� 295=淇敼瀵嗙爜 diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/11252436.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/11252436.png index de09c1d..3127235 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/11252436.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/11252436.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422208.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422208.png index 14198f0..e6ac1c0 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422208.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422208.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422688.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422688.png index 3544e75..b588e7a 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422688.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422688.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792828.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792828.png index 47e69a5..3a7131a 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792828.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792828.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/22081242.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/22081242.png index cadd4bb..455b69f 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/22081242.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/22081242.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/24361125.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/24361125.png index 322255d..673d0dd 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/24361125.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/24361125.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/26881242.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/26881242.png index 835d533..a713003 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/26881242.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/26881242.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320480.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320480.png index 9f84a83..8bfcd0e 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320480.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320480.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136-1.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136-1.png index 1720fe2..73314f9 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136-1.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136-1.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136.png index 1720fe2..73314f9 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960-1.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960-1.png index 57f5c27..f1bf830 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960-1.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960-1.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960.png index 57f5c27..f1bf830 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/7501334.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/7501334.png index ea64f54..67fbaf1 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/7501334.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/7501334.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/8281792.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/8281792.png index c9dc697..0e6e665 100644 --- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/8281792.png +++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/8281792.png Binary files differ diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj index 47b1d0d..ed01bc0 100644 --- a/HDL-ON_iOS/HDL-ON_iOS.csproj +++ b/HDL-ON_iOS/HDL-ON_iOS.csproj @@ -434,6 +434,20 @@ <ImageAsset Include="Assets.xcassets\wifi_bg.imageset\wifi_bg.png" /> <ImageAsset Include="Assets.xcassets\device_bg.imageset\Contents.json" /> <ImageAsset Include="Assets.xcassets\device_bg.imageset\device_bg.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422688.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\8281792.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\26881242.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792828.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11252436.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\24361125.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320480.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422208.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\7501334.png" /> + <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\22081242.png" /> </ItemGroup> <ItemGroup> <Folder Include="Resources\" /> @@ -1390,20 +1404,6 @@ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\.DS_Store" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422688.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\8281792.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\26881242.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792828.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11252436.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\24361125.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422208.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\7501334.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\22081242.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320480.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.png" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\HdlBluWi\Blufi.csproj"> diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist index 5fd167b..87abb0b 100644 --- a/HDL-ON_iOS/Info.plist +++ b/HDL-ON_iOS/Info.plist @@ -100,9 +100,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> - <string>1.4.202112066</string> + <string>1.4.3</string> <key>CFBundleVersion</key> - <string>1.4.12066</string> + <string>1.4.12141</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini index 8b1810a..8b816ae 100644 --- a/HDL-ON_iOS/Resources/Language.ini +++ b/HDL-ON_iOS/Resources/Language.ini @@ -1419,7 +1419,7 @@ 289=瑙i櫎鎵嬫満缁戝畾 290=璇诲彇鍘嗗彶鏁版嵁澶辫触 291=鏆傛棤宸叉敹钘忕殑鍦烘櫙 -292=鍏充簬ON+ +292=鍏充簬On Pro 293=鎴愬憳 294=绠$悊鍛� 295=淇敼瀵嗙爜 diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs index 5c31fd5..8fd0334 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs @@ -162,8 +162,8 @@ bodyView.AddChidren(serviceAgreementView); serviceAgreementView.BtnTilte.TextID = StringId.UserAgreement; Action serviceAgreementAction = () => { - string url = Constant.URL_PRIVACYPOLICY; - string titleStr = Language.StringByID(StringId.PrivacyPolicy); + string url = Constant.URL_USERAGREEMENT; + string titleStr = Language.StringByID(StringId.UserAgreement); new WebViewDialog().LoadPageWithdrawalConsent(titleStr, url); }; serviceAgreementView.GoAction = serviceAgreementAction; @@ -177,8 +177,8 @@ bodyView.AddChidren(privacyPolicyView); privacyPolicyView.BtnTilte.TextID = StringId.PrivacyPolicy; Action privacyPolicyAction = () => { - string url = Constant.URL_USERAGREEMENT; - string titleStr = Language.StringByID(StringId.UserAgreement); + string url = Constant.URL_PRIVACYPOLICY; + string titleStr = Language.StringByID(StringId.PrivacyPolicy); new WebViewDialog().LoadPageWithdrawalConsent(titleStr, url); }; #endregion diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs index 7f6ccf1..2e19364 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs @@ -777,7 +777,7 @@ #endregion #endregion - #region 鏅鸿兘闊崇銆佽幏鍙栨敮鎸併�佸叧浜嶰N+ 绛夎彍鍗曞垪琛� + #region 鏅鸿兘闊崇銆佽幏鍙栨敮鎸併�佸叧浜嶰n Pro 绛夎彍鍗曞垪琛� contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) }); supportView = new VerticalScrolViewLayout() @@ -1022,7 +1022,7 @@ //supView.AddChidren(btnSupportViewLine); #endregion - #region 鍏充簬ON+ + #region 鍏充簬On Pro FrameLayout aboutView = new FrameLayout() { Height = Application.GetRealWidth(44), -- Gitblit v1.8.0