DLL/Shared.Droid1.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_Android/HDL-ON_Android.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_Android/Other/SmsReceiver.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_iOS/Info.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DLL/Shared.Droid1.dllBinary files differ
HDL-ON_Android/Assets/Language.ini
@@ -607,6 +607,8 @@ 620=To_Be_Accepted 621=INITIAL_TATE 622=ACCEPTANCE 623=Latitude and longitude 624=Triggered range 2532=Visitor Invitation Record @@ -1882,6 +1884,9 @@ 620=待验收 621=初始态 622=验收 623=经纬度 624=触发范围 2532=访客邀请记录 @@ -3156,6 +3161,8 @@ 620=To_Be_Accepted 621=INITIAL_TATE 622=ACCEPTANCE 623=Latitude and longitude 624=Triggered range 2532=Visitor Invitation Record @@ -4425,6 +4432,8 @@ 620=To_Be_Accepted 621=INITIAL_TATE 622=ACCEPTANCE 623=Latitude and longitude 624=Triggered range @@ -5684,6 +5693,8 @@ 620=To_Be_Accepted 621=INITIAL_TATE 622=ACCEPTANCE 623=Latitude and longitude 624=Triggered range HDL-ON_Android/HDL-ON_Android.csproj
@@ -226,7 +226,6 @@ <Compile Include="Zxing\CustomCaptureActivity.cs" /> <Compile Include="Zxing\ScanActivity.cs" /> <Compile Include="LeChengVideo\LeTest.cs" /> <Compile Include="Other\SmsReceiver.cs" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\agconnect-services.json" /> HDL-ON_Android/Other/SmsReceiver.cs
File was deleted 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:versionName="1.7.5" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202305101"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202305122"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <!--友盟--> <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>--> HDL-ON_iOS/Info.plist
@@ -11,7 +11,7 @@ <key>CFBundleName</key> <string>On Pro</string> <key>CFBundleShortVersionString</key> <string>1.7.5</string> <string>1.7.6</string> <key>CFBundleURLTypes</key> <array> <dict> @@ -36,7 +36,7 @@ </dict> </array> <key>CFBundleVersion</key> <string>1.7.5</string> <string>1.7.6</string> <key>LSApplicationQueriesSchemes</key> <array> <string>weixinULAPI</string> HDL-ON_iOS/Resources/Language.ini
@@ -607,6 +607,8 @@ 620=To_Be_Accepted 621=INITIAL_TATE 622=ACCEPTANCE 623=Latitude and longitude 624=Triggered range 2532=Visitor Invitation Record @@ -1882,6 +1884,9 @@ 620=待验收 621=初始态 622=验收 623=经纬度 624=触发范围 2532=访客邀请记录 @@ -3156,6 +3161,8 @@ 620=To_Be_Accepted 621=INITIAL_TATE 622=ACCEPTANCE 623=Latitude and longitude 624=Triggered range 2532=Visitor Invitation Record @@ -4425,6 +4432,8 @@ 620=To_Be_Accepted 621=INITIAL_TATE 622=ACCEPTANCE 623=Latitude and longitude 624=Triggered range @@ -5684,6 +5693,8 @@ 620=To_Be_Accepted 621=INITIAL_TATE 622=ACCEPTANCE 623=Latitude and longitude 624=Triggered range HDL_ON/Common/R.cs
@@ -4,8 +4,14 @@ { public static class StringId { /// <summary> /// 触发范围 /// </summary> public const int TriggeredRange = 624; /// <summary> /// 经纬度 /// </summary> public const int LatAndLon= 623; /// <summary> /// 验收 /// </summary> HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.7.5"; public static string VersionString = "1.7.6"; ///// <summary> ///// 客户端类型 ///// </summary> @@ -140,7 +140,7 @@ _RoomNotSupportFunctionList.Add(SPK.AvMusic); _RoomNotSupportFunctionList.Add(SPK.AirSwitch); _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy); _RoomNotSupportFunctionList.Add(SPK.OtherCommon); //_RoomNotSupportFunctionList.Add(SPK.OtherCommon); _RoomNotSupportFunctionList.Add(SPK.SensorLight); _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList()); //_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList()); HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs
@@ -25,7 +25,7 @@ { RemoveFromParent(); }; topView.topNameBtn.Text = "选择定位位置"; topView.topNameBtn.TextID = StringId.Setting;// = "选择定位位置"; FrameLayout viewLayout = new FrameLayout { @@ -43,7 +43,7 @@ lonlatView.btnText.X = Application.GetRealWidth(16); lonlatView.btnLine.X = Application.GetRealWidth(16); lonlatView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16); lonlatView.btnText.Text = "当前的经纬度"; lonlatView.btnText.TextID = StringId.LatAndLon; lonlatView.btnState.Visible = true; lonlatView.btnState.IsMoreLines = true; lonlatView.btnState.Height = Application.GetRealHeight(25); @@ -59,7 +59,7 @@ locateView.btnText.X = Application.GetRealWidth(16); locateView.btnLine.X = Application.GetRealWidth(16); locateView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16); locateView.btnText.Text = "在该位置范围时"; locateView.btnText.TextID = StringId.TriggeredRange; locateView.btnState.Visible = true; locateView.btnState.Text = this.queryItem(r.ToString()); viewLayout.AddChidren(locateView.FLayoutView()); HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -248,7 +248,10 @@ function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off"; System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString()); d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString()); if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null) { d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString()); } //if (btnSwitch.IsSelected) //{ // d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());