备份

wxr

2023-10-16 df2d148a4f7a47e1c2dfea9062e81165a720ab87

备份

 HDL-ON_Android/Properties/AndroidManifest.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.2.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202310121">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="33" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.2.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202310131">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="30" />
    <uses-permission android:name="android.permission.RECEIVE_SMS" />
    <!--友盟-->
    <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -1537,7 +1537,6 @@
                            case SPK.ElectricTuyaWeepRobot2:
                            case SPK.ElectricTuyaWaterValve:
                            case SPK.ElectricTuyaWaterValve2:
                            case SPK.SensorPir:
                            case SPK.SensorDoorWindow:
                            case SPK.SensorSmoke:
                            case SPK.SensorWater:
@@ -1552,6 +1551,22 @@
                                //状态更新
                                Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
                                break;
                            case SPK.SensorPir:
                            case SPK.SensorPirHold:
                                var tempPirStatus = localFunction.attributes.Find((sta) => sta.key == "people_status");
                                if (tempPirStatus != null)
                                {
                                    if(tempPirStatus.state == "true")
                                    {
                                        localFunction.lastState = Language.StringByID(StringId.Someone);
                                    }
                                    else
                                    {
                                        localFunction.lastState = Language.StringByID(StringId.wuren);
                                    }
                                }
                                Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
                                break;
                            case SPK.SenesorMegahealth:
                            case SPK.SenesorMegahealth2:
                            case SPK.SensorMmvPose:

 HDL_ON/UI/MainPage.cs

@@ -637,7 +637,7 @@
                || msg.Contains("接收到推送")
                   || msg.Contains("api")
                || msg.Contains("读取功能状态")
                //|| true
                || true
                )
                Console.WriteLine(msg);
#endif

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -330,6 +330,7 @@
                    etAccount.Text = "13533335801";
                    etAccount.Text = "13682244600";
                    etAccount.Text = "marketing@australindo.co.id";
                    etAccount.Text = "dcai.assist@gmail.com";

                }
                else
@@ -381,9 +382,9 @@
                else if (etAccount.Text == "18100573477")
                {
                    etPassword.Text = "huang12345";
                }else if(etAccount.Text == "marketing@australindo.co.id")
                }else if(etAccount.Text == "dcai.assist@gmail.com")
                {
                    etPassword.Text = "HDLAGN2023";
                    etPassword.Text = "GraniteTileS57";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs

@@ -370,13 +370,13 @@
            {
                return "FunctionIcon/DoorLock/DoorLock.png";
            }
            else if (SPK.SensorDryContact == device.spk
                || SPK.SensorDryContact2 == device.spk
                || SPK.OtherCommon == device.spk
                )
            {
                return "LogicIcon/ganjiedian.png";
            }
            //else if (SPK.SensorDryContact == device.spk
            //    || SPK.SensorDryContact2 == device.spk
            //    || SPK.OtherCommon == device.spk
            //    )
            //{
            //    return "LogicIcon/ganjiedian.png";
            //}
            else if (SPK.SensorLight == device.spk)
            {
                return "LogicIcon/lightloguc.png";