| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Info.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_APP_Project.sln | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/1-HomePage/HomePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UMSdk/ApiDefinition.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="202201141" android:versionName="1.5.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202201231" android:versionName="1.5.4" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools"> <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="30" /> <!--友盟--> <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>--> @@ -88,7 +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="true" android:icon="@drawable/Icon" 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:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro"> <!--/扫描二维码activity--> <!--<activity android:name="com.journeyapps.barcodescanner.CaptureActivity" HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.5.102101121</string> <string>1.5.402101231</string> <key>CFBundleVersion</key> <string>1.5.101121</string> <string>1.5.401231</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL_APP_Project.sln
@@ -16,6 +16,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiriIntents", "SiriIntents\SiriIntents.csproj", "{760980F5-1CD3-4F4F-9134-34D87BECD790}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UMSdk", "UMSdk\UMSdk.csproj", "{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution HDL_ON\HDL_ON.projitems*{09712674-2a38-407b-b1e2-560b2c352f9a}*SharedItemsImports = 4 @@ -105,6 +107,18 @@ {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 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/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.5.2"; public static string VersionString = "1.5.4"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1186,6 +1186,7 @@ { btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png"; btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png"; btnCollection.Visible = false; Button btnPower; btnPower = new Button() { HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -436,7 +436,10 @@ var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId); if (tempScene != null) { scene = tempScene; scene.name = tempScene.name; scene.delay = tempScene.delay; scene.roomIds = tempScene.roomIds; scene.functions = tempScene.functions; } Application.RunOnMainThread(() => { HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -124,9 +124,9 @@ for (int i = 0; i < musicListFunction.Count; i++) { var function = musicListFunction[i]; var music = A31MusicModel.A31MusicModelList.Find((music) => (music.functionMusic.deviceId == function.deviceId && function.spk == "music.standard") || ( music.functionMusic.deviceId == function.deviceId && function.spk == "av.music") var music = A31MusicModel.A31MusicModelList.Find((obj) => (obj.functionMusic.deviceId == function.deviceId && function.spk == "music.standard") || ( obj.functionMusic.deviceId == function.deviceId && function.spk == "av.music") ); if (music == null) { UMSdk/ApiDefinition.cs
New file @@ -0,0 +1,66 @@ using System; using ObjCRuntime; using Foundation; using UIKit; namespace NativeLibrary { // The first step to creating a binding is to add your native library ("libNativeLibrary.a") // to the project by right-clicking (or Control-clicking) the folder containing this source // file and clicking "Add files..." and then simply select the native library (or libraries) // that you want to bind. // // When you do that, you'll notice that MonoDevelop generates a code-behind file for each // native library which will contain a [LinkWith] attribute. VisualStudio auto-detects the // architectures that the native library supports and fills in that information for you, // however, it cannot auto-detect any Frameworks or other system libraries that the // native library may depend on, so you'll need to fill in that information yourself. // // Once you've done that, you're ready to move on to binding the API... // // // Here is where you'd define your API definition for the native Objective-C library. // // For example, to bind the following Objective-C class: // // @interface Widget : NSObject { // } // // The C# binding would look like this: // // [BaseType (typeof (NSObject))] // interface Widget { // } // // To bind Objective-C properties, such as: // // @property (nonatomic, readwrite, assign) CGPoint center; // // You would add a property definition in the C# interface like so: // // [Export ("center")] // CGPoint Center { get; set; } // // To bind an Objective-C method, such as: // // -(void) doSomething:(NSObject *)object atIndex:(NSInteger)index; // // You would add a method definition to the C# interface like so: // // [Export ("doSomething:atIndex:")] // void DoSomething (NSObject object, int index); // // Objective-C "constructors" such as: // // -(id)initWithElmo:(ElmoMuppet *)elmo; // // Can be bound as: // // [Export ("initWithElmo:")] // IntPtr Constructor (ElmoMuppet elmo); // // For more information, see https://aka.ms/ios-binding // }
