全视通可视对讲修改

wxr

2023-09-19 5d84c3e739f8909d9e9f2a10c97684d5a7c2cca4

全视通可视对讲修改

 HDL-ON_Android/Resources/Resource.designer.cs

Diff too large

 HDL_ON/Common/Utlis.cs

@@ -28,6 +28,7 @@
        /// <param name="content">信息内容</param>
        public static void WriteLine(string tag, string url, string content)
        {
            return;
#if DEBUG
            if (url == "")
            {

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -18,8 +18,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        const string APP_KEY = "HDL-HOME-APP-TEST";
        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";


 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs

@@ -163,6 +163,7 @@
            else if (interphoneType == InterphoneType.FREEVIEW.ToString())
            {
                string sip_account = "sip:D" + mESVideoInfo.deviceCode + "@139.159.157.75:46000";

                mESVideoInfo.deviceSipAccount = sip_account;
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, InterphoneType.FREEVIEW.ToString());
            }

 HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs

@@ -133,7 +133,7 @@
                HDLLinphoneKit.Instance.SetAccountAndLogin(
                    mHDLSipInfo.sipAccount,
                    mHDLSipInfo.sipPasswd,
                    "139.159.157.75:47000",//mHDLSipInfo.realm,
                    mHDLSipInfo.realm,
                    //"sip:139.159.157.75:47000;transport=udp",
                    HDLLinphoneKit.InterPhoneTypeFreeview
                    );

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -326,6 +326,7 @@
                    //etAccount.Text = "12345678904";//2.0 测试  萤石
                    etAccount.Text = "18316672920";
                    etAccount.Text = "18244942707";
                    etAccount.Text = "1272061968@qq.com";//万科城市之光E区8栋206
                }
                else
                {
@@ -377,9 +378,9 @@
                else if (etAccount.Text == "18100573477")
                {
                    etPassword.Text = "huang12345";
                }else if(etAccount.Text == "15006564444")
                }else if(etAccount.Text == "1272061968@qq.com")
                {
                    etPassword.Text = "zht626800";
                    etPassword.Text = "a123456";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;

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

@@ -3,7 +3,7 @@
using System.Collections.Generic;
using HDL_ON.Entity;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Com.Alibaba.Fastjson;
using Newtonsoft.Json;

namespace HDL_ON.UI.UI2.Intelligence.Automation
{
@@ -1321,7 +1321,9 @@
                                    tag += "_";
                                    array[i] = face.userName;
                                }
                                seleTxet= JSON.ToJSONString(array);
                                string jsonString = JsonConvert.SerializeObject(array).ToString();


                                //数据封装<高胜说萤石那边是推送用户名>
                                AddDictionary("open_user",seleTxet, "string", "[]"); 
                                //界面显示选中值