2023年03月14日11:32:57

wjc

2023-03-14 eace7a4d75c0bea498253f524906c6ce326b80f2

2023年03月14日11:32:57

备份代码

 HDL-ON_Android/Assets/Language.ini

@@ -1131,6 +1131,7 @@
8507=Temporary password
8508=History
8509=Fluorite video door lock
8510=Call from the doorbell



@@ -2368,6 +2369,7 @@
8507=临时密码
8508=历史记录
8509=萤石视频门锁
8510=来自“门铃”呼叫




 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -36,7 +36,6 @@
        {
            //2020-12-23 解决点击通知栏打开不了APP问题
            //base.OnNotifyMessageOpened(context, notificationMessage);

            OpenNotification(context, notificationMessage);
        }

@@ -48,7 +47,7 @@
        public override void OnNotifyMessageArrived(Context context, NotificationMessage notificationMessage)
        {
            base.OnNotifyMessageArrived(context, notificationMessage);

         
            var pushMes = new JPushMessageInfo()
            {
                Title = notificationMessage.NotificationTitle,

 HDL-ON_iOS/Resources/Language.ini

@@ -1131,6 +1131,7 @@
8507=Temporary password
8508=History
8509=Fluorite video door lock
8510=Call from the doorbell



@@ -2368,6 +2369,7 @@
8507=临时密码
8508=历史记录
8509=萤石视频门锁
8510=来自“门铃”呼叫




 HDL_ON/Common/Constant.cs

@@ -309,6 +309,10 @@
        /// HDL可视对讲
        /// </summary>
        HDL_INTERPHONE,
        /// <summary>
        /// 门铃推送(萤石视频门锁)
        /// </summary>
        DOOR_BELL,
    }

    /// <summary>

 HDL_ON/Common/HDLCommon.cs

@@ -304,6 +304,7 @@
                    }
                    else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
                    {
                       
                        if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
                        
                        //字段兼容问题，只能直接取值了
@@ -386,6 +387,11 @@
                    {
                        ShowAlarmPushMessage(jpushMessageInfo, false);
                    }
                    else if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
                    {
                        /////视频门锁
                        HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity();
                    }
                }
            }
            catch (Exception EX)

 HDL_ON/Common/R.cs

@@ -3100,6 +3100,11 @@
        /// 萤石视频门锁
        /// </summary>
        public const int yingshishipinmensuo = 8509;
        /// <summary>
        /// 来自“门铃”呼叫
        /// </summary>
        public const int laizimenlinghujiao = 8510;
      




 HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs

@@ -5,19 +5,43 @@
{
    public class ShowDialog
    {

        private static ShowDialog showDialog;

        public static ShowDialog Currnet
        {
            get
            {
                if (showDialog == null)
                {

                    showDialog = new ShowDialog();
                }

                return showDialog;

            }
        }


       public  Dialog dialog;

        /// <summary>
        /// 
        /// </summary>
        /// <param name="title">标题</param>
        /// <param name="action1">回调函数</param>
        /// <param name="action2">回调函数</param>
        public void ClickBox(string title, Action<Dialog> action1, Action<Dialog> action2)
        /// <param name="jieTingAction">回调函数</param>
        /// <param name="guanBiAction">回调函数</param>
        public void ClickBox(string title, Action<Dialog> jieTingAction, Action<Dialog> guanBiAction)
        {
            Dialog dialog = new Dialog()
            if (dialog != null)
            {
                dialog.Close();
            }
            dialog = new Dialog()
            {
                BackgroundColor = MusicColor.PopupBackgroundColor,
            };

            FrameLayout whiteView = new FrameLayout()
            {
                X = Application.GetRealWidth(56),
@@ -50,11 +74,11 @@
                TextColor = MusicColor.TextColor,
                TextSize = TextSize.Text16,
                TextAlignment = TextAlignment.CenterLeft,
                Text = "来自“围墙机”呼叫",
                Text = title,

            };
            whiteView.AddChidren(btnTitle);

           
            Button guaduanIconBtn = new Button
            {
                X = Application.GetRealWidth(75),
@@ -77,12 +101,11 @@

            guaduanIconBtn.MouseUpEventHandler += (sender, e) =>
            {
                action1(dialog);
                guanBiAction(dialog);
            };
            jietingIconBtn.MouseUpEventHandler += (sender, e) =>
            {

                action2(dialog);
                jieTingAction(dialog);
            };

        }

 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs

@@ -1,6 +1,7 @@
using System;
using HDL_ON.Entity;
using System.Collections.Generic;
using Shared;

namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
{
@@ -29,18 +30,30 @@
        /// <summary>
        /// 跳转到Android那边去
        /// </summary>
        public void SkipAddDeviceActivity()
        public void SkipAddDeviceActivity( )
        {
            //未实现
#if __IOS__

#else

#endif

        }

        /// <summary>
        /// 跳转到Android(实时视频)那边去
        /// </summary>
        public void SkipRTVActivity()
        {
            //未实现
            HDL_ON.UI.UI2.FuntionControlView.Video.View.ShowDialog showDialog = new UI2.FuntionControlView.Video.View.ShowDialog();
            showDialog.ClickBox("", (s) => { }, (s1) => { });
            Video.View.ShowDialog.Currnet.ClickBox(Language.StringByID(StringId.laizimenlinghujiao), (dialog) =>
            {
                dialog.Close();
            }, (dialog) =>
            {
                dialog.Close();
            });
            //jumpToEZRealPlayActivity(Shared.Application.Activity,  deviceId,  deviceSerial,  deviceType)
        }
        /// <summary>
        /// 跳转到Android(历史记录)那边去
@@ -48,17 +61,13 @@
        public void SkipRecordActivity()
        {
            //未实现
            HDL_ON.UI.UI2.FuntionControlView.Video.View.ShowDialog showDialog = new UI2.FuntionControlView.Video.View.ShowDialog();
            showDialog.ClickBox("", (s) => { }, (s1) => { });
        }
        /// <summary>
        /// 跳转到Android(临时密码)那边去
        /// </summary>
        public void SkipPSWActivity()
        {
            //未实现
            HDL_ON.UI.UI2.FuntionControlView.Video.View.ShowDialog showDialog = new UI2.FuntionControlView.Video.View.ShowDialog();
            showDialog.ClickBox("", (s) => { }, (s1) => { });
            //jumpTempPasswordActivity(Application.Activity, deviceId);
        }
        /// <summary>
        /// 萤石视频门锁的图标
@@ -98,9 +107,48 @@
            FunctionList.List.DeleteFunction(function);
            MainPage.Log($"文件删除->{function.name}-->{function.spk}");
        }
        /// <summary>
        /// 闪烁框
        /// </summary>
        /// <param name="frame">父视图</param>
        /// <param name="tipText">提示文本</param>
        /// <param name="closeTime">显示时间,默认是1s</param>
        public void ShowTip(FrameLayout frame, string tipText, int closeTime = 1)
        {
            Application.RunOnMainThread(() =>
            {
                new Tip()
                {
                    CloseTime = closeTime,
                    Text = tipText,
                    Direction = AMPopTipDirection.None,
                }.Show(frame);
            });
        }

       


        /// <summary>
        /// 信息提示窗口，自动关闭
        /// </summary>
        /// <param name="msg">提示错误文本</param>
        public void ShowTip(string msg, int time = 2)
        {
            Application.RunOnMainThread(() =>
            {
                new PublicAssmebly().TipMsgAutoClose(msg, false, time * 1000);
            });
        }
        /// <summary>
        /// 对话框
        /// </summary>
        public void ShowAlert()
        {
            Application.RunOnMainThread(() =>
            {
                new Alert("", "视频门锁一", "取消", "确定").Show();
            });
        }
        /// <summary>
        /// 获取萤石视频门锁列表
        /// </summary>
@@ -109,7 +157,7 @@
        {
            var list = FunctionList.List.GetVideoDoorLockList();
#if DEBUG
            list.Add(new Function { name = "视频门锁一", sid = "23456789", spk = SPK.VideoDoorLock });
            //list.Add(new Function { name = "视频门锁一", sid = "23456789", spk = SPK.VideoDoorLock });
            //list.Add(new Function { name = "视频门锁二", sid = "2345678922", spk = SPK.VideoDoorLock });
#endif
            return list;