大华摄像头，金茂科技系统,pm10

wxr

2022-12-07 1aed71e8266249a682bd8e04c9aadce849302be6

大华摄像头，金茂科技系统,pm10

 DLL/LC/Android/LcVideoSdk-1.dll

Binary files differ

 DLL/LC/Android/LcVideoSdk.dll

Binary files differ

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

 HDL_ON/Entity/Function/Function.cs

@@ -1734,6 +1734,7 @@
        {
            var spkList = new List<string>();
            spkList.Add(SensorTemperature);
            spkList.Add(SensorPm10);
            spkList.Add(SensorPm25);
            spkList.Add(SensorCO2);
            spkList.Add(SensorTVOC);
@@ -1752,6 +1753,7 @@
        {
            var spkList = new List<string>();
            spkList.Add(SensorTemperature);
            spkList.Add(SensorPm10);
            spkList.Add(SensorPm25);
            spkList.Add(SensorCO2);
            spkList.Add(SensorTVOC);

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -224,7 +224,8 @@
                    //etAccount.Text = "ablis-nn@yandex.ru";
                    //etAccount.Text = "13143792049";
                    //etAccount.Text = "13288623489";//罗晓东
                    etAccount.Text = "18244942707";
                    //etAccount.Text = "18244942707";
                    etAccount.Text = "13143792049";
                }
                else
                {
@@ -268,6 +269,9 @@
                }else if(etAccount.Text == "13288623489")
                {
                    etPassword.Text = "luoxiaodong";
                }else if(etAccount.Text == "13143792049")
                {
                    etPassword.Text = "BVVBQATD";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;

 HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs

@@ -226,6 +226,8 @@
                }
                Application.RunOnMainThread(() =>
                {
                    try
                    {
                    AcstSubControlView view = null;
                    basePage.subViewList.TryGetValue(temp.sid,out view);
                    if (view != null)
@@ -234,11 +236,15 @@
                        view.btnSubTempValues.Text = temp.GetAttrState(AcstSub_AttrEnum.room_temp.ToString()) + "°";
                        view.btnSubPower.IsSelected = temp.GetAttrState(AcstSub_AttrEnum.on_off.ToString()) == "on";
                    }
                    }
                    catch (Exception ex ) {
                        MainPage.Log($"科技系统更新异常1:{ex.Message}");
                    }
                });
            }
            catch (Exception ex)
            {
                MainPage.Log("科技系统更新异常11");
                MainPage.Log($"科技系统更新异常123:{ex.Message}");
            }
        }

@@ -643,11 +649,14 @@

                            AcstSubControlView subFunctionView = new AcstSubControlView(sub, subFunctionListView, imageFolder);
                            subViewList.Add(sub.sid, subFunctionView);
                            if (basePage != null)
                            {
                            new System.Threading.Thread(() =>
                            {
                                Control.Ins.SendReadCommand(sub);
                            })
                            { IsBackground = true }.Start();
                            }
                        subFunctionCount++;
                        });


 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs

@@ -274,6 +274,10 @@
            int index = 0;
            foreach (var sensor in FunctionList.List.GetEnvirSensorsList())
            {
                if (sensor.spk == SPK.SensorPm10)
                {
                    continue;
                }
                if(SPK.EvironmentSensorList().Contains(sensor.spk))
                {
                    foreach (var seTemp in sensor.attributes)