2021-11-30 1.修复乐橙Android，没调用拒接接口问题。

JLChen

2021-11-30 efad979b6fae76fb37a4de7e94e6bac0a85cb72c

 HDL_ON/Common/ApiUtlis.cs

@@ -4,6 +4,8 @@
using HDL_ON.DAL;
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.UI2.FuntionControlView.Video;
using Newtonsoft.Json;
using Shared;

namespace HDL_ON.Common
@@ -54,14 +56,16 @@

            return result;
        }

        /// <summary>
        /// 下载数据完成标记
        /// </summary>
        public bool DownloadDataComplete = true;
        /// <summary>
        /// 下载数据
        /// </summary>
        public void DownloadData()
        {
            if (MainPage.InternetStatus == 0)
            if (MainPage.InternetStatus == 0 || MainPage.NoLoginMode)
                return;
            //线程开始时间
            var endTime = DateTime.Now.AddSeconds(5);
@@ -106,6 +110,26 @@
                }
                endTime = DateTime.Now.AddSeconds(5);
                MainPage.Log($"刷新个人信息成功");

                //int count = 0;
                //while (count < 10)
                //{
                //    if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
                //    {
                //        System.Threading.Thread.Sleep(200);
                //    }
                //    else
                //    {
                //        break;
                //    }
                //    count++;
                //}
                //if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
                //{
                //    return;
                //}


                try
                {
                    //===================房间=======================
@@ -146,7 +170,7 @@
                            for (int i = 0; i < FunctionList.List.GetDeviceFunctionList().Count;)
                            {
                                var localFunction = FunctionList.List.GetDeviceFunctionList()[i];
                                if (localFunction.Spk_Prefix == FunctionCategory.Music || string.IsNullOrEmpty(localFunction.Spk_Prefix))
                                if (SPK.MusicSpkList().Contains(localFunction.spk))
                                {
                                    i++;
                                    continue;
@@ -165,7 +189,7 @@
                        //处理剩下的新增功能
                        foreach (var newFunction in deviceList.list) 
                        {
                            MainPage.Log(newFunction.savePath);
                            newFunction.AssembleStatus();
                            newFunction.SaveFunctionFile();
                            FunctionList.List.IniFunctionList(newFunction.savePath);
                        }
@@ -182,40 +206,11 @@
                    {
                        endTime = DateTime.Now.AddSeconds(100);
                        MainPage.Log($"读取场景数据成功");
                        var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                        var sceneList = JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                        if (sceneList == null)
                        {
                            sceneList = new List<Scene>();
                        }
                        //for (int i = 0; i < FunctionList.List.scenes.Count;)
                        //{
                        //    var localScene = FunctionList.List.scenes[i];
                        //    if (localScene == null)
                        //    {
                        //        FunctionList.List.scenes.Remove(localScene);
                        //        continue;
                        //    }
                        //    var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
                        //    if (newScene == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
                        //    {
                        //        FunctionList.List.DeleteScene(localScene, false);
                        //    }
                        //    else
                        //    {
                        //        i++;
                        //        if (localScene.modifyTime != newScene.modifyTime)
                        //        {
                        //            localScene.name = newScene.name;
                        //            localScene.collect = newScene.collect;
                        //            localScene.modifyTime = newScene.modifyTime;
                        //            localScene.roomIds = newScene.roomIds;
                        //            localScene.image = newScene.image;
                        //            localScene.SaveSceneFile();
                        //        }
                        //        sceneList.Remove(newScene);//操作完的数据清理掉，剩下的就是新增的功能
                        //    }
                        //}

                        FunctionList.List.scenes.Clear();

                        //处理剩下的新增功能
@@ -258,16 +253,57 @@
                        MainPage.Log($"读取云端场景数据失败:Code:{pack.Code}; Msg:{pack.message}");
                    }

                    //===================读取安防列表==========================
                    GetSecurityList();
                    //===================读取逻辑列表==========================
                    UI.UI2.Intelligence.Automation.MainView.GetLogicList();

                    //===================读取可视对讲数据==========================
                    var flVideoInfo = HttpRequest.CheckFlVideo();
                    if(flVideoInfo.Code == StateCode.SUCCESS)
                    //判断是否有可视对讲数据，有则显示可视对讲icon
                    //var flVideoInfo = HttpRequest.CheckFlVideo();
                    //if(flVideoInfo.Code == StateCode.SUCCESS)
                    //{
                    //    FunctionList.List.videoIntercom1111 = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
                    //}

                    //======================获取可视对讲设备列表====================
                    bool isInterphoneType_HDL = false;//是否为HDLLinphone可视对讲
                    var videoInfo= VideoSend.GetVideoInfoList();
                    if (videoInfo.Code == StateCode.SUCCESS)
                    {
                        FunctionList.List.videoIntercom = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
                        string videoList = videoInfo.Data.ToString();
                        FunctionList.List.videoIntercom = JsonConvert.DeserializeObject<List<UI.UI2.FuntionControlView.Video.Video>>(videoList);

                        foreach (var video in FunctionList.List.videoIntercom)
                        {
                            if (video.interphoneType == InterphoneType.IMOUVISIAL.ToString())
                            {
                                UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
                            } else if (video.interphoneType == InterphoneType.HDL.ToString()) {
                                isInterphoneType_HDL = true;
                                DB_ResidenceData.Instance.SupportFacePass = true;
                                DB_ResidenceData.Instance.SaveResidenceData();
                            }
                        }
                    }

                    //======================获取Sip账号并且初始化SDK可视对讲设备列表====================
                    //如果检测线程没启动，才继续下面操作 因为App有可能刚启动马上收到推送了，然后才执行到这里
                    if (HDLLinphone.Current.CheckIncomingCallThreadIsNull()) {
                        //当前住宅是HDL可视对讲类型的设备
                        if (isInterphoneType_HDL)
                        {
                            //HDLLinphone可视对讲,获取Sip账号并初始化SDK
                            HDLLinphone.Current.GetHDLSipInfoAndInitSDK(DB_ResidenceData.Instance.CurrentRegion.id);
                        }
                        else
                        {
                            Utlis.WriteLine("当前住宅不支持HDL可视对讲,退出登录所有账号");
                            //当前住宅不支持HDL可视对讲
                            HDLLinphone.Current.LogoutAllAccount();
                        }
                    }

                    //======================安防====================
                    GetSecurityList();

                }
                catch (Exception ex)
@@ -281,8 +317,11 @@
                        MainPage.Log($"结束读取云端数据线程");
                        endTime = DateTime.MinValue;
                        DownloadDataComplete = true;
                        waitPage.Hide();
                        waitPage.RemoveFromParent();
                        if (waitPage != null)
                        {
                            waitPage.RemoveFromParent();
                            waitPage = null;
                        }
                    });
                    //不考虑网关情况，直接订阅
                    DAL.Mqtt.MqttClient.InitState();
@@ -314,8 +353,11 @@
                    DownloadDataComplete = true;
                    Application.RunOnMainThread(() =>
                    {
                        waitPage.Hide();
                        waitPage.RemoveFromParent();
                        if (waitPage != null)
                        {
                            waitPage.RemoveFromParent();
                            waitPage = null;
                        }
                    });
                    //初始化数据
                    //SpatialInfo.CurrentSpatial.Clear();
@@ -331,6 +373,8 @@
                        UI.Music.A31MusicModel.ReadMusicStates();
                        //搜索网关
                        DriverLayer.Control.Ins.SearchLoaclGateway();
                        //重新连接mqtt
                        DAL.Mqtt.MqttClient.DisConnectRemote("刷新数据，重连mqtt",false);
                        #endregion
                    }
                }
@@ -347,7 +391,7 @@
            if (deviceResult.Code == StateCode.SUCCESS)
            {
                MainPage.Log($"读取设备信息成功");
                var packList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
                var packList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());

                foreach(var function in packList.list)
                {
@@ -365,25 +409,46 @@
            var pack = Ins.HttpRequest.GetSecurityList();
            if (pack.Code == StateCode.SUCCESS)
            {
                var packList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SecurityAlarm>>(pack.Data.ToString());
                var packList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(pack.Data.ToString());
                var sidList = new List<string>();
                foreach (var function in packList)
                {
                    sidList.Add(function.sid);
                }
                var infoListPack = Ins.httpRequest.GetSecurityInfo(sidList, new List<string>());
                var infoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
                foreach (var function in infoList)
                var infoList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
                if (infoList != null)
                {
                    function.SaveFile();
                    FunctionList.List.IniFunctionList(function.savePath, true);
                    var filePathList = FileUtlis.Files.ReadFiles().FindAll((obj) => obj.StartsWith("SecurityData_"));
                    if (filePathList != null)
                    {
                        foreach (var file in filePathList)
                        {
                            FileUtlis.Files.DeleteFile(file);
                        }
                    }
                    foreach (var function in infoList)
                    {
                        function.SaveFile();
                        FunctionList.List.IniFunctionList(function.savePath, true);
                    }
                }
            }
            } 
            else
            {
                MainPage.Log($"读取安防列表失败:Code:{pack.Code}; Msg:{pack.message}");
            }

        }

        /// <summary>
        /// 获取SIP账号信息
        /// </summary>
        public void GetSipInfo()
        {
            var pack = Ins.HttpRequest.GetSecurityList();
        }


    }
}