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.5.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202206082"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.5.8" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202206261"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <!--友盟--> <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>--> @@ -88,13 +88,7 @@ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.READ_LOGS" /> <!-- 极光推送结束 --> <application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon" android:requestLegacyExternalStorage="true" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro"> <application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon" android:requestLegacyExternalStorage="true" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro"> <!--/扫描二维码activity--> <!--<activity android:name="com.journeyapps.barcodescanner.CaptureActivity" @@ -105,7 +99,6 @@ android:name=".CustomCaptureActivity" android:screenOrientation="portrait" tools:replace="screenOrientation" />--> <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_Android/Resources/Resource.designer.cs
Diff too large HDL-ON_Android/SplashActivity.cs
@@ -46,6 +46,8 @@ { base.OnCreate(savedInstanceState); //Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class); //StartActivityForResult(i, 1); //OverridePendingTransition(0, 0); @@ -107,6 +109,9 @@ BaseActivity.KeepScreenON = false; //隐藏虚拟按键 BaseActivity.IsHideVirualButtons = true; //实现安卓返回按键 BaseActivity.BackKeyAction = () => { @@ -138,9 +143,18 @@ Language.CurrentLanguage = "Chinese"; Locale locale1 = Locale.Default; var localeList = Resources.Configuration.Locale; Console.WriteLine("999999999999999999999999999999999999999999999"+ localeList.Language); if (localeList.Language == "zh") { Language.CurrentLanguage = "Chinese"; } else if(localeList.Language == "es") { Language.CurrentLanguage = "Spanish"; } else if (localeList.Language == "ru") { Language.CurrentLanguage = "russian"; } else { @@ -171,6 +185,26 @@ }; BaseActivity.RefreshUIAction += (activity) => { Language.CurrentLanguage = "Chinese"; Locale locale1 = Locale.Default; var localeList = Resources.Configuration.Locale; Console.WriteLine("999999999999999999999999999999999999999999999" + localeList.Language); if (localeList.Language == "zh") { Language.CurrentLanguage = "Chinese"; } else if (localeList.Language == "es") { Language.CurrentLanguage = "Spanish"; } else if (localeList.Language == "ru") { Language.CurrentLanguage = "russian"; } else { Language.CurrentLanguage = "English"; } MainPage.Show(); checkSomeInfo(); }; HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.5.502205241</string> <string>1.5.502206241</string> <key>CFBundleVersion</key> <string>1.5.505241</string> <string>1.5.506241</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL_APP_Project.sln
@@ -6,19 +6,19 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HDL-ON_Android", "HDL-ON_Android\HDL-ON_Android.csproj", "{09712674-2A38-407B-B1E2-560B2C352F9A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Droid.HDLLinphone", "..\HDLLinphoneSDK_AndroidNew\Shared.Droid.HDLLinphone\Shared.Droid.HDLLinphone\Shared.Droid.HDLLinphone.csproj", "{703D29ED-674F-44A8-8AAD-863035899D4B}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HDL-ON_iOS", "HDL-ON_iOS\HDL-ON_iOS.csproj", "{D998E133-F0DD-4760-BE3C-461632F54DA4}" EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "HDL-ON_iOS", "HDL-ON_iOS\HDL-ON_iOS.csproj", "{A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Blufi", "HdlBluWi\Blufi.csproj", "{2DDF4C3C-6998-432E-9F43-6786D82F0630}" EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Blufi", "HdlBluWi\Blufi.csproj", "{4B2F495E-0CA8-4654-8B95-39FCA775BE62}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiriIntentsUI", "SiriIntentsUI\SiriIntentsUI.csproj", "{ACC48A7F-250B-4915-A250-9BC399DBD6B3}" EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "SiriIntentsUI", "SiriIntentsUI\SiriIntentsUI.csproj", "{E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiriKit", "SiriKit\SiriKit.csproj", "{8B1652FA-5158-4D57-B90D-07BB91766625}" EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "SiriKit", "SiriKit\SiriKit.csproj", "{3DA557EC-FA50-47F6-B60C-8606605C2399}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiriIntents", "SiriIntents\SiriIntents.csproj", "{760980F5-1CD3-4F4F-9134-34D87BECD790}" EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "SiriIntents", "SiriIntents\SiriIntents.csproj", "{933FF3C8-6848-4615-B67A-8919E4290E45}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UMSdk", "UMSdk\UMSdk.csproj", "{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}" EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "UMSdk", "UMSdk\UMSdk.csproj", "{8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Droid.HDLLinphone", "Shared.Droid.HDLLinphone\Shared.Droid.HDLLinphone.csproj", "{703D29ED-674F-44A8-8AAD-863035899D4B}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -49,6 +49,78 @@ {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhone.Build.0 = Release|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|Any CPU.ActiveCfg = Debug|iPhone {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|Any CPU.Build.0 = Debug|iPhone {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhone.ActiveCfg = Debug|iPhone {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhone.Build.0 = Debug|iPhone {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhone.ActiveCfg = Release|iPhone {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhone.Build.0 = Release|iPhone {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Debug|Any CPU.Build.0 = Debug|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Debug|iPhone.ActiveCfg = Debug|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Debug|iPhone.Build.0 = Debug|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|Any CPU.ActiveCfg = Release|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|Any CPU.Build.0 = Release|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|iPhone.ActiveCfg = Release|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|iPhone.Build.0 = Release|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Debug|Any CPU.ActiveCfg = Debug|iPhone {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Debug|Any CPU.Build.0 = Debug|iPhone {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Debug|iPhone.ActiveCfg = Debug|iPhone {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Debug|iPhone.Build.0 = Debug|iPhone {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Release|iPhone.ActiveCfg = Release|iPhone {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Release|iPhone.Build.0 = Release|iPhone {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {ACC48A7F-250B-4915-A250-9BC399DBD6B3}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {8B1652FA-5158-4D57-B90D-07BB91766625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8B1652FA-5158-4D57-B90D-07BB91766625}.Debug|Any CPU.Build.0 = Debug|Any CPU {8B1652FA-5158-4D57-B90D-07BB91766625}.Debug|iPhone.ActiveCfg = Debug|Any CPU {8B1652FA-5158-4D57-B90D-07BB91766625}.Debug|iPhone.Build.0 = Debug|Any CPU {8B1652FA-5158-4D57-B90D-07BB91766625}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {8B1652FA-5158-4D57-B90D-07BB91766625}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {8B1652FA-5158-4D57-B90D-07BB91766625}.Release|Any CPU.ActiveCfg = Release|Any CPU {8B1652FA-5158-4D57-B90D-07BB91766625}.Release|Any CPU.Build.0 = Release|Any CPU {8B1652FA-5158-4D57-B90D-07BB91766625}.Release|iPhone.ActiveCfg = Release|Any CPU {8B1652FA-5158-4D57-B90D-07BB91766625}.Release|iPhone.Build.0 = Release|Any CPU {8B1652FA-5158-4D57-B90D-07BB91766625}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {8B1652FA-5158-4D57-B90D-07BB91766625}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {760980F5-1CD3-4F4F-9134-34D87BECD790}.Debug|Any CPU.ActiveCfg = Debug|iPhone {760980F5-1CD3-4F4F-9134-34D87BECD790}.Debug|Any CPU.Build.0 = Debug|iPhone {760980F5-1CD3-4F4F-9134-34D87BECD790}.Debug|iPhone.ActiveCfg = Debug|iPhone {760980F5-1CD3-4F4F-9134-34D87BECD790}.Debug|iPhone.Build.0 = Debug|iPhone {760980F5-1CD3-4F4F-9134-34D87BECD790}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {760980F5-1CD3-4F4F-9134-34D87BECD790}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {760980F5-1CD3-4F4F-9134-34D87BECD790}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {760980F5-1CD3-4F4F-9134-34D87BECD790}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {760980F5-1CD3-4F4F-9134-34D87BECD790}.Release|iPhone.ActiveCfg = Release|iPhone {760980F5-1CD3-4F4F-9134-34D87BECD790}.Release|iPhone.Build.0 = Release|iPhone {760980F5-1CD3-4F4F-9134-34D87BECD790}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {760980F5-1CD3-4F4F-9134-34D87BECD790}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Debug|Any CPU.Build.0 = Debug|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Debug|iPhone.ActiveCfg = Debug|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Debug|iPhone.Build.0 = Debug|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Release|Any CPU.ActiveCfg = Release|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Release|Any CPU.Build.0 = Release|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Release|iPhone.ActiveCfg = Release|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Release|iPhone.Build.0 = Release|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {703D29ED-674F-44A8-8AAD-863035899D4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {703D29ED-674F-44A8-8AAD-863035899D4B}.Debug|Any CPU.Build.0 = Debug|Any CPU {703D29ED-674F-44A8-8AAD-863035899D4B}.Debug|iPhone.ActiveCfg = Debug|Any CPU @@ -61,78 +133,6 @@ {703D29ED-674F-44A8-8AAD-863035899D4B}.Release|iPhone.Build.0 = Release|Any CPU {703D29ED-674F-44A8-8AAD-863035899D4B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {703D29ED-674F-44A8-8AAD-863035899D4B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}.Debug|Any CPU.ActiveCfg = Debug|iPhone {A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}.Debug|Any CPU.Build.0 = Debug|iPhone {A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}.Debug|iPhone.ActiveCfg = Debug|iPhone {A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}.Debug|iPhone.Build.0 = Debug|iPhone {A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}.Release|iPhone.ActiveCfg = Release|iPhone {A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}.Release|iPhone.Build.0 = Release|iPhone {A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {A50A33C1-EC91-4BCE-B87A-8C85E73CE15D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {4B2F495E-0CA8-4654-8B95-39FCA775BE62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4B2F495E-0CA8-4654-8B95-39FCA775BE62}.Debug|Any CPU.Build.0 = Debug|Any CPU {4B2F495E-0CA8-4654-8B95-39FCA775BE62}.Debug|iPhone.ActiveCfg = Debug|Any CPU {4B2F495E-0CA8-4654-8B95-39FCA775BE62}.Debug|iPhone.Build.0 = Debug|Any CPU {4B2F495E-0CA8-4654-8B95-39FCA775BE62}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {4B2F495E-0CA8-4654-8B95-39FCA775BE62}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {4B2F495E-0CA8-4654-8B95-39FCA775BE62}.Release|Any CPU.ActiveCfg = Release|Any CPU {4B2F495E-0CA8-4654-8B95-39FCA775BE62}.Release|Any CPU.Build.0 = Release|Any CPU {4B2F495E-0CA8-4654-8B95-39FCA775BE62}.Release|iPhone.ActiveCfg = Release|Any CPU {4B2F495E-0CA8-4654-8B95-39FCA775BE62}.Release|iPhone.Build.0 = Release|Any CPU {4B2F495E-0CA8-4654-8B95-39FCA775BE62}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {4B2F495E-0CA8-4654-8B95-39FCA775BE62}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}.Debug|Any CPU.ActiveCfg = Debug|iPhone {E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}.Debug|Any CPU.Build.0 = Debug|iPhone {E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}.Debug|iPhone.ActiveCfg = Debug|iPhone {E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}.Debug|iPhone.Build.0 = Debug|iPhone {E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}.Release|iPhone.ActiveCfg = Release|iPhone {E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}.Release|iPhone.Build.0 = Release|iPhone {E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {E0F35B75-7B99-4B00-9ECD-AA8470E6AC4B}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {3DA557EC-FA50-47F6-B60C-8606605C2399}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3DA557EC-FA50-47F6-B60C-8606605C2399}.Debug|Any CPU.Build.0 = Debug|Any CPU {3DA557EC-FA50-47F6-B60C-8606605C2399}.Debug|iPhone.ActiveCfg = Debug|Any CPU {3DA557EC-FA50-47F6-B60C-8606605C2399}.Debug|iPhone.Build.0 = Debug|Any CPU {3DA557EC-FA50-47F6-B60C-8606605C2399}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {3DA557EC-FA50-47F6-B60C-8606605C2399}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {3DA557EC-FA50-47F6-B60C-8606605C2399}.Release|Any CPU.ActiveCfg = Release|Any CPU {3DA557EC-FA50-47F6-B60C-8606605C2399}.Release|Any CPU.Build.0 = Release|Any CPU {3DA557EC-FA50-47F6-B60C-8606605C2399}.Release|iPhone.ActiveCfg = Release|Any CPU {3DA557EC-FA50-47F6-B60C-8606605C2399}.Release|iPhone.Build.0 = Release|Any CPU {3DA557EC-FA50-47F6-B60C-8606605C2399}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {3DA557EC-FA50-47F6-B60C-8606605C2399}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {933FF3C8-6848-4615-B67A-8919E4290E45}.Debug|Any CPU.ActiveCfg = Debug|iPhone {933FF3C8-6848-4615-B67A-8919E4290E45}.Debug|Any CPU.Build.0 = Debug|iPhone {933FF3C8-6848-4615-B67A-8919E4290E45}.Debug|iPhone.ActiveCfg = Debug|iPhone {933FF3C8-6848-4615-B67A-8919E4290E45}.Debug|iPhone.Build.0 = Debug|iPhone {933FF3C8-6848-4615-B67A-8919E4290E45}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {933FF3C8-6848-4615-B67A-8919E4290E45}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {933FF3C8-6848-4615-B67A-8919E4290E45}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {933FF3C8-6848-4615-B67A-8919E4290E45}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {933FF3C8-6848-4615-B67A-8919E4290E45}.Release|iPhone.ActiveCfg = Release|iPhone {933FF3C8-6848-4615-B67A-8919E4290E45}.Release|iPhone.Build.0 = Release|iPhone {933FF3C8-6848-4615-B67A-8919E4290E45}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {933FF3C8-6848-4615-B67A-8919E4290E45}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}.Debug|Any CPU.Build.0 = Debug|Any CPU {8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}.Debug|iPhone.ActiveCfg = Debug|Any CPU {8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}.Debug|iPhone.Build.0 = Debug|Any CPU {8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}.Release|Any CPU.ActiveCfg = Release|Any CPU {8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}.Release|Any CPU.Build.0 = Release|Any CPU {8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}.Release|iPhone.ActiveCfg = Release|Any CPU {8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}.Release|iPhone.Build.0 = Release|Any CPU {8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {8E7D755A-8FE2-4A89-9ECB-A3D05A4ABE95}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm /// <summary> /// RegionMark /// </summary> HDL_ON/Entity/Function/Function.cs
@@ -1196,14 +1196,19 @@ public string loopId; } /// <summary> /// Tag 功能SPK /// </summary> public static class SPK { /// <summary> /// 门锁 /// </summary> public const string DoorLock = "security.door"; /// <summary> /// 门锁spk列表 /// </summary> /// <returns></returns> public static List<string> GetDoorLockSPKList() { var list = new List<string>(); @@ -1267,6 +1272,10 @@ /// （卷帘） /// </summary> public const string CurtainRoller = "curtain.roller"; /// <summary> /// 梦幻帘 /// </summary> public const string CurtainDream = "curtain.dream"; /// <summary> /// 窗帘spk列表 @@ -1279,6 +1288,7 @@ spkList.Add(CurtainSwitch); spkList.Add(CurtainShades); spkList.Add(CurtainTrietex); spkList.Add(CurtainDream); return spkList; } #endregion HDL_ON/Entity/Function/Scene.cs
@@ -540,6 +540,10 @@ public int min = 0; /// <summary> /// 属性的值列表 /// </summary> public List<string> valueList = new List<string>(); /// <summary> /// 属性名称显示文本 /// 中英文显示 /// </summary> HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.5.5"; public static string VersionString = "1.5.81"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -482,6 +482,13 @@ scene.functions.Remove(scenefunction); continue; } //将spk实体里面的min max值放入场景功能实体里，要不然数据会丢失 2022-06-21 16:06:45 foreach (var tt in scenefunction.status) { tt.min = scenefunction.localFunction.GetAttribute(tt.key).min; tt.max = scenefunction.localFunction.GetAttribute(tt.key).max; tt.valueList = scenefunction.localFunction.GetAttribute(tt.key).value; } i++; var row = new RowLayout() { HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
@@ -165,6 +165,12 @@ else { var selectedRoom = Room.CurrentSpatial.RoomList.Find((obj) => obj.uid == DB_ResidenceData.Instance.sceneChooseRoomId); if (selectedRoom == null) { LoadFunctionListRow(null); } else { var listAllFun = new List<Function>(); var listFun = new List<Function>(); @@ -180,7 +186,7 @@ } } LoadFunctionListRow(listFun); } }
@@ -568,7 +568,9 @@ }) { IsBackground = true }.Start(); } catch { } catch (Exception ex) { MainPage.Log(ex.Message); } }
@@ -84,6 +84,15 @@ public FloorHeatingPage(Function func) { bodyView = this; var tempAttr = func.GetAttribute(FunctionAttributeKey.SetTemp); if (tempAttr != null) { if(tempAttr.min == 0 && tempAttr.max == 0) { tempAttr.min = 16; tempAttr.max = 30; } } function = func; }
@@ -350,6 +350,28 @@ DriverLayer.Control.Ins.SendReadCommand(function); }) { IsBackground = true }.Start(); new System.Threading.Thread(() => { while (true) { System.Threading.Thread.Sleep(500); System.Threading.Thread.Sleep(500); if (curDimmerStatus) { continue; } if (onDimmerBar) { onDimmerBar = false; continue; } else { DriverLayer.Control.Ins.SendReadCommand(function); } } }) { IsBackground = true }.Start(); } /// <summary> HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -27,8 +27,11 @@ { bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness)); } if (updataTemp.GetAttrState(FunctionAttributeKey.Brightness) != "0") { bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%"; bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80); } } else { @@ -134,6 +137,7 @@ }; } bool curDimmerStatus = false; /// <summary> /// 灯光调光事件 /// </summary> @@ -141,17 +145,18 @@ { dimmerBar.OnStopTrackingTouchEvent = (sender, e) => { if (!function.online) { new Tip() { CloseTime = 1, Text = Language.StringByID(StringId.DeviceOfflineCannotOption), Direction = AMPopTipDirection.None, }.Show(MainPage.BaseView); return; } onDimmerBar = false; //if (!function.online) //{ // new Tip() // { // CloseTime = 1, // Text = Language.StringByID(StringId.DeviceOfflineCannotOption), // Direction = AMPopTipDirection.None, // }.Show(MainPage.BaseView); // return; //} //onDimmerBar = false; curDimmerStatus = false; function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress); System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString()); HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
@@ -262,9 +262,35 @@ DriverLayer.Control.Ins.SendReadCommand(function); }) { IsBackground = true }.Start(); new System.Threading.Thread(() => { while (true) { System.Threading.Thread.Sleep(500); if (curDimmerStatus) { continue; } if ( onDimmerBar) { onDimmerBar = false; continue; } else { DriverLayer.Control.Ins.SendReadCommand(function); } } }) { IsBackground = true }.Start(); } } } HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -21,13 +21,13 @@ if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid) { bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%"; bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32( updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40); if (updataTemp.trait_on_off.curValue.ToString() == "on") { bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1); if (!bodyView.onDimmerBar) { bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness)); bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40); } } else @@ -83,6 +83,8 @@ }; } bool curDimmerStatus = false; /// <summary> /// 灯光调光事件 /// </summary> @@ -92,12 +94,13 @@ { dimmerBar.OnStartTrackingTouchEvent = (sender, e) => { onDimmerBar = true; curDimmerStatus = onDimmerBar = true; dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1); }; dimmerBar.OnStopTrackingTouchEvent = (sender, e) => { onDimmerBar = false; curDimmerStatus = false; function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress); System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString()); @@ -133,9 +136,9 @@ function.refreshTime = DateTime.Now; new System.Threading.Thread(() => { System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.Brightness, e.ToString()); Control.Ins.SendWriteCommand(function, d); System.Collections.Generic.Dictionary<string, string> dic = new System.Collections.Generic.Dictionary<string, string>(); dic.Add(FunctionAttributeKey.Brightness, e.ToString()); Control.Ins.SendWriteCommand(function, dic); }) { IsBackground = true }.Start(); } Shared.Droid.HDLLinphone/Additions/AboutAdditions.txt
New file @@ -0,0 +1,48 @@ Additions allow you to add arbitrary C# to the generated classes before they are compiled. This can be helpful for providing convenience methods or adding pure C# classes. == Adding Methods to Generated Classes == Let's say the library being bound has a Rectangle class with a constructor that takes an x and y position, and a width and length size. It will look like this: public partial class Rectangle { public Rectangle (int x, int y, int width, int height) { // JNI bindings } } Imagine we want to add a constructor to this class that takes a Point and Size structure instead of 4 ints. We can add a new file called Rectangle.cs with a partial class containing our new method: public partial class Rectangle { public Rectangle (Point location, Size size) : this (location.X, location.Y, size.Width, size.Height) { } } At compile time, the additions class will be added to the generated class and the final assembly will a Rectangle class with both constructors. == Adding C# Classes == Another thing that can be done is adding fully C# managed classes to the generated library. In the above example, let's assume that there isn't a Point class available in Java or our library. The one we create doesn't need to interact with Java, so we'll create it like a normal class in C#. By adding a Point.cs file with this class, it will end up in the binding library: public class Point { public int X { get; set; } public int Y { get; set; } } Shared.Droid.HDLLinphone/Jars/AboutJars.txt
New file @@ -0,0 +1,24 @@ This directory is for Android .jars. There are 2 types of jars that are supported: == Input Jar == This is the jar that bindings should be generated for. For example, if you were binding the Google Maps library, this would be Google's "maps.jar". Set the build action for these jars in the properties page to "InputJar". == Reference Jars == These are jars that are referenced by the input jar. C# bindings will not be created for these jars. These jars will be used to resolve types used by the input jar. NOTE: Do not add "android.jar" as a reference jar. It will be added automatically based on the Target Framework selected. Set the build action for these jars in the properties page to "ReferenceJar". Shared.Droid.HDLLinphone/Jars/HDLLinphoneSDK-V1.0.1.aarBinary files differ
Shared.Droid.HDLLinphone/Properties/AssemblyInfo.cs
New file @@ -0,0 +1,26 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Android.App; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Shared.Droid.HDLLinphone")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Shared.Droid.HDLLinphone")] [assembly: AssemblyCopyright("Copyright © 2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] // Version information for an assembly consists of the following four values: // // Major Version // Minor Version // Build Number // Revision [assembly: AssemblyVersion("1.0.1.7")] [assembly: AssemblyFileVersion("1.0.1.7")] Shared.Droid.HDLLinphone/Shared.Droid.HDLLinphone.csproj
New file @@ -0,0 +1,74 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{703D29ED-674F-44A8-8AAD-863035899D4B}</ProjectGuid> <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <TemplateGuid>{77efb91c-a7e9-4b0e-a7c5-31eeec3c6d46}</TemplateGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Shared.Droid.HDLLinphone</RootNamespace> <AssemblyName>Shared.Droid.HDLLinphone</AssemblyName> <FileAlignment>512</FileAlignment> <Deterministic>True</Deterministic> <TargetFrameworkVersion>v8.0</TargetFrameworkVersion> <AndroidClassParser>class-parse</AndroidClassParser> <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget> <RestoreProjectStyle>PackageReference</RestoreProjectStyle> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> <DebugType>portable</DebugType> <Optimize>false</Optimize> <OutputPath>bin\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <Optimize>true</Optimize> <OutputPath>bin\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> <Reference Include="Mono.Android" /> <Reference Include="System" /> <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> <None Include="Jars\AboutJars.txt" /> <None Include="Additions\AboutAdditions.txt" /> </ItemGroup> <ItemGroup> <TransformFile Include="Transforms\Metadata.xml" /> <TransformFile Include="Transforms\EnumFields.xml" /> <TransformFile Include="Transforms\EnumMethods.xml" /> </ItemGroup> <ItemGroup> <PackageReference Include="Xamarin.Android.Support.v7.AppCompat"> <Version>28.0.0.3</Version> </PackageReference> <PackageReference Include="Xamarin.Android.Arch.Core.Common"> <Version>1.1.1.3</Version> </PackageReference> </ItemGroup> <ItemGroup> <LibraryProjectZip Include="Jars\HDLLinphoneSDK-V1.0.1.aar" /> </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> </Target> <Target Name="AfterBuild"> </Target> --> </Project> Shared.Droid.HDLLinphone/Transforms/EnumFields.xml
New file @@ -0,0 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <enum-field-mappings> <!-- This example converts the constants Fragment_id, Fragment_name, and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag to an enum called Android.Support.V4.App.FragmentTagType with values Id, Name, and Tag. <mapping jni-class="android/support/v4/app/FragmentActivity$FragmentTag" clr-enum-type="Android.Support.V4.App.FragmentTagType"> <field jni-name="Fragment_name" clr-name="Name" value="0" /> <field jni-name="Fragment_id" clr-name="Id" value="1" /> <field jni-name="Fragment_tag" clr-name="Tag" value="2" /> </mapping> --> </enum-field-mappings> Shared.Droid.HDLLinphone/Transforms/EnumMethods.xml
New file @@ -0,0 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <enum-method-mappings> <!-- This example changes the Java method: android.support.v4.app.Fragment.SavedState.writeToParcel (int flags) to be: android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags) when bound in C#. <mapping jni-class="android/support/v4/app/Fragment.SavedState"> <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" /> </mapping> --> </enum-method-mappings> Shared.Droid.HDLLinphone/Transforms/Metadata.xml
New file @@ -0,0 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <metadata> <!-- This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask: <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" /> This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground: <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" /> --> <remove-node path="/api/package[starts-with(@name,'org.linphone')]" /> <remove-node path="/api/package[starts-with(@name,'org.apache')]" /> </metadata> SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,8 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm /// <summary> /// RegionMark /// </summary>
