毫米波传感器对接

wxr

2022-07-04 1f26d743028ceb7e37555e1e89cd078e90a5c242

毫米波传感器对接

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

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -17,8 +17,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        /// <summary>
        /// RegionMark
        /// </summary>

 HDL_ON/Entity/Function/Function.cs

@@ -1047,6 +1047,16 @@
        /// </summary>
        public const string ActionStatus = "action_state";
        /// <summary>
        /// 
        /// </summary>
        public const string PeopleNum = "people_num";
        public const string PeopleId = "people_id";
        /// <summary>
        /// 毫米波传感器 人物动作
        /// </summary>
        public const string TargetStatus = "target_status";//0空，1走，2跑，3坐，4跌倒，5站

        /// <summary>
        /// 电量状态
        /// </summary>
        public const string BatteryState = "battery_state";

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -218,6 +218,7 @@
                    //etAccount.Text = "13450425807";//黄竹溪 knx项目
                    etAccount.Text = "18244942707";
                    etAccount.Text = "tf@smarttech.com.ua";
                    etAccount.Text = "";
                }
                else
                {

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -206,17 +206,17 @@
                    //    Control.Ins.OneKeyUnlocking(new Function(), UserInfo.Current.doorPasswordString);
                    //}

                ddd++;
                    Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
                    if(ddd%2 == 0)
                    {
                        function_online.online = true;
                    }
                    else
                    {
                        function_online.online = false;
                    }
                    HomePage.LoadEvent_RefreshDevcieOnline(function_online);
                //ddd++;
                //    Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
                //    if(ddd%2 == 0)
                //    {
                //        function_online.online = true;
                //    }
                //    else
                //    {
                //        function_online.online = false;
                //    }
                //    HomePage.LoadEvent_RefreshDevcieOnline(function_online);
                    

                };
@@ -591,6 +591,23 @@
                }
            });

            FunctionList.List.Functions.Add(new Function
            {
                name = "测试毫米波传感器",
                spk = SPK.SenesorMegahealth,
                attributes = new List<FunctionAttributes>
                {
                    new FunctionAttributes(){ key = "enable",curValue = "true",state = "true" },
                    new FunctionAttributes(){ key = "people_num",curValue = "0",state = "0" },
                    new FunctionAttributes(){ key = "people_id",curValue = "1",state = "1" },
                    new FunctionAttributes(){ key = "target_status",curValue = "0",state = "0" },//0空，1走，2跑，3坐，4跌倒，5站
                    new FunctionAttributes(){ key = "people_status",curValue = "false",state = "false" },//状态  有人无人
                    //new FunctionAttributes(){ key = "",curValue = "",state = "" },
                    //new FunctionAttributes(){ key = "",curValue = "",state = "" },
                    //new FunctionAttributes(){ key = "",curValue = "",state = "" },
                }
            });

            //FunctionList.List.Functions.Add(new Function
            //{
            //    name = "门锁",

 HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs

@@ -493,11 +493,11 @@

            if (tempPassword != null && tempPassword.id != null && tempPassword.id != "")
            {
                pwdEditText.Text = "";
                pwdEditText.Text = tempPassword.tempPwd;
                pwdEditText.PlaceholderText = Language.StringByID(StringId.TemporaryPasswordInvalid);
                pwdEditText.Enable = false;
                phoneNumberEditText.Enable = false;
                randomBtn.Enable = false;
                randomBtn.Visible = false;
                startTimeBtn.Enable = false;
                endTimeBtn.Enable = false;
            }

 HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs

@@ -119,6 +119,7 @@
        {
            Application.RunOnMainThread(() => {
                var temp = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.ActionStatus);
                
                if (temp != null)
                {
                    if (temp.state == "fall")   //跌倒
@@ -140,6 +141,38 @@
                        btnSuctionView.IsSelected = true;
                    }
                }

                else
                {
                    temp = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.PeopleStatus);
                    if (temp != null)
                    {
                        if (temp.state == "true")
                        {
                            btnIcon.IsSelected = true;
                            btnSuctionView.TextID = StringId.Someone;
                            btnSuctionView.IsSelected = true;
                        }
                        else
                        {
                            btnIcon.IsSelected = false;
                            btnSuctionView.TextID = StringId.SensorNormalState;
                            btnSuctionView.IsSelected = false;
                        }
                        //增加实验室模式反馈
                        var tempStatus = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus);
                        if(tempStatus != null)
                        {
                            if(tempStatus.state == "4")
                            {
                                btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneFellBgIcon.png";
                                btnSuctionView.TextID = StringId.SomeoneFell;
                                btnSuctionView.IsSelected = true;
                            }
                        }
                    }
                }

            });
        }


 HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs

@@ -211,7 +211,7 @@
            angleView.AddChidren(angleBar);
            angleBar.OnProgressChangedEvent = (sender, e) =>
            {
                float angle = (e - 90);
                float angle = e;
                btnAngle.Text = angle + "°";
                foreach (var btn in buttons)
                {