From 838b275cbd329316d45a125a793f4abd7948b49b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 23 一月 2022 17:20:26 +0800
Subject: [PATCH] 场景更新异常问题
---
HDL-ON_Android/Properties/AndroidManifest.xml | 4 +-
HDL-ON_iOS/Info.plist | 4 +-
HDL_APP_Project.sln | 14 +++++++
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 1
UMSdk/ApiDefinition.cs | 66 +++++++++++++++++++++++++++++++++
HDL_ON/DAL/Server/HttpUtil.cs | 4 +-
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 5 ++
HDL_ON/UI/MainPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 6 +-
9 files changed, 95 insertions(+), 11 deletions(-)
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 3fc1704..104a9b3 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/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">
<!--/鎵弿浜岀淮鐮乤ctivity-->
<!--<activity
android:name="com.journeyapps.barcodescanner.CaptureActivity"
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 484070e..ec26b5a 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/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>
diff --git a/HDL_APP_Project.sln b/HDL_APP_Project.sln
index aa7e006..fab839a 100644
--- a/HDL_APP_Project.sln
+++ b/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
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 6c692b6..315e9a2 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/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>
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 3a9894f..f264254 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/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>
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 87e2038..08fd54e 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/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()
{
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index c660e9e..49e93b2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/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(() =>
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index 07c2fdc..d87c19f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/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)
{
diff --git a/UMSdk/ApiDefinition.cs b/UMSdk/ApiDefinition.cs
new file mode 100644
index 0000000..cbde070
--- /dev/null
+++ b/UMSdk/ApiDefinition.cs
@@ -0,0 +1,66 @@
+锘縰sing 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
+ //
+}
+
--
Gitblit v1.8.0