wei
2020-12-11 37dc5f07121946aa03ce96030a9f400af032367d
Merge remote-tracking branch 'origin/CJL-NEW' into NewFilePath
6个文件已修改
51 ■■■■ 已修改文件
HDL-ON_Android/Application.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Language.ini 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/AppDelegate.cs 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Info.plist 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Language.ini 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Application.cs
@@ -49,7 +49,9 @@
            string[] permissions = new string[] { Manifest.Permission.WriteExternalStorage, Manifest.Permission.RecordAudio,
            Manifest.Permission.Camera, Manifest.Permission.ProcessOutgoingCalls, Manifest.Permission.GetAccounts};
            //禁止屏幕长亮
            BaseActivity.KeepScreenON = false;
            //隐藏迪拜虚拟按键
            BaseActivity.IsHideVirualButtons = true;
            init();
            BaseActivity.OnCreateActoin += (activity, application) =>
HDL-ON_Android/Assets/Language.ini
@@ -549,7 +549,7 @@
9040=报警类
9041=系统信息
9042=信息中心
9043=该账号已在其它设备登录
9043=您的账号已在别处登录,如果不是您本人操作,请立即修改密码!
9044=上传成功
9045=上传失败
9046=修改成功!
HDL-ON_iOS/AppDelegate.cs
@@ -165,7 +165,7 @@
        public override void OnResignActivation(UIApplication application)
        {
            Console.WriteLine("OnResignActivation");
            UserInfo.Current.unlockTime = DateTime.Now;
            OnAppConfig.Instance.unlockTime = DateTime.Now;
            HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
        }
@@ -195,7 +195,7 @@
        {
            Console.WriteLine("OnActivated");
            base.OnActivated(application);
            Console.WriteLine("oooo...");
            //if (haveToSignOut == true)
            //{
                ////强制下线
@@ -211,8 +211,16 @@
        {
            //Shared.Application.FontSize = 12;
            //取消EditText默认密码输入方式
            Shared.Application.IsEditTextContentTypePassword = false;
            //默认使用苹方字体
            Shared.Application.IsUsePingFang = true;
            ////默认禁止音乐服务
            //Shared.Application.IsMusicEnable = false;
            //保持屏幕常亮或者自动锁屏
            application.IdleTimerDisabled = false;
            Window = new UIWindow(UIScreen.MainScreen.Bounds);
            rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
            Window.RootViewController = rootViewController;
@@ -235,7 +243,7 @@
            //    OnAppConfig.Instance.SaveUserConfig();
            //}
            application.IdleTimerDisabled = true;
            application.RegisterForRemoteNotificationTypes(UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge | UIRemoteNotificationType.Sound);
            //window.AccessibilityNavigationStyle = UIAccessibilityNavigationStyle.Automatic;
@@ -287,8 +295,28 @@
                    var expandData = "";
                    if (userInfo.ContainsKey(new NSString("expandData")))
                    {
                        var expandDataNSD = userInfo["expandData"] as NSDictionary;
                        expandData = expandDataNSD["messageType"] as NSString;
                        var expandDataStr = userInfo["expandData"] as NSString;
                        if(expandDataStr == null)
                        {
                            var expandDataNSD = userInfo["expandData"] as NSDictionary;
                            if (expandDataNSD != null)
                            {
                                expandData = expandDataNSD.ToString();
                            }
                        }
                        else
                        {
                            expandData = expandDataStr;
                        }
                        //var expandDataNSD = userInfo["expandData"] as NSDictionary;
                        //if (expandDataNSD != null && expandDataNSD is NSDictionary)
                        //{
                        //    if (expandDataNSD.ContainsKey(new NSString("messageType")))
                        //    {
                        //        expandData = expandDataNSD["messageType"] as NSString;
                        //    }
                        //}
                    }
                    var pushMes = new JPushMessageInfo()
                    {
HDL-ON_iOS/Info.plist
@@ -115,5 +115,9 @@
    </array>
    <key>CFBundleDevelopmentRegion</key>
    <string>zh_CN</string>
    <key>UIBackgroundModes</key>
    <array>
        <string>remote-notification</string>
    </array>
</dict>
</plist>
HDL-ON_iOS/Resources/Language.ini
@@ -557,7 +557,7 @@
9040=报警类
9041=系统信息
9042=信息中心
9043=该账号已在其它设备登录
9043=您的账号已在别处登录,如果不是您本人操作,请立即修改密码!
9044=上传成功
9045=上传失败
9046=修改成功!
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
@@ -102,6 +102,7 @@
                    BorderColor = 0x00000000,
                    BorderWidth = 0,
                    ScrollEnabled = false,
                    VerticalScrollBarEnabled = false,//隐藏滚动条
                };
                contentView.AddChidren(sView);
                #region 头像信息