2020-12-17 1.信息中心增加换行显示。2.收到报警推送类型的通知才弹窗。

JLChen

2020-12-17 849d8656a8ec66bf3472ddabdc541f98cd0f3e09

 HDL-ON_iOS/AppDelegate.cs

@@ -99,18 +99,23 @@

                // Save new device token 
                NSUserDefaults.StandardUserDefaults.SetString(DeviceToken, "PushDeviceToken");
                string userPhoneName = UIDevice.CurrentDevice.Name;

                UserInfo.Current.PushDeviceToken = DeviceToken;
                UserInfo.Current.PhoneName = userPhoneName;
                UserInfo.Current.SaveUserInfo();
                //UserInfo.Current.PushDeviceToken = DeviceToken;
                //UserInfo.Current.PhoneName = userPhoneName;
                //UserInfo.Current.SaveUserInfo();
                OnAppConfig.Instance.PushDeviceToken = DeviceToken;
                OnAppConfig.Instance.PhoneName = UIDevice.CurrentDevice.Name;
                OnAppConfig.Instance.SaveConfig();
            }
            if (UserInfo.Current.PushDeviceToken != DeviceToken)
            if (OnAppConfig.Instance.PushDeviceToken != DeviceToken)
            {
                string userPhoneName = UIDevice.CurrentDevice.Name;
                UserInfo.Current.PushDeviceToken = DeviceToken;
                UserInfo.Current.PhoneName = userPhoneName;
                UserInfo.Current.SaveUserInfo();
                //string userPhoneName = UIDevice.CurrentDevice.Name;
                //UserInfo.Current.PushDeviceToken = DeviceToken;
                //UserInfo.Current.PhoneName = userPhoneName;
                //UserInfo.Current.SaveUserInfo();
                OnAppConfig.Instance.PushDeviceToken = DeviceToken;
                OnAppConfig.Instance.PhoneName = UIDevice.CurrentDevice.Name;
                OnAppConfig.Instance.SaveConfig();
            }
        }

@@ -165,8 +170,8 @@
        public override void OnResignActivation(UIApplication application)
        {
            Console.WriteLine("OnResignActivation");
            OnAppConfig.Instance.unlockTime = DateTime.Now;
            //BusSocket.Stop();
            UserInfo.Current.unlockTime = DateTime.Now;
            HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
        }

        public override void DidEnterBackground(UIApplication application)
@@ -179,10 +184,11 @@
        public override void WillEnterForeground(UIApplication application)
        {
            SharedMethod.SharedMethod.IsBackground = false;
            //BusSocket.Start();
            HDL_ON.DriverLayer.UdpSocket._BusSocket.Start();
            new AppUnlockPage().LoadPage();
            Console.WriteLine("WillEnterForeground");
            UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
            HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
        }

        public override void WillTerminate(UIApplication application)
@@ -210,7 +216,14 @@
        {

            //Shared.Application.FontSize = 12;

            //取消EditText默认密码输入方式
            Shared.Application.IsEditTextContentTypePassword = false;
            //默认使用苹方字体
            Shared.Application.IsUsePingFang = true;
            //保持屏幕常亮或者自动锁屏
            application.IdleTimerDisabled = false;

            Window = new UIWindow(UIScreen.MainScreen.Bounds);
            rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
            Window.RootViewController = rootViewController;
@@ -233,7 +246,7 @@
            //    OnAppConfig.Instance.SaveUserConfig();
            //}

            application.IdleTimerDisabled = true;
           
            application.RegisterForRemoteNotificationTypes(UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge | UIRemoteNotificationType.Sound);

            //window.AccessibilityNavigationStyle = UIAccessibilityNavigationStyle.Automatic;
@@ -283,16 +296,35 @@
                    var body = alert["body"] as NSString;
                    var title = alert["title"] as NSString;
                    var expandData = "";
                    var messageType = "";
                    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();
                                if(expandDataNSD.ContainsKey(new NSString("messageType"))){
                                    messageType = expandDataNSD["messageType"] as NSString;
                                    Utlis.WriteLine("messageType: "+ messageType);
                                }
                                
                            }
                        }
                        else
                        {
                            expandData = expandDataStr;
                        }

                    }
                    var pushMes = new JPushMessageInfo()
                    {
                        Title = title,
                        Content = body,
                        Extras = expandData,
                        messageType = messageType
                    };
                    System.Console.WriteLine("PushMes title : " + pushMes.Title);
                    System.Console.WriteLine("PushMes message : " + pushMes.Content);