Merge branch 'release0123' into Dev-Branch

wxr

2022-06-07 b8b6286b336ffcb778d5e7ed0e7881ab6f41619f

Merge branch 'release0123' into Dev-Branch

 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="202205241">
<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="202206011">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <!--友盟-->
    <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->

 HDL_ON/DAL/Server/NewAPI.cs

@@ -587,7 +587,7 @@
        /// <summary>
        /// 红外宝下的遥控器列表
        /// </summary>
        public const string API_POST_Ir_List = ":/home-wisdom/app/device/ir/list";
        public const string API_POST_Ir_List = "/home-wisdom/app/device/ir/list";
        /// <summary>
        /// 遥控器红外码学习
        /// </summary>

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -453,6 +453,10 @@

        #endregion

        /// <summary>
        /// 场景筛选时，选择的房间
        /// </summary>
        public string sceneChooseRoomId = "";


        /// <summary>

 HDL_ON/Entity/Function/Sensor.cs

@@ -161,7 +161,7 @@
                {
                    if (function.spk.Replace(".", "").Contains(attrKey.key.Replace(".", "")))
                    {
                        if (string.IsNullOrEmpty(attrKey.unit))
                        if (!string.IsNullOrEmpty(attrKey.unit))
                            return attrKey.unit;
                    }
                }

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs

@@ -98,6 +98,7 @@

        public void LoadPage(Action backRefresh)
        {
             //DB_ResidenceData.Instance.sceneChooseRoomId
            new TopViewDiv(bodyView, Language.StringByID(StringId.EditScene)).LoadTopView(backRefresh);
            initPage();
        }

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs

@@ -156,9 +156,33 @@
                {
                    unallocatedList.Add(function);
                }

            }
            if (string.IsNullOrEmpty(DB_ResidenceData.Instance.sceneChooseRoomId))
            {
                LoadFunctionListRow(null);
            }
            else
            {
                var selectedRoom = Room.CurrentSpatial.RoomList.Find((obj) => obj.uid == DB_ResidenceData.Instance.sceneChooseRoomId);

                var listAllFun = new List<Function>();

                var listFun = new List<Function>();

                listAllFun.AddRange(unallocatedList);

                listAllFun.AddRange(allocatedList);

                btnFloor.Text = selectedRoom.floorRoomName;
                foreach(var funtion in listAllFun)
                {
                    if (funtion.roomIds.Contains(selectedRoom.roomId))
                    {
                        listFun.Add(funtion);
                    }
                }
                LoadFunctionListRow(listFun);

            }

            LoadFunctionListRow(null);

            LoadEventList();
        }
@@ -278,6 +302,7 @@
                form.ShowDeviceFunctionView(btnFloor, listAllFun, (selectId, listFun) =>

                {

                    nowSelectId = selectId;

                    DB_ResidenceData.Instance.sceneChooseRoomId = selectId;

                    //重新刷新设备列表

                    this.LoadFunctionListRow(listFun);

                }, nowSelectId);