1.增加人脸、可视对讲入口 2.增加清除推送角标数值接口 3.修改初始化全视通、登出全视通

chenqiyang

2022-04-19 691b0f2434acc1685b43f873657c9230726ffe6f

1.增加人脸、可视对讲入口 2.增加清除推送角标数值接口 3.修改初始化全视通、登出全视通

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

old mode 100755
new mode 100644
@@ -2183,6 +2183,7 @@
16228=天
16229=周
16230=个月
16234=人脸

;★★★★下面这些是接口的返回信息翻译,从18000开始★★★★

18004=指定网关已经被绑定


 ZigbeeApp/GateWay.Droid/Assets/Phone/Center/FaceManagement.png

 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs

Diff too large

 ZigbeeApp/Home.Ios/AppDelegate.cs

@@ -115,8 +115,11 @@
        }
        public override void DidReceiveRemoteNotification(UIApplication application, NSDictionary userInfo, Action<UIBackgroundFetchResult> completionHandler)
        {

            if (userInfo == null)
            {
                //var alert = new Alert("", "userInfo为空", "");
                //alert.Show();
                return;
            }
            Console.WriteLine(userInfo);
@@ -124,9 +127,16 @@
            if (application.ApplicationState == UIApplicationState.Active || application.ApplicationState == UIApplicationState.Background)
            {
                NSString key_hiddenJson = new NSString("HiddenJson");
                //var alert1 = new Alert("", "收到推送了", "");
                //alert1.Show();
                if (userInfo.ContainsKey(key_hiddenJson))
                {

                    var hiddenJson = userInfo["HiddenJson"].ToString();


                    //var alert = new Alert("", hiddenJson, "");
                    //alert.Show();



                    if (string.IsNullOrEmpty(hiddenJson))

                    {

                        return;

@@ -136,7 +146,7 @@
                    {



                        ///目前根据这个判断是否是可视对讲数据

                        VideoMethod(hiddenJson);

                        //VideoMethod(hiddenJson);

                    }

                    else

                    {

@@ -179,7 +189,7 @@
                    if (hiddenJson.Contains("cmtID"))

                    {

                        ///目前根据这个判断是否是可视对讲数据

                        VideoMethod(hiddenJson);

                        //VideoMethod(hiddenJson);

                    }

                    else

                    {

@@ -250,6 +260,7 @@

        public override void ReceivedRemoteNotification(UIApplication application, NSDictionary userInfo)
        {

            Console.WriteLine(userInfo);
            if (application.ApplicationState == UIApplicationState.Active)
            {
@@ -315,6 +326,9 @@
            }
            //检查连接远程
            //代码

            //清除角标
            CommonPage.Instance.clearBadgeNum();
        }

        public override void WillTerminate(UIApplication application)

 ZigbeeApp/Home.Ios/Home.IOS.csproj

@@ -25,6 +25,7 @@
        <MtouchArch>x86_64</MtouchArch>
        <MtouchLink>None</MtouchLink>
        <MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
        <DebugType>none</DebugType>
@@ -72,12 +73,12 @@
        <WarningLevel>4</WarningLevel>
        <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
        <MtouchArch>ARM64</MtouchArch>
        <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
        <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
        <MtouchI18n>cjk</MtouchI18n>
        <DeviceSpecificBuild>true</DeviceSpecificBuild>
        <MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
        <CodesignProvision>ComEvoyoHomeDevelopment20200806</CodesignProvision>
        <MtouchLink>SdkOnly</MtouchLink>
<CodesignProvision>ComEvoyoHomeDevelopment</CodesignProvision>
    </PropertyGroup>
    <ItemGroup>
        <Reference Include="System" />
@@ -1177,6 +1178,7 @@
      <BundleResource Include="Resources\Phone\Gateway\WiredGateway.png" />
      <BundleResource Include="Resources\Phone\Gateway\WirelessGateway.png" />
      <BundleResource Include="Resources\Phone\Gateway\AddGatewaySuccess.png" />
      <BundleResource Include="Resources\Phone\Center\FaceManagement.png" />
    </ItemGroup>
    <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
    <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

 ZigbeeApp/Home.Ios/Home.IOS.sln

New file
@@ -0,0 +1,31 @@


Microsoft Visual Studio Solution File, Format Version 12.00

# Visual Studio Version 16

VisualStudioVersion = 16.0.810.6

MinimumVisualStudioVersion = 10.0.40219.1

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Home.IOS", "Home.IOS.csproj", "{F1296E2C-3777-4385-85B2-DA77617E3178}"

EndProject

Global

    GlobalSection(SolutionConfigurationPlatforms) = preSolution

        Debug|iPhoneSimulator = Debug|iPhoneSimulator

        Release|iPhoneSimulator = Release|iPhoneSimulator

        Debug|iPhone = Debug|iPhone

        Release|iPhone = Release|iPhone

    EndGlobalSection

    GlobalSection(ProjectConfigurationPlatforms) = postSolution

        {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator

        {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator

        {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator

        {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator

        {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.ActiveCfg = Debug|iPhone

        {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.Build.0 = Debug|iPhone

        {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhone.ActiveCfg = Release|iPhone

        {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhone.Build.0 = Release|iPhone

    EndGlobalSection

    GlobalSection(SolutionProperties) = preSolution

        HideSolutionNode = FALSE

    EndGlobalSection

    GlobalSection(ExtensibilityGlobals) = postSolution

        SolutionGuid = {C5091363-8792-48F0-9E20-BACBECBA975E}

    EndGlobalSection

EndGlobal


 ZigbeeApp/Home.Ios/Info.plist

@@ -24,7 +24,7 @@
    <key>LSRequiresIPhoneOS</key>
    <true/>
    <key>MinimumOSVersion</key>
    <string>10.4</string>
    <string>10</string>
    <key>UIDeviceFamily</key>
    <array>
        <integer>1</integer>
@@ -54,7 +54,7 @@
    <key>aps-environment</key>
    <string>development</string>
    <key>CFBundleShortVersionString</key>
    <string>1.1.0120123101</string>
    <string>1.2.1</string>
    <key>CFBundleVersion</key>
    <string>2020123101</string>
    <key>CFBundleURLTypes</key>

 ZigbeeApp/Home.Ios/Resources/Language.ini

old mode 100755
new mode 100644
@@ -2126,6 +2126,7 @@
16191=关闭照明
16192=打开风干
16193=关闭风干
16234=人脸

;★★★★下面这些是接口的返回信息翻译,从18000开始★★★★

18004=指定网关已经被绑定

@@ -2161,7 +2162,6 @@
18049=分享数据操作失败

18050=不能把自己添加为成员

18051=不能把主账号添加为成员





;★★★★下面这些是设备的入网步骤,从21000开始★★★★

;智能门锁入网操作指示


 ZigbeeApp/Home.Ios/Resources/Phone/Center/FaceManagement.png

 ZigbeeApp/Shared/Common/CommonPage.cs

@@ -45,7 +45,8 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string CodeIDString = "1.1.0121070801";
        //public static string CodeIDString = "1.1.0121070801";
        public static string CodeIDString = "1.2.1";
        /// <summary>
        /// 注册来源(0:HDL On 1:Zigbee)
        /// </summary>
@@ -310,6 +311,17 @@
            }
        }



        //清除角标数值
        public void clearBadgeNum()

        {
            try

            {
                //this.RequestHttpsZigbeeResultAsync("ZigbeeUsers/CornerClear", null, 10);
                this.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/CornerClear", null, "GET", 10);
            }
            catch { }

        }



        /// <summary>

        /// 登出

        /// </summary>

@@ -362,10 +374,10 @@
        /// <returns>返回状态码</returns>
        public string PushRegID()
        {
#if DEBUG
            //调试不需要发送这个东西
            return null;
#endif
//#if DEBUG
//            //调试不需要发送这个东西
//            return null;
//#endif
            try
            {
                string deviceAlias;
@@ -385,6 +397,7 @@
                    DeviceType = deviceType
                };
                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(RegIDObj);
                Console.WriteLine(requestJson);
                var reverObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/SignZigbeeNeedPushRegID", System.Text.Encoding.UTF8.GetBytes(requestJson), 4);
                if (reverObj == null)
                {


 ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll

Binary files differ

 ZigbeeApp/Shared/DLL/Shared.IOS.HDLFVSDK.dll

Binary files differ

 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs

old mode 100755
new mode 100644

 ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs

@@ -1139,12 +1139,12 @@
                //启动ZigBee

                ZigBee.Common.Application.Init();

#if iOS

//#if iOS


                //初始化全视通
                Shared.IOS.HDLFVSDK.Video.Init("", revertData.UserID.ToString());
//                //初始化全视通
//                Shared.IOS.HDLFVSDK.Video.Init("", revertData.UserID.ToString());

#endif

//#endif


                HdlThreadLogic.Current.RunMain(() =>

                {


 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

old mode 100755
new mode 100644

 ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs

old mode 100755
new mode 100644
@@ -212,6 +212,7 @@
                        return false;

                    }

                    var newVersion = results[0]["version"]?.ToString();


                    var updateContent = results[0]["releaseNotes"]?.ToString();

                    if (newVersion.CompareTo(CommonPage.CodeIDString) > 0)

                    {


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs

@@ -2,7 +2,7 @@
using System;
using System.Collections.Generic;
using System.Text;

using Shared.IOS.HDLFVSDK;
namespace Shared.Phone.UserCenter
{
    /// <summary>
@@ -110,6 +110,14 @@

            //关闭进度条
            ProgressBar.Close();

#if iOS
            //退出登录全视通
            Shared.IOS.HDLFVSDK.Video.Logout();
            //重新登录全视通
            Shared.IOS.HDLFVSDK.Video.Init("", residenceId);
#endif


            return result;
        }
@@ -293,8 +301,20 @@
                            {
                                Config.Instance.HomeId = listHouse[0].Id;
                                Config.Instance.Home = GetHouseByHouseId(listHouse[0].Id);
#if iOS
                                //初始化全视通

                                Shared.IOS.HDLFVSDK.Video.Init("", listHouse[0].Id);
#endif
                            }
                        }
                        else {
#if iOS
                            Console.WriteLine(Config.Instance.HomeId);
                            //初始化全视通
                            Shared.IOS.HDLFVSDK.Video.Init("", Config.Instance.HomeId);
#endif
                        }
                        Config.Instance.Save();
                    }
                }

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs

@@ -4,7 +4,7 @@
using Shared.Common.ResponseEntity;
using System.Collections.Generic;
using System.Text;

using Shared.IOS.HDLFVSDK;
namespace Shared.Phone.UserCenter
{
    /// <summary>
@@ -565,6 +565,10 @@
        /// <param name="noticeDb">是否通知云端</param>
        public static void ReLoginAgain(string account = "", bool noticeDb = true)
        {
#if iOS
            //退出全视通登录
            Shared.IOS.HDLFVSDK.Video.Logout();
#endif
            if (Config.Instance.Home.IsVirtually == true)
            {
                //如果是虚拟住宅

 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs

old mode 100755
new mode 100644

 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs

@@ -319,6 +319,29 @@
                };

            }



            //人脸管理
            unSelectPic = "Center/FaceManagement.png";

            TextID = R.MyInternationalizationString.uFace;

            if (UserCenterResourse.UserInfo.AuthorityNo == 1)//是主账号才展示

            {

                //生成控件

                var frame = this.CreatMainMenuControl(frameMenu, TextID, unSelectPic);

                frame.ButtonClickEvent += (sender, e) =>

                {
                    if (Common.Config.Instance.Home.IsVirtually == true)

                    {

                        //如果住宅为虚拟住宅,则此功能无效

                        return;

                    }
                    //打开人脸管理页面
#if iOS



                    Shared.IOS.HDLFVSDK.Video.ShowFaceManagement();
#endif


                };

            }



            //安防管理

            unSelectPic = "Center/SafetyManagement.png";

            TextID = R.MyInternationalizationString.uSafety;

@@ -402,6 +425,35 @@
                frameWhite.AddChidren(frameOtherMenuContr);

            }



            //可视对讲
            var rowVideo = new FrameRowControl(frameOtherMenuContr.rowSpace / 2);
            frameOtherMenuContr.AddChidren(rowVideo);
            //向右图标
            var btnBackVDRight = rowVideo.AddRightArrow();
            btnBackVDRight.X -= ControlCommonResourse.XXLeft / 2;
            //图标
            var btnBackVDIcon = rowVideo.AddLeftIcon();
            btnBackVDIcon.X -= ControlCommonResourse.XXLeft / 2;
            btnBackVDIcon.UnSelectedImagePath = "Item/videoIntercom.png";
            //底线
            var btnBackVDLine = rowVideo.AddBottomLine();
            btnBackVDLine.X -= ControlCommonResourse.XXLeft / 2;
            //数据备份View
            var btnBackVDView = rowVideo.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.videoIntercom), 300);
            btnBackVDView.X -= ControlCommonResourse.XXLeft / 2;
            rowVideo.ButtonClickEvent += (sender, e) =>
            {
                if (Common.Config.Instance.Home.IsVirtually == true)
                {
                    //如果住宅为虚拟住宅,则此功能无效
                    return;
                }

#if iOS

                Shared.IOS.HDLFVSDK.Video.ShowDeviceList();
#endif
            };



            if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)

            {

                //数据备份

@@ -428,8 +480,6 @@
                        return;

                    }

                    var form = new HdlBackup.HdlBackupListForm();

                    //Shared.IOS.HDLFVSDK.Video.Init("", "chen123");

                    Shared.IOS.HDLFVSDK.Video.ShowVideo();
                    ; form.AddForm();

                };

            }


 ZigbeeApp/Shared/Phone/UserView/HomePage.cs

@@ -147,10 +147,10 @@
                CommonPage.Instance.PushRegID();

                isLoginSuccess = 1;

#if iOS

                //初始化全视通
                Shared.IOS.HDLFVSDK.Video.Init("",revertData.UserID.ToString());
#endif

//#if iOS

//                //初始化全视通
//                Shared.IOS.HDLFVSDK.Video.Init("",revertData.UserID.ToString());
//#endif

            }

            else if (stateCodeStr == "YOUDATANOISLOCALREGION")

            {


 ZigbeeApp/Shared/R.cs

old mode 100755
new mode 100644
@@ -7001,6 +7001,10 @@
        /// </summary>

        public const int uNotice = 16233;



        /// <summary>

        /// 人脸

        /// </summary>

        public const int uFace = 16234;



        //★★★★下面这些是接口的返回信息翻译,从18000开始★★★★

        /// <summary>