数据下载优化

wxr

2023-01-12 bbe6bd34ded053c0ae33c018f3af53daac43629f

数据下载优化

 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.6.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202301102">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202301121">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <!--友盟-->
    <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->

 HDL-ON_iOS/Info.plist

@@ -98,9 +98,9 @@
    <key>UIStatusBarStyle</key>
    <string>UIStatusBarStyleLightContent</string>
    <key>CFBundleShortVersionString</key>
    <string>1.6.302301121</string>
    <string>1.6.302301122</string>
    <key>CFBundleVersion</key>
    <string>1.6.301121</string>
    <string>1.6.301122</string>
    <key>NSLocationWhenInUseUsageDescription</key>
    <string>Use geographic location to provide services such as weather</string>
    <key>NSAppleMusicUsageDescription</key>

 HDL_ON/Common/ApiUtlis.cs

@@ -171,7 +171,8 @@
                            var deviceResult = Ins.HttpRequest.GetDeviceList("30", "1");
                            if (deviceResult.Code == StateCode.SUCCESS)
                            {
                                FunctionList.List.Clear();
                                FunctionList.List.ClearDatas();
                                MainPage.Log($"============设备============开始" + FunctionList.List.Functions.Count);
                                //MainPage.Log($"读取设备信息成功");
                                //MainPage.Log($"sid列表获取====" + deviceResult.Data.ToString());
                                var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -152,7 +152,7 @@
            DriverLayer.Control.Ins.GatewayOnline_Cloud = false;
            DriverLayer.Control.Ins.GatewayOnline_Local = false;
            SpatialInfo.CurrentSpatial.Clear();
            FunctionList.List.Clear();
            FunctionList.List.ClearDatas();

            ///切换住宅清空前住宅缓存自动化列表；
            HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();

 HDL_ON/Entity/FunctionList.cs

@@ -19,7 +19,7 @@
            try
            {
                _FunctionList._IpCamImou = null;
                _FunctionList.Clear();
                _FunctionList.ClearDatas();
                _FunctionList = null;
            }
            catch (Exception ex)
@@ -452,14 +452,16 @@
        /// <summary>
        /// 清空设备功能列表
        /// </summary>
        public void Clear()
        public void ClearDatas()
        {
            try
            {
                _IpCamImou.Clear();
                _IpCamImou = null;
                _FunctionList.Clear();
                _FunctionList = null;
                if (_IpCamImou != null)
                {
                    _IpCamImou.Clear();
                    _IpCamImou = null;
                }
                _FunctionList = new FunctionList();
            }
            catch (Exception ex)
            {

 HDL_ON/UI/MainPage.cs

@@ -399,7 +399,7 @@
            {
                try
                {
                    Entity.FunctionList.List.Clear();
                    Entity.FunctionList.List.ClearDatas();
                    Entity.SpatialInfo.CurrentSpatial.Clear();
                    ///等待获取住宅信息
                    Application.RunOnMainThread(() =>

 HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs

@@ -32,7 +32,7 @@
            var functionOids = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DeviceModule>>(obj.GetValue("objects").ToString());
            
            DB_ResidenceData.SaveOidList(oidJsonString);
            FunctionList.List.Clear();
            FunctionList.List.ClearDatas();
            foreach (var sidObj in sidObjects)
            {
                var oid = functionOids.Find((o) =>  o.oid == sidObj.sid.Substring(0, 16));

 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs

@@ -401,6 +401,10 @@
                    {
                        foreach (var scene in listScene)
                        {
                            if(scene == null)
                            {
                                continue;
                            }
                            if(scene.sceneType == SceneType.LightScene)
                            {
                                continue;