wxr
2023-05-25 19b211e5a9a5ff9c844a96a5d5e0230ca3628b80
ios 短信自动填充
4个文件已添加
1个文件已删除
17个文件已修改
348 ■■■■■ 已修改文件
DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Linphone/Android/Shared.Droid.HDLLinphone0525.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.Droid.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.Droid0524.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.Droid230425.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.IOS.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.IOS0524.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.IOS0525.dll 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Application.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Properties/AndroidManifest.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Resources/Resource.designer.cs 181 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/AppDelegate.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/ApiUtlis.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/HDLCommon.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/DriverLayer/Control.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/DB_ResidenceData.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/MainPage.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/LoginPageBLL.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
Binary files differ
DLL/Linphone/Android/Shared.Droid.HDLLinphone0525.dll
Binary files differ
DLL/Shared.Droid.dll
Binary files differ
DLL/Shared.Droid0524.dll
Binary files differ
DLL/Shared.Droid230425.dll
Binary files differ
DLL/Shared.IOS.dll
Binary files differ
DLL/Shared.IOS0524.dll
Binary files differ
DLL/Shared.IOS0525.dll
Binary files differ
HDL-ON_Android/Application.cs
@@ -48,10 +48,6 @@
            base.OnCreate();
#if DEBUG
            new Com.Hdl.Dokitsdk.HdlDoKitSdk().InitDokit(this, "3385dbf09648d3d5aabaf03611180610");
#endif
            WifiManager manager = (WifiManager)this.GetSystemService(Context.WifiService);
            multicast = manager.CreateMulticastLock("UDPwifi");
HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202305161">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202305231">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <uses-permission android:name="android.permission.RECEIVE_SMS" />
    <!--友盟-->
HDL-ON_Android/Resources/Resource.designer.cs
@@ -20678,265 +20678,268 @@
            public const int text_year_ago = 2131690526;
            
            // aapt resource value: 0x7F0F041F
            public const int tip_heard_voice = 2131690527;
            public const int tip_confirm_unlock = 2131690527;
            
            // aapt resource value: 0x7F0F0420
            public const int tip_login_out = 2131690528;
            public const int tip_heard_voice = 2131690528;
            
            // aapt resource value: 0x7F0F0421
            public const int tip_of_added_by_yourself_and_online = 2131690529;
            public const int tip_login_out = 2131690529;
            
            // aapt resource value: 0x7F0F0422
            public const int tip_of_bad_net = 2131690530;
            public const int tip_of_added_by_yourself_and_online = 2131690530;
            
            // aapt resource value: 0x7F0F0423
            public const int tip_playback_again = 2131690531;
            public const int tip_of_bad_net = 2131690531;
            
            // aapt resource value: 0x7F0F0424
            public const int tip_specified_device = 2131690532;
            public const int tip_playback_again = 2131690532;
            
            // aapt resource value: 0x7F0F0425
            public const int title_activate_device = 2131690533;
            public const int tip_specified_device = 2131690533;
            
            // aapt resource value: 0x7F0F0426
            public const int title_activate_device_fail = 2131690534;
            public const int title_activate_device = 2131690534;
            
            // aapt resource value: 0x7F0F0427
            public const int title_activity_connect_device_wifi = 2131690535;
            public const int title_activate_device_fail = 2131690535;
            
            // aapt resource value: 0x7F0F0428
            public const int title_activity_ezupgrade_device = 2131690536;
            public const int title_activity_connect_device_wifi = 2131690536;
            
            // aapt resource value: 0x7F0F0429
            public const int today = 2131690537;
            public const int title_activity_ezupgrade_device = 2131690537;
            
            // aapt resource value: 0x7F0F042A
            public const int touch_fingerprint_sensor_hint = 2131690538;
            public const int today = 2131690538;
            
            // aapt resource value: 0x7F0F042B
            public const int touch_to_load = 2131690539;
            public const int touch_fingerprint_sensor_hint = 2131690539;
            
            // aapt resource value: 0x7F0F042C
            public const int try_again = 2131690540;
            public const int touch_to_load = 2131690540;
            
            // aapt resource value: 0x7F0F042D
            public const int ui_call_demo_txt = 2131690541;
            public const int try_again = 2131690541;
            
            // aapt resource value: 0x7F0F042E
            public const int unable_identify_two_dimensional_code_tip = 2131690542;
            public const int ui_call_demo_txt = 2131690542;
            
            // aapt resource value: 0x7F0F042F
            public const int unbind_to_bind = 2131690543;
            public const int unable_identify_two_dimensional_code_tip = 2131690543;
            
            // aapt resource value: 0x7F0F0430
            public const int unblanking = 2131690544;
            public const int unbind_to_bind = 2131690544;
            
            // aapt resource value: 0x7F0F0431
            public const int unknow_ssid = 2131690545;
            public const int unblanking = 2131690545;
            
            // aapt resource value: 0x7F0F0432
            public const int unlock_fail = 2131690546;
            public const int unknow_ssid = 2131690546;
            
            // aapt resource value: 0x7F0F0433
            public const int unlock_success = 2131690547;
            public const int unlock_fail = 2131690547;
            
            // aapt resource value: 0x7F0F0434
            public const int unnamed = 2131690548;
            public const int unlock_success = 2131690548;
            
            // aapt resource value: 0x7F0F0435
            public const int update_exit = 2131690549;
            public const int unnamed = 2131690549;
            
            // aapt resource value: 0x7F0F0436
            public const int upgrade = 2131690550;
            public const int update_exit = 2131690550;
            
            // aapt resource value: 0x7F0F0437
            public const int upgrade_fail = 2131690551;
            public const int upgrade = 2131690551;
            
            // aapt resource value: 0x7F0F0438
            public const int upgrade_progress = 2131690552;
            public const int upgrade_fail = 2131690552;
            
            // aapt resource value: 0x7F0F0439
            public const int upgrade_success = 2131690553;
            public const int upgrade_progress = 2131690553;
            
            // aapt resource value: 0x7F0F043A
            public const int upgrade_success_progress = 2131690554;
            public const int upgrade_success = 2131690554;
            
            // aapt resource value: 0x7F0F043B
            public const int user_input_name = 2131690555;
            public const int upgrade_success_progress = 2131690555;
            
            // aapt resource value: 0x7F0F043C
            public const int user_login_title = 2131690556;
            public const int user_input_name = 2131690556;
            
            // aapt resource value: 0x7F0F043D
            public const int user_name_txt = 2131690557;
            public const int user_login_title = 2131690557;
            
            // aapt resource value: 0x7F0F043E
            public const int user_pwd_login_login = 2131690558;
            public const int user_name_txt = 2131690558;
            
            // aapt resource value: 0x7F0F043F
            public const int user_register = 2131690559;
            public const int user_pwd_login_login = 2131690559;
            
            // aapt resource value: 0x7F0F0440
            public const int user_register_btn = 2131690560;
            public const int user_register = 2131690560;
            
            // aapt resource value: 0x7F0F0441
            public const int valid_code_retrieve_valid_num = 2131690561;
            public const int user_register_btn = 2131690561;
            
            // aapt resource value: 0x7F0F0442
            public const int verify_camera_fail_network_exception = 2131690562;
            public const int valid_code_retrieve_valid_num = 2131690562;
            
            // aapt resource value: 0x7F0F0443
            public const int verify_code_error = 2131690563;
            public const int verify_camera_fail_network_exception = 2131690563;
            
            // aapt resource value: 0x7F0F0444
            public const int verify_sms_code_fail = 2131690564;
            public const int verify_code_error = 2131690564;
            
            // aapt resource value: 0x7F0F0445
            public const int verify_sms_code_success = 2131690565;
            public const int verify_sms_code_fail = 2131690565;
            
            // aapt resource value: 0x7F0F0446
            public const int version_newest = 2131690566;
            public const int verify_sms_code_success = 2131690566;
            
            // aapt resource value: 0x7F0F0447
            public const int video_answer = 2131690567;
            public const int version_newest = 2131690567;
            
            // aapt resource value: 0x7F0F0448
            public const int video_box = 2131690568;
            public const int video_answer = 2131690568;
            
            // aapt resource value: 0x7F0F0449
            public const int video_confirm = 2131690569;
            public const int video_box = 2131690569;
            
            // aapt resource value: 0x7F0F044A
            public const int video_device = 2131690570;
            public const int video_confirm = 2131690570;
            
            // aapt resource value: 0x7F0F044B
            public const int video_fail = 2131690571;
            public const int video_device = 2131690571;
            
            // aapt resource value: 0x7F0F044C
            public const int video_hang_up = 2131690572;
            public const int video_fail = 2131690572;
            
            // aapt resource value: 0x7F0F044D
            public const int video_icon = 2131690573;
            public const int video_hang_up = 2131690573;
            
            // aapt resource value: 0x7F0F044E
            public const int video_not_answer = 2131690574;
            public const int video_icon = 2131690574;
            
            // aapt resource value: 0x7F0F044F
            public const int video_screenshot = 2131690575;
            public const int video_not_answer = 2131690575;
            
            // aapt resource value: 0x7F0F0450
            public const int video_square = 2131690576;
            public const int video_screenshot = 2131690576;
            
            // aapt resource value: 0x7F0F0451
            public const int video_success = 2131690577;
            public const int video_square = 2131690577;
            
            // aapt resource value: 0x7F0F0452
            public const int video_talk_call_cancel = 2131690578;
            public const int video_success = 2131690578;
            
            // aapt resource value: 0x7F0F0453
            public const int video_talk_call_is_accepted = 2131690579;
            public const int video_talk_call_cancel = 2131690579;
            
            // aapt resource value: 0x7F0F0454
            public const int video_talk_is_playing = 2131690580;
            public const int video_talk_call_is_accepted = 2131690580;
            
            // aapt resource value: 0x7F0F0455
            public const int video_talk_sdk_toast_hang_up = 2131690581;
            public const int video_talk_is_playing = 2131690581;
            
            // aapt resource value: 0x7F0F0456
            public const int video_talk_sdk_toast_nobody = 2131690582;
            public const int video_talk_sdk_toast_hang_up = 2131690582;
            
            // aapt resource value: 0x7F0F0457
            public const int video_talk_signal_weak = 2131690583;
            public const int video_talk_sdk_toast_nobody = 2131690583;
            
            // aapt resource value: 0x7F0F0458
            public const int video_talk_watch_is_busy = 2131690584;
            public const int video_talk_signal_weak = 2131690584;
            
            // aapt resource value: 0x7F0F0459
            public const int video_talk_watch_temperature_high_hang = 2131690585;
            public const int video_talk_watch_is_busy = 2131690585;
            
            // aapt resource value: 0x7F0F045A
            public const int video_talk_watch_temperature_high_hint = 2131690586;
            public const int video_talk_watch_temperature_high_hang = 2131690586;
            
            // aapt resource value: 0x7F0F045B
            public const int video_talk_watch_temperature_high_reject = 2131690587;
            public const int video_talk_watch_temperature_high_hint = 2131690587;
            
            // aapt resource value: 0x7F0F045C
            public const int video_talk_watch_temperature_high_warn = 2131690588;
            public const int video_talk_watch_temperature_high_reject = 2131690588;
            
            // aapt resource value: 0x7F0F045D
            public const int video_tip = 2131690589;
            public const int video_talk_watch_temperature_high_warn = 2131690589;
            
            // aapt resource value: 0x7F0F045E
            public const int video_unlock = 2131690590;
            public const int video_tip = 2131690590;
            
            // aapt resource value: 0x7F0F045F
            public const int wait = 2131690591;
            public const int video_unlock = 2131690591;
            
            // aapt resource value: 0x7F0F0460
            public const int web_login_button_txt = 2131690592;
            public const int wait = 2131690592;
            
            // aapt resource value: 0x7F0F0461
            public const int wechat_interconnect = 2131690593;
            public const int web_login_button_txt = 2131690593;
            
            // aapt resource value: 0x7F0F0462
            public const int wifi_connected = 2131690594;
            public const int wechat_interconnect = 2131690594;
            
            // aapt resource value: 0x7F0F0463
            public const int wifi_connection_finish_need_refresh = 2131690595;
            public const int wifi_connected = 2131690595;
            
            // aapt resource value: 0x7F0F0464
            public const int wifi_set = 2131690596;
            public const int wifi_connection_finish_need_refresh = 2131690596;
            
            // aapt resource value: 0x7F0F0465
            public const int wifi_setting = 2131690597;
            public const int wifi_set = 2131690597;
            
            // aapt resource value: 0x7F0F0466
            public const int wired_connection = 2131690598;
            // aapt resource value: 0x7F0F0468
            public const int xlistview_footer_hint_normal = 2131690600;
            public const int wifi_setting = 2131690598;
            
            // aapt resource value: 0x7F0F0467
            public const int xlistview_footer_hint_no_more_device = 2131690599;
            public const int wired_connection = 2131690599;
            
            // aapt resource value: 0x7F0F0469
            public const int xlistview_footer_hint_ready = 2131690601;
            public const int xlistview_footer_hint_normal = 2131690601;
            // aapt resource value: 0x7F0F0468
            public const int xlistview_footer_hint_no_more_device = 2131690600;
            
            // aapt resource value: 0x7F0F046A
            public const int xlistview_footer_no_more = 2131690602;
            public const int xlistview_footer_hint_ready = 2131690602;
            
            // aapt resource value: 0x7F0F046B
            public const int xlistview_footer_no_more_msg = 2131690603;
            public const int xlistview_footer_no_more = 2131690603;
            
            // aapt resource value: 0x7F0F046C
            public const int xlistview_header_hint_loading = 2131690604;
            public const int xlistview_footer_no_more_msg = 2131690604;
            
            // aapt resource value: 0x7F0F046D
            public const int xlistview_header_hint_more = 2131690605;
            public const int xlistview_header_hint_loading = 2131690605;
            
            // aapt resource value: 0x7F0F046E
            public const int xlistview_header_hint_normal = 2131690606;
            public const int xlistview_header_hint_more = 2131690606;
            
            // aapt resource value: 0x7F0F046F
            public const int xlistview_header_hint_ready = 2131690607;
            public const int xlistview_header_hint_normal = 2131690607;
            
            // aapt resource value: 0x7F0F0470
            public const int xlistview_header_last_time = 2131690608;
            public const int xlistview_header_hint_ready = 2131690608;
            
            // aapt resource value: 0x7F0F0471
            public const int zxing_app_name = 2131690609;
            public const int xlistview_header_last_time = 2131690609;
            
            // aapt resource value: 0x7F0F0472
            public const int zxing_button_ok = 2131690610;
            public const int zxing_app_name = 2131690610;
            
            // aapt resource value: 0x7F0F0473
            public const int zxing_msg_camera_framework_bug = 2131690611;
            public const int zxing_button_ok = 2131690611;
            
            // aapt resource value: 0x7F0F0474
            public const int zxing_msg_default_status = 2131690612;
            public const int zxing_msg_camera_framework_bug = 2131690612;
            
            // aapt resource value: 0x7F0F0475
            public const int zxing_scan_tips = 2131690613;
            public const int zxing_msg_default_status = 2131690613;
            // aapt resource value: 0x7F0F0476
            public const int zxing_scan_tips = 2131690614;
            
            static String()
            {
HDL-ON_iOS/AppDelegate.cs
@@ -186,8 +186,12 @@
        public override void OnResignActivation(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
            }
            Console.WriteLine("OnResignActivation");
            UserInfo.Current.unlockTime = DateTime.Now;
        }
@@ -195,8 +199,12 @@
        public override void DidEnterBackground(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
            }
            //SharedMethod.SharedMethod.IsBackground = true;
            //MainPage.IsEnterBackground = true;
            ////进入后台mqtt正在连接重置状态
@@ -223,8 +231,12 @@
        public override void OnActivated(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
            }
            Console.WriteLine("OnActivated");
            base.OnActivated(application);
            //HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
@@ -282,8 +294,12 @@
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
            }
            Console.WriteLine("111111111111");
            SetCurrentLanguage();
            //Shared.Application.FontSize = 12;
@@ -313,20 +329,15 @@
            //    //RemoteInfo.Current.ReadMsgList(true);
            //}
            //高德key
            GDMapKit.setGDApiKey("f0635ea15c5d579c6e93d9f07a06da69");
            //高德key
            GDMapKit.setGDApiKey("f0635ea15c5d579c6e93d9f07a06da69");
            Console.WriteLine("FinishedLaunching");
            return true;
        }
            /// <summary>
            /// 处理通知消息
            /// </summary>
            void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
        /// <summary>
        /// 处理通知消息
        /// </summary>
        void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
        {
            try
            {
@@ -344,13 +355,14 @@
                    if (userInfo.ContainsKey(new NSString("expandData")))
                    {
                        var expandDataStr = userInfo["expandData"] as NSString;
                        if(expandDataStr == null)
                        if (expandDataStr == null)
                        {
                            var expandDataNSD = userInfo["expandData"] as NSDictionary;
                            if (expandDataNSD != null)
                            {
                                expandData = expandDataNSD.ToString();
                                if(expandDataNSD.ContainsKey(new NSString("messageType"))){
                                if (expandDataNSD.ContainsKey(new NSString("messageType")))
                                {
                                    messageType = expandDataNSD["messageType"] as NSString;
                                    Utlis.WriteLine("messageType: " + messageType);
                                }
@@ -393,7 +405,7 @@
                        UserInfo.Current.pushMessageInfo = pushMes;
                        UserInfo.Current.inCall = DateTime.Now;
                    }
                    if (bFinishedLaunching)
                    {
                        if (pushMes.Extras != null)
@@ -419,7 +431,7 @@
                        //HDLCommon.Current.AdjustPushMessage(pushMes);
                        this.CommonAdjustPushMessage(pushMes);
                    }
                }
            }
            catch
HDL_ON/Common/ApiUtlis.cs
@@ -320,17 +320,22 @@
                                {
#if __IOS__
                                    List<VisitorTempPassword> dataList = new List<VisitorTempPassword>();
                                    Dictionary<string, object> dictionary = new Dictionary<string, object>();
                                    dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
                                    var requestJson = HttpUtil.GetSignRequestJson(dictionary);
                                    ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson);
                                    if(pack!= null)
                                    string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
                                    string errorVersion = "16.2.0";
                                    if (systemVersion.CompareTo(errorVersion) < 0)
                                    {
                                        var data = Newtonsoft.Json.JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString());
                                        //登录全视通
                                        Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");
                                        List<VisitorTempPassword> dataList = new List<VisitorTempPassword>();
                                        Dictionary<string, object> dictionary = new Dictionary<string, object>();
                                        dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
                                        var requestJson = HttpUtil.GetSignRequestJson(dictionary);
                                        ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson);
                                        if (pack != null)
                                        {
                                            var data = JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString());
                                            //登录全视通
                                            Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");
                                        }
                                    }
#endif
                                }
HDL_ON/Common/HDLCommon.cs
@@ -258,7 +258,7 @@
        {
            try
            {
                MainPage.Log($"接收到推送");
                //Extras为空不处理
                if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
HDL_ON/DAL/DriverLayer/Control.cs
@@ -516,6 +516,7 @@
                        var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
                        new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, resend);
                        MainPage.Log($"本地通讯 发送HDL-Link数据:{functionControlDataJson}");
                            Ins.myTcpClient.SendMessage(sendBytes);
                    }
                }
                //远程通讯
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -134,8 +134,8 @@
                    mHDLSipInfo.sipAccount,
                    mHDLSipInfo.sipPasswd,
                    "139.159.157.75:47000",//mHDLSipInfo.realm,
                    "sip:139.159.157.75:47000;transport=udp",
                    HDLLinphoneKit.InterPhoneTypeFreeview
                    //"sip:139.159.157.75:47000;transport=udp",
                    HDLLinphoneKit.InterPhoneTypeFreeview//
                    );
            }
            else
@@ -144,7 +144,7 @@
                   mHDLSipInfo.sipAccount,
                   mHDLSipInfo.sipPasswd,
                   mHDLSipInfo.realm,
                   mHDLSipInfo.proxy+ ";transport=udp",
                   //mHDLSipInfo.proxy+ ";transport=udp",
                   //"sip:139.159.157.75:47000;transport=udp",
                   HDLLinphoneKit.InterPhoneTypeHdl
                   );
HDL_ON/Entity/DB_ResidenceData.cs
@@ -185,7 +185,7 @@
        /// <summary>
        /// 网关详细信息
        /// </summary>
        public HomeGatewayInfo HomeGateway;
        public HomeGatewayInfo HomeGateway;// = new HomeGatewayInfo ();
        /// <summary>
        /// 0:一端口
HDL_ON/UI/MainPage.cs
@@ -204,6 +204,21 @@
                //    Application.HideSoftInput();
                //});
            }
            try
            {
                CommonClass.excptionAction = (obj) =>
                {
                    Application.RunOnMainThread(() =>
                    {
                        Stan.HdlMessageLogic.Current.ShowAppProgramIsError(obj);
                    });
                };
            }
            catch (Exception ex)
            {
            }
        }
        /// <summary>
HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs
@@ -82,16 +82,32 @@
        {
            this.ShowMassage(ShowMsgType.Error, "System Error!", () =>
            {
                //string msg = ex.Message + "\r\n";
                //msg += ex.StackTrace;
                string msg = ex.Message + "\r\n";
                msg += ex.StackTrace;
                //var form = new HideOptionFileContentForm();
                //form.AddForm(string.Empty);
                //form.SetTextContent(msg);
                var form = new HideOptionFileContentForm();
                form.AddForm(string.Empty);
                form.SetTextContent(msg);
            }, "ok");
        }
        /// <summary>
        /// 显示App程序出现了致命错误
        /// </summary>
        /// <param name="ex"></param>
        public void ShowAppProgramIsError(string msg)
        {
            this.ShowMassage(ShowMsgType.Error, "System Error!", () =>
            {
                var form = new HideOptionFileContentForm();
                form.AddForm(string.Empty);
                form.SetTextContent(msg);
            }, "ok");
        }
        #endregion
    }
}
HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -230,6 +230,9 @@
                    }
                    //验证码不需要隐藏
                    etPassword.SecureTextEntry = false;
#if __IOS__
                    etPassword.SetTextContentTypeToOneTimeCode();
#endif
                }
                #endregion
            }
@@ -318,7 +321,7 @@
                //}
                //隐藏密码
                etPassword.SecureTextEntry = true;
                etPassword.IsNumberKeyboardType = false;
                //etPassword.IsNumberKeyboardType = false;
            }
            //验证码登录
            else if (logintMode == 1)
@@ -347,23 +350,8 @@
                //验证码不需要隐藏
                etPassword.SecureTextEntry = false;
                etPassword.Text = smsCode;
                etPassword.IsNumberKeyboardType = true;
#if __IOS__
                var currentInputMode = UIKit.UITextInputMode.CurrentInputMode;
                var installedInputModes = UIKit.UITextInputMode.ActiveInputModes;
                var temmm = new EditText()
                {
                    X = Application.GetRealWidth(78),
                    Width = Application.GetRealWidth(61 + 84),
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.TextFontSize,
                    TextAlignment = TextAlignment.CenterLeft,
                    Foucs = true,
                    BackgroundColor  = 0x44330000,
                };
                passwordView.AddChidren(etPassword);
                //etPassword.IsNumberKeyboardType = true;
#endif
            }
        }
@@ -467,6 +455,11 @@
                            Thread.Sleep(10);
                        }
                    }) { IsBackground = true }.Start();
#if __IOS__
                    var sst = etPassword.MyTextContentType;
                    Console.WriteLine(sst);
                    etPassword.SetTextContentTypeToOneTimeCode();
#endif
                }
                else
                {
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1194,7 +1194,6 @@
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                    {
                        var skipView = new FunctionPage();
                        MainPage.BasePageView.AddChidren(skipView);
                        skipView.LoadPage(functionPageTitleId);
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -34,6 +34,8 @@
        {
            bodyView = this;
            functionList = new List<Function>();
            throw new ArgumentNullException();
        }
        public void LoadPage(int titleId_out)