From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12
---
ZigbeeApp/Home.Ios/AppDelegate.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/AppDelegate.cs b/ZigbeeApp/Home.Ios/AppDelegate.cs
index d9396e2..0498c00 100644
--- a/ZigbeeApp/Home.Ios/AppDelegate.cs
+++ b/ZigbeeApp/Home.Ios/AppDelegate.cs
@@ -25,8 +25,11 @@
public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
{
- //base.FinishedLaunching(application, launchOptions);
+ Shared.Application.IsGpsEnable = false;
+ Shared.Application.IsMusicEnable = false;
+ base.FinishedLaunching(application, launchOptions);
Shared.Application.FontSize = 12;
+ Shared.Application.IsUsePingFang = true;
Window = new UIWindow(UIScreen.MainScreen.Bounds);
rootViewController = new UINavigationController(new GateWay.Ios.MainViewController()) { NavigationBarHidden = true };
Window.RootViewController = rootViewController;
@@ -115,7 +118,7 @@
{
//寮哄埗涓嬬嚎
CommonPage.Instance.SingOut();
- CommonPage.Instance.ShowErrorInfoAlert(Shared.R.MyInternationalizationString.YouHaveBeenSignOut);
+ CommonPage.Instance.ShowErrorInfoAlert(Shared.R.MyInternationalizationString.uHadBeenLoginAndOffLine);
}
}
}
@@ -205,7 +208,7 @@
{
//寮哄埗涓嬬嚎
CommonPage.Instance.SingOut();
- CommonPage.Instance.ShowErrorInfoAlert(Shared.R.MyInternationalizationString.YouHaveBeenSignOut);
+ CommonPage.Instance.ShowErrorInfoAlert(Shared.R.MyInternationalizationString.uHadBeenLoginAndOffLine);
}
//妫�鏌ヨ繛鎺ヨ繙绋�
//浠ｇ爜
@@ -273,11 +276,27 @@
public static class QRCode
{
static ZXing.Mobile.MobileBarcodeScanner scanner;
- public static async System.Threading.Tasks.Task ScanQRcode(Action<string> action, string topText = "", string bottomText = "", string cancel = "Cancel")
+ public static async System.Threading.Tasks.Task ScanQRcode(Action<string> action, string cancel = "鍙栨秷", string flashText = "闂厜鐏�", string titleText = "浜岀淮鐮佹壂鎻�")
{
if (scanner == null)
{
- scanner = new ZXing.Mobile.MobileBarcodeScanner(Home.IOS.AppDelegate.rootViewController) { FlashButtonText = "", TopText = topText, BottomText = bottomText, CancelButtonText = cancel };
+ var mZXingOverlayView = new Home.IOS.ZXingOverlayView(cancel, flashText, titleText);
+ scanner = new ZXing.Mobile.MobileBarcodeScanner(Home.IOS.AppDelegate.rootViewController) { FlashButtonText = flashText, TopText = titleText, BottomText = "", CancelButtonText = cancel };
+ scanner.UseCustomOverlay = true;
+
+ scanner.CustomOverlay = mZXingOverlayView;
+ var bOn = false;
+ mZXingOverlayView.OnCancel += () => {
+
+ scanner?.Cancel();
+ };
+
+ mZXingOverlayView.OnTorch += () =>
+ {
+ bOn = !bOn;
+ scanner?.Torch(bOn);
+ };
+
}
var result = await scanner.Scan();
--
Gitblit v1.8.0