.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="UI" expanded="True"> <Node name="BindingResidence" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="4-PersonalCenter" expanded="True"> <Node name="MemberManagement" expanded="True" /> <Node name="DAL" expanded="True"> <Node name="Server" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <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="Scan.cs" selected="True" /> <Node name="HDL-ON_iOS" expanded="True"> <Node name="References" expanded="True"> <Node name="Shared.IOS.HDLLinphoneSDK" selected="True" /> </Node> <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 /> DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dllBinary files differ
HDL-ON_Android/Assets/Language.ini
@@ -1419,7 +1419,7 @@ 289=解除手机绑定 290=读取历史数据失败 291=暂无已收藏的场景 292=关于ON+ 292=关于On Pro 293=成员 294=管理员 295=修改密码 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/11252436.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422208.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422688.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792828.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/22081242.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/24361125.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/26881242.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320480.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136-1.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960-1.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/7501334.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/8281792.pngHDL-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"> 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> HDL-ON_iOS/Resources/Language.ini
@@ -1419,7 +1419,7 @@ 289=解除手机绑定 290=读取历史数据失败 291=暂无已收藏的场景 292=关于ON+ 292=关于On Pro 293=成员 294=管理员 295=修改密码 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 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -777,7 +777,7 @@ #endregion #endregion #region 智能音箱、获取支持、关于ON+ 等菜单列表 #region 智能音箱、获取支持、关于On 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),
