From 098ca04f324624d97399c7c1040c46d2a96ebfaa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 23 四月 2023 09:21:54 +0800
Subject: [PATCH] V1.7.1发布版本
---
HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs | 4
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_iOS/Info.plist | 80 ++++++++-----------
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs | 55 +++++++------
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs | 19 +++-
ys/Properties/AssemblyInfo.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs | 9 +-
HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs | 4
DLL/EZvizMonitor/ys.dll | 0
10 files changed, 86 insertions(+), 95 deletions(-)
diff --git a/DLL/EZvizMonitor/ys.dll b/DLL/EZvizMonitor/ys.dll
index 8cfec92..58dc24a 100644
--- a/DLL/EZvizMonitor/ys.dll
+++ b/DLL/EZvizMonitor/ys.dll
Binary files differ
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 91773bc..193dcef 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:versionName="1.7.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202304211">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202304221">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<!--鍙嬬洘-->
<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 68ad9fc..826cae5 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -61,51 +61,6 @@
<string>TLSv1.0</string>
</dict>
</dict>
- <key>NSAppleMusicUsageDescription</key>
- <string>App needs to access your music library to connect to an external player to play music.</string>
- <key>NSBluetoothAlwaysUsageDescription</key>
- <string>This application uses Bluetooth to communicate with the device, this application does not collect, store or record any data that communicates via Bluetooth.</string>
- <key>NSBluetoothPeripheralUsageDescription</key>
- <string>This application uses Bluetooth to communicate with the device, this application does not collect, store or record any data that communicates via Bluetooth.</string>
- <key>NSCameraUsageDescription</key>
- <string>App wants to access your camera to set the background picture of the room</string>
- <key>NSContactsUsageDescription</key>
- <string>LC Video will be use</string>
- <key>NSFaceIDUsageDescription</key>
- <string>Need to use Face ID for unlock verification</string>
- <key>NSLocalNetworkUsageDescription</key>
- <string>APP wants to use local network access permissions for WiFi distribution.</string>
- <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
- <string>LC Video will be use</string>
- <key>NSLocationAlwaysUsageDescription</key>
- <string>Use geographic location to provide services such as weather</string>
- <key>NSLocationWhenInUseUsageDescription</key>
- <string>EZ video will be use</string>
- <key>NSMicrophoneUsageDescription</key>
- <string>APP wants to use the phone's microphone for voice intercom</string>
- <key>NSPhotoLibraryAddUsageDescription</key>
- <string>App wants to access your photo library to set the background image of the room</string>
- <key>NSPhotoLibraryUsageDescription</key>
- <string>App wants to access your photo library to set the background image of the room</string>
- <key>NSSiriUsageDescription</key>
- <string>On Pro data will be send to Siri.</string>
- <key>NSUserActivityTypes</key>
- <array>
- <string>HDLRunSceneIntent</string>
- </array>
- <key>NSVoIPUsageDescription</key>
- <string>Make audio/video calls</string>
- <key>UIAppFonts</key>
- <array>
- <string>titilliumtext25l005.otf</string>
- </array>
- <key>UIBackgroundModes</key>
- <array>
- <string>audio</string>
- <string>location</string>
- <string>voip</string>
- <string>remote-notification</string>
- </array>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
@@ -142,7 +97,38 @@
<false/>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>
- <key>UILaunchStoryboardName</key>
- <string>LaunchScreen</string>
+ <key>NSAppleMusicUsageDescription</key>
+ <string>App needs to access your music library to connect to an external player to play music.</string>
+ <key>NSLocationAlwaysUsageDescription</key>
+ <string>Use geographic location to provide services such as weather</string>
+ <key>UIBackgroundModes</key>
+ <array>
+ <string>audio</string>
+ <string>location</string>
+ <string>voip</string>
+ <string>remote-notification</string>
+ </array>
+ <key>NSFaceIDUsageDescription</key>
+ <string>Need to use Face ID for unlock verification</string>
+ <key>NSBluetoothPeripheralUsageDescription</key>
+ <string>This application uses Bluetooth to communicate with the device, this application does not collect, store or record any data that communicates via Bluetooth.</string>
+ <key>NSBluetoothAlwaysUsageDescription</key>
+ <string>This application uses Bluetooth to communicate with the device, this application does not collect, store or record any data that communicates via Bluetooth.</string>
+ <key>NSVoIPUsageDescription</key>
+ <string>Make audio/video calls</string>
+ <key>NSSiriUsageDescription</key>
+ <string>On Pro data will be send to Siri.</string>
+ <key>NSUserActivityTypes</key>
+ <array>
+ <string>HDLRunSceneIntent</string>
+ </array>
+ <key>NSContactsUsageDescription</key>
+ <string>LC Video will be use</string>
+ <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+ <string>LC Video will be use</string>
+ <key>NSLocationWhenInUseUsageDescription</key>
+ <string>EZ video will be use</string>
+ <key>XSLaunchImageAssets</key>
+ <string>Assets.xcassets/LaunchImage.launchimage</string>
</dict>
</plist>
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index afdeb75..1b48b0d 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -221,7 +221,7 @@
/// <summary>
/// 鏄剧ず鐨勮澶囩殑鎬绘暟
/// </summary>
- int showCount = 0;
+ int showCount = -1;
/// <summary>
/// 鍔犺浇鍔熻兘row
/// </summary>
@@ -239,7 +239,7 @@
{
if (!isAppend)
{
- showCount = 0;
+ showCount = -1;
functionListView.RemoveAll();
}
for(var i = 0;i<50;i++)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
index b90288d..b5a8776 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
@@ -50,7 +50,7 @@
/// <summary>
/// 鍥炶皟鍒锋柊
/// </summary>
- Action backActon;
+ Action<GroupControl> backActon;
/// <summary>
/// 鏄惁鏂板缇ゆ帶
/// </summary>
@@ -64,7 +64,7 @@
GroupControlType groupControlType = new GroupControlType();
- public AddGroupControlPage(GroupControl groupControl, Action action)
+ public AddGroupControlPage(GroupControl groupControl, Action<GroupControl> action)
{
bodyView = this;
if(groupControl == null)
@@ -182,6 +182,7 @@
Action chooseRoomBackAction = () => {
try
{
+ groupControl.uids = groupControl.roomIds;
btnLocationValues.Text = groupControl.GetRoomListName();
}
catch { }
@@ -389,7 +390,7 @@
{
MainPage.Log($"娣诲姞缇ゆ帶鎴愬姛锛岃浆璇戣繑鍥炴暟鎹け璐�:{ex.Message}");
}
- backActon?.Invoke();
+ backActon?.Invoke(groupControl);
this.RemoveFromParent();
}
else
@@ -440,7 +441,7 @@
{
temp = groupControl;
}
- backActon?.Invoke();
+ backActon?.Invoke(temp);
this.RemoveFromParent();
}
else
@@ -542,7 +543,7 @@
/// <summary>
/// 鏄剧ず鐨勮澶囩殑鎬绘暟
/// </summary>
- int showCount = 0;
+ int showCount = -1;
/// <summary>
/// 鍔犺浇鍔熻兘row
@@ -562,7 +563,7 @@
{
if (!isAppend)
{
- showCount = 0;
+ showCount = -1;
functionListView.RemoveAll();
}
for(var i =0;i<100;i++)
@@ -603,7 +604,7 @@
{
btnConfrim.IsSelected = false;
}
- if (groupControlLightList.Count == functions.Count)
+ if (groupControlLightList.Count != functions.Count)
{
btnChooseAll.TextID = StringId.SelectedAll;
}
@@ -675,6 +676,10 @@
var form = new FloorRoomSelectPopupView();
form.ShowDeviceFunctionView(btnFloor, this.lightList, (selectId, listFunc) =>
{
+ groupControlLightList.Clear();
+ groupControl.sids.Clear();
+ btnChooseAll.TextID = StringId.SelectAll;
+ btnConfrim.IsSelected = false;
btnChooseAll.MouseUpEventHandler = (sender2, e2) => {
if (groupControlLightList.Count > 0)
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
index c009c40..6d960f5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
@@ -26,7 +26,7 @@
try
{
var page = new AddGroupControlPage(null,
- ()=> {
+ (newGC)=> {
ReadGroupControlList();
});
MainPage.BasePageView.AddChidren(page);
@@ -101,7 +101,6 @@
roomIds = new List<string> { Room.CurrentSpatial.RoomList[0].roomId },
sid = "00000000000000001",
type = "light",
- uids = new List<string>() { Room.CurrentSpatial.RoomList[0].uid },
});
list.Add(new GroupControl()
@@ -110,7 +109,6 @@
roomIds = new List<string> { Room.CurrentSpatial.RoomList[0].roomId },
sid = "00000000000000002",
type = "light",
- uids = new List<string>() { Room.CurrentSpatial.RoomList[0].uid },
});
}
@@ -184,12 +182,13 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
var page = new AddGroupControlPage(groupControl,
- () => {
+ (newGC) => {
try
{
Application.RunOnMainThread(() =>
{
- btnFunctionLocationInfo.Text = groupControl.GetRoomListName();
+ groupControl.roomIds = newGC.uids;
+ btnFunctionLocationInfo.Text = newGC.GetUidListName();
});
}catch(Exception ex)
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
index 4591f0b..9c80d01 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
@@ -82,39 +82,40 @@
/// <summary>
/// 鎴块棿uid
/// </summary>
- public List<String> uids = new List<string>();
+ [Newtonsoft.Json.JsonIgnore]
+ public List<string> uids = new List<string>();
//public List<String> roomIds = new List<string>();
/// <summary>
/// 缇ゆ帶鍔熻兘sid閰嶇疆
/// </summary>
public List<GroupControlFunction> sids = new List<GroupControlFunction>();
- ///// <summary>
- ///// 鑾峰彇璁惧娣诲姞鍒版埧闂寸殑鎴块棿鍚嶇О
- ///// </summary>
- ///// <returns></returns>
- //public string GetRoomListName()
- //{
- // string roomNameList = "";
- // foreach (var roomId in roomIds)
- // {
- // var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
- // if (findRoom == null)
- // {
- // continue;
- // }
- // if (roomNameList != "")
- // {
- // roomNameList += ",";
- // }
- // roomNameList += findRoom.floorName + "-" + findRoom.roomName;
- // }
- // if (roomNameList == "")
- // {
- // roomNameList = Language.StringByID(StringId.WholeZone);
- // }
- // return roomNameList;
- //}
+ /// <summary>
+ /// 鑾峰彇璁惧娣诲姞鍒版埧闂寸殑鎴块棿鍚嶇О
+ /// </summary>
+ /// <returns></returns>
+ public string GetUidListName()
+ {
+ string roomNameList = "";
+ foreach (var roomId in uids)
+ {
+ var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
+ if (findRoom == null)
+ {
+ continue;
+ }
+ if (roomNameList != "")
+ {
+ roomNameList += ",";
+ }
+ roomNameList += findRoom.floorName + "-" + findRoom.roomName;
+ }
+ if (roomNameList == "")
+ {
+ roomNameList = Language.StringByID(StringId.WholeZone);
+ }
+ return roomNameList;
+ }
/// <summary>
/// 缇ゆ帶鎺у埗
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
index fd09740..a0aef90 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
@@ -194,7 +194,7 @@
/// <summary>
/// 鏄剧ず鐨勮澶囩殑鎬绘暟
/// </summary>
- int showCount = 0;
+ int showCount = -1;
/// <summary>
/// 鍔犺浇鍔熻兘row
@@ -214,7 +214,7 @@
{
if (!isAppend)
{
- showCount = 0;
+ showCount = -1;
functionListView.RemoveAll();
}
for(var i =0;i<100;i++)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs b/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs
index 958b494..a20397c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs
@@ -113,7 +113,7 @@
/// <summary>
/// 鏄剧ず鐨勮澶囩殑鎬绘暟
/// </summary>
- int showCount = 0;
+ int showCount = -1;
/// <summary>
/// 鍔犺浇鍔熻兘row
@@ -133,7 +133,7 @@
{
if (!isAppend)
{
- showCount = 0;
+ showCount = -1;
functionListView.RemoveAll();
}
diff --git a/ys/Properties/AssemblyInfo.cs b/ys/Properties/AssemblyInfo.cs
index e39619e..6c0bafd 100644
--- a/ys/Properties/AssemblyInfo.cs
+++ b/ys/Properties/AssemblyInfo.cs
@@ -22,5 +22,5 @@
// Minor Version
// Build Number
// Revision
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("23.04.22.0")]
+[assembly: AssemblyFileVersion("23.04.22.0")]
--
Gitblit v1.8.0