| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/HDL-ON_iOS.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Info.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/ViewController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202111051" android:versionName="1.3.202111051" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202111171" android:versionName="1.3.202111171" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" /> <!-- 乐橙可视对讲需要的权限 --> <!--<uses-permission android:name="android.permission.INTERNET" />--> @@ -82,7 +82,7 @@ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.READ_LOGS" /> <!-- 极光推送结束 --> <application android:allowBackup="true" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="ON+"> <application android:allowBackup="true" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro"> <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.onpro.fileProvider" android:grantUriPermissions="true" android:exported="false"> <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" /> </provider> HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -54,7 +54,7 @@ <MtouchLink>SdkOnly</MtouchLink> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchEnableSGenConc>false</MtouchEnableSGenConc> <CodesignProvision>On+Dev-20210913-1</CodesignProvision> <CodesignProvision>OnPro211116-1</CodesignProvision> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> @@ -69,7 +69,7 @@ <MtouchLink>SdkOnly</MtouchLink> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchI18n>cjk</MtouchI18n> <CodesignProvision>ComHdlOnProAdHoc20211109-1</CodesignProvision> <CodesignProvision>OnPro-Hoc20211117-1</CodesignProvision> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -463,6 +463,7 @@ <Folder Include="Resources\Phone\FunctionIcon\Light\LightScene\" /> <Folder Include="Resources\Phone\PersonalCenter\FacePassage\" /> <Folder Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\" /> <Folder Include="Other\Data\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> @@ -490,6 +491,9 @@ <Compile Include="ZXingOverlayView.cs" /> <Compile Include="Other\JLCountrycode.cs" /> <Compile Include="BlueWifi.cs" /> <Compile Include="Other\PrimaryClass.cs" /> <Compile Include="Other\Data\VoiceShortcutDataManager.cs" /> <Compile Include="Other\Data\SiriScene.cs" /> </ItemGroup> <ItemGroup> <BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" /> @@ -1401,9 +1405,10 @@ <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project> <Name>Blufi</Name> </ProjectReference> <ProjectReference Include="..\SiriLibrary\SiriLibrary.csproj"> <Project>{C23E5F00-6F1B-4FEB-80F6-04D9C756A23B}</Project> <Name>SiriLibrary</Name> <ProjectReference Include="..\SiriIntentUI\SiriIntentUI.csproj"> <IsAppExtension>true</IsAppExtension> <Project>{B594D3F5-4B93-4988-B45E-150BBFDC8A43}</Project> <Name>SiriIntentUI</Name> </ProjectReference> </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> HDL-ON_iOS/Info.plist
@@ -92,17 +92,17 @@ <key>XSLaunchImageAssets</key> <string>Assets.xcassets/LaunchImage.launchimage</string> <key>CFBundleName</key> <string>ON +</string> <string>On Pro</string> <key>XSAppIconAssets</key> <string>Assets.xcassets/AppIcon.appiconset</string> <key>CFBundleDisplayName</key> <string>ON +</string> <string>On Pro</string> <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.3.202111051</string> <string>1.3.202111171</string> <key>CFBundleVersion</key> <string>1.3.11051</string> <string>1.3.11171</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> @@ -134,6 +134,6 @@ <key>NSVoIPUsageDescription</key> <string>Make audio/video calls</string> <key>NSSiriUsageDescription</key> <string>On+ data will be send to Siri.</string> <string>On Pro data will be send to Siri.</string> </dict> </plist> HDL-ON_iOS/ViewController.cs
@@ -24,7 +24,6 @@ public override void ViewDidLoad() { Console.WriteLine("qidong 1111"); base.ViewDidLoad(); HDL_ON.MainPage.Show(); @@ -97,5 +96,7 @@ // MainPage.InternetStatus = 2; //} } } } HDL_ON/UI/MainPage.cs
@@ -25,7 +25,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.3.1105"; public static string VersionString = "1.3.1117"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
@@ -37,7 +37,7 @@ /// <summary> /// 渐变时间修改 /// </summary> //DiyImageSeekBar barFadeTime; DiyImageSeekBar barFadeTime; /// <summary> /// 色温的滑动控件 /// </summary> @@ -252,63 +252,66 @@ #endregion #region 渐变时间调节 //var btnGradualChangeText = new Button() //{ // X = Application.GetRealWidth(35), // Y = Application.GetRealHeight(385), // Width = Application.GetRealWidth(224), // Height = Application.GetRealHeight(21), // TextAlignment = TextAlignment.CenterLeft, // TextColor = CSS_Color.FirstLevelTitleColor, // TextSize = CSS_FontSize.PromptFontSize_FirstLevel, // TextID = StringId.SpeedOfChange, //}; //controlView.AddChidren(btnGradualChangeText); //var btnGradualChangeMinValuesText = new Button() //{ // X = Application.GetRealWidth(35), // Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8), // Width = Application.GetRealWidth(22), // Height = Application.GetRealHeight(21), // Text = "0s", // TextAlignment = TextAlignment.CenterLeft, // TextColor = CSS_Color.PromptingColor1, // TextSize = CSS_FontSize.PromptFontSize_FirstLevel, //}; //controlView.AddChidren(btnGradualChangeMinValuesText); //barFadeTime = new DiyImageSeekBar() //{ // X = btnGradualChangeMinValuesText.Right, // Y = Application.GetRealHeight(412 - 21) + Application.GetRealHeight(8), // Width = Application.GetRealWidth(210), // Height = Application.GetRealHeight(54), // SeekBarViewHeight = Application.GetRealHeight(8), // ThumbImagePath = "Public/ThumbImage.png", // ThumbImageHeight = Application.GetRealHeight(54), // ProgressBarColor = CSS_Color.MainColor, // ProgressTextColor = CSS_Color.FirstLevelTitleColor, // ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel, // ProgressBarUnitSring = "s", // MaxValue = 10, // Progress = function.fadeTime, // SeekBarPadding = Application.GetRealWidth(20), //}; //controlView.AddChidren(barFadeTime); //var btnGradualChangeMaxValuesText = new Button() //{ // X = barFadeTime.Right, // Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8), // Width = Application.GetRealWidth(35), // Height = Application.GetRealHeight(21), // Text = "10s", // TextAlignment = TextAlignment.CenterLeft, // TextColor = CSS_Color.PromptingColor1, // TextSize = CSS_FontSize.PromptFontSize_FirstLevel, //}; //controlView.AddChidren(btnGradualChangeMaxValuesText); if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null) { var btnGradualChangeText = new Button() { X = Application.GetRealWidth(35), Y = Application.GetRealHeight(385), Width = Application.GetRealWidth(224), Height = Application.GetRealHeight(21), TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, TextID = StringId.SpeedOfChange, }; controlView.AddChidren(btnGradualChangeText); var btnGradualChangeMinValuesText = new Button() { X = Application.GetRealWidth(35), Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8), Width = Application.GetRealWidth(22), Height = Application.GetRealHeight(21), Text = "0s", TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.PromptingColor1, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, }; controlView.AddChidren(btnGradualChangeMinValuesText); barFadeTime = new DiyImageSeekBar() { X = btnGradualChangeMinValuesText.Right, Y = Application.GetRealHeight(412 - 21) + Application.GetRealHeight(8), Width = Application.GetRealWidth(210), Height = Application.GetRealHeight(54), SeekBarViewHeight = Application.GetRealHeight(8), ThumbImagePath = "Public/ThumbImage.png", ThumbImageHeight = Application.GetRealHeight(54), ProgressBarColor = CSS_Color.MainColor, ProgressTextColor = CSS_Color.FirstLevelTitleColor, ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel, ProgressBarUnitSring = "s", MaxValue = 10, Progress = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.FadeTime)), SeekBarPadding = Application.GetRealWidth(20), }; controlView.AddChidren(barFadeTime); var btnGradualChangeMaxValuesText = new Button() { X = barFadeTime.Right, Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8), Width = Application.GetRealWidth(35), Height = Application.GetRealHeight(21), Text = "10s", TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.PromptingColor1, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, }; controlView.AddChidren(btnGradualChangeMaxValuesText); } #endregion btnSwitch = new Button()
