chenqiyang
2022-05-17 39e83c7df7608b29a3f359bcc6d9ca9b7ff095f5
增加预编译条件
3个文件已修改
44 ■■■■■ 已修改文件
HDL_ON/Common/ApiUtlis.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/ApiUtlis.cs
@@ -337,8 +337,10 @@
                    //======================登录全视通====================
                    if (isInterphoneType_FREEVIEW)
                    {
#if __IOS__
                        //登录全视通
                        Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
#endif
                    }
@@ -408,12 +410,12 @@
                {
                    if (DB_ResidenceData.Instance.CurrentRegion != null)
                    {
                        #region 读取本地数据
#region 读取本地数据
                        //搜索网关
                        DriverLayer.Control.Ins.SearchLoaclGateway();
                        //重新连接mqtt
                        DAL.Mqtt.MqttClient.DisConnectRemote("刷新数据,重连mqtt",false);
                        #endregion
#endregion
                    }
                }
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -468,9 +468,11 @@
        {
            if (mHDLCallVideoInfo.spk == "door.gate")
            {
#if __IOS__
                //自研可视对讲
                HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName,mHDLCallVideoInfo.DeviceSipAccount);
           }
#endif
            }
            else {
                //狄耐克可视对讲
                //如果开启了自动跳转方案,则无需继续下面处理、无需手动跳转
@@ -612,10 +614,10 @@
            return checkIncomingCallThread == null || checkIncomingCallThread.ThreadState != ThreadState.Running;
        }
        #endregion
#endregion
        #region ■  --  Android相关操作_______________________________
#region ■  --  Android相关操作_______________________________
#if __Android__
@@ -710,13 +712,13 @@
        }
#endif
        #endregion
#endregion
        #region ■  --  iOS相关操作_______________________________
#region ■  --  iOS相关操作_______________________________
#if __IOS__
        #region OnHDLLinphoneCallDelegate
#region OnHDLLinphoneCallDelegate
        /// <summary>
        /// 
        /// </summary>
@@ -793,10 +795,10 @@
        }
        #endregion
#endregion
#endif
        #endregion
#endregion
    }
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -703,7 +703,7 @@
            //访客管理
            #region 个人选项-访客管理
            if (Entity.DB_ResidenceData.Instance.SupportVisitorManage)//判断是否支持访客管理
            if (!Entity.DB_ResidenceData.Instance.SupportVisitorManage)//判断是否支持访客管理
            {
                optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
@@ -736,24 +736,26 @@
                btnisitorVManagementText.MouseUpEventHandler = (sender, e) =>
                {
#if __IOS__
                    //刷新接口请求所需要的参数
                    NSDictionary info = new NSDictionary("regionUrl", HttpUtil.GlobalRequestHttpsHost, "token", UserInfo.Current.LoginTokenString, "appkey", "HDL-HOME-APP-TEST", "secret", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "refreshToken", UserInfo.Current.RefreshToken);
                    Shared.IOS.HDLFVSDK.Video.RefreshInfo(info);
                    //跳转访客管理界面
                    Shared.IOS.HDLFVSDK.Video.ShowVisitorManager();
#endif
                };
            }
            #endregion
            #endregion
#endregion
#endregion
            var topPaddingView2 = new FrameLayout()
            {
                Height = Application.GetRealHeight(8)
            };
            bodyScrolView.AddChidren(topPaddingView2);
            #region 解锁设置区域
#region 解锁设置区域
            ///// <summary>
            ///// 解锁设置区域
            ///// </summary>
@@ -803,9 +805,9 @@
            //};
            //interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
            //interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height));
            #endregion
#endregion
            #region 服务器信息
#region 服务器信息
            ListCellView myServerInfoCellView = new ListCellView()
            {
            };
@@ -822,10 +824,10 @@
            myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation);
            //myServerInfoCellView.LineView.RemoveFromParent();
            #endregion
#endregion
            #region 注销账号
#region 注销账号
            ListCellView logOffView = new ListCellView()
            {
            };
@@ -842,7 +844,7 @@
            logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount);
            logOffView.LineView.RemoveFromParent();
            #endregion
#endregion
            btnLogout = new Button()
            {