From 1cd93851bde6ec19c07f1445899a76ab0dfa507d Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 13 四月 2023 16:01:53 +0800
Subject: [PATCH] 1.增加推送判断是否加载了类的方法 2.修改launch screen引用 3.去掉门锁测试环境appkey逻辑
---
HDL-ON_iOS/Info.plist | 174 +++++++++++++++++++++----------------------
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 8 +-
HDL-ON_iOS/LaunchScreen.storyboard | 2
DLL/IOS/EZSDK.IOS.dll | 0
HDL-ON_iOS/AppDelegate.cs | 34 ++++++--
5 files changed, 116 insertions(+), 102 deletions(-)
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index e3e147e..09be55e 100644
--- a/DLL/IOS/EZSDK.IOS.dll
+++ b/DLL/IOS/EZSDK.IOS.dll
Binary files differ
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index af7af24..94eb229 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -262,7 +262,7 @@
{
Language.CurrentLanguage = "russian";
}
- else if (NSLocale.PreferredLanguages[0].Contains( "bul"))
+ else if (NSLocale.PreferredLanguages[0].Contains("bul"))
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
@@ -327,10 +327,24 @@
return true;
}
- /// <summary>
- /// 澶勭悊閫氱煡娑堟伅
- /// </summary>
- void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
+ public void AdjustPushMessage(JPushMessageInfo pushMes)
+ {
+ new System.Threading.Thread(new System.Threading.ThreadStart(() =>
+ {
+ while (MainPage.BasePageView == null)
+ {
+ System.Threading.Thread.Sleep(300);
+ }
+ Shared.Application.RunOnMainThread(() =>
+ {
+ HDLCommon.Current.AdjustPushMessage(pushMes);
+ });
+ })).Start();
+ }
+ /// <summary>
+ /// 澶勭悊閫氱煡娑堟伅
+ /// </summary>
+ void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
{
try
{
@@ -413,14 +427,16 @@
}
else
{
- HDLCommon.Current.AdjustPushMessage(pushMes);
- }
+ //HDLCommon.Current.AdjustPushMessage(pushMes);
+ this.AdjustPushMessage(pushMes);
+ }
}
}
else
{
- HDLCommon.Current.AdjustPushMessage(pushMes);
- }
+ //HDLCommon.Current.AdjustPushMessage(pushMes);
+ this.AdjustPushMessage(pushMes);
+ }
}
}
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index a8e2179..b285c37 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -2,6 +2,16 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>CFBundleAllowMixedLocalizations</key>
+ <true/>
+ <key>CFBundleDisplayName</key>
+ <string>On Pro</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.hdl.onpro</string>
+ <key>CFBundleName</key>
+ <string>On Pro</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.6.602303301</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@@ -13,20 +23,36 @@
<string>AispeechMobile</string>
</dict>
<dict>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>hdlonpro</string>
</array>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
</dict>
<dict>
<key>CFBundleURLName</key>
<string>qqmusic</string>
</dict>
</array>
+ <key>CFBundleVersion</key>
+ <string>1.6.603301</string>
+ <key>LSApplicationQueriesSchemes</key>
+ <array>
+ <string>weixinULAPI</string>
+ <string>weixin</string>
+ <string>xiaoduapp</string>
+ <string>AispeechMobile</string>
+ <string>qqmusic</string>
+ </array>
+ <key>LSRequiresIPhoneOS</key>
+ <true/>
+ <key>MinimumOSVersion</key>
+ <string>12.2</string>
<key>NSAppTransportSecurity</key>
<dict>
+ <key>NSAllowsArbitraryLoads</key>
+ <true/>
<key>NSExceptionDomains</key>
<dict>
<key>NSExceptionDomains</key>
@@ -34,15 +60,52 @@
<key>NSExceptionMinimumTLSVersion</key>
<string>TLSv1.0</string>
</dict>
- <key>NSAllowsArbitraryLoads</key>
- <true/>
</dict>
- <key>CFBundleIdentifier</key>
- <string>com.hdl.onpro</string>
- <key>LSRequiresIPhoneOS</key>
- <true/>
- <key>MinimumOSVersion</key>
- <string>12.2</string>
+ <key>NSAppleMusicUsageDescription</key>
+ <string>App needs to access your music library to connect to an external player to play music.</string>
+ <key>NSBluetoothAlwaysUsageDescription</key>
+ <string>This application uses Bluetooth to communicate with the device, this application does not collect, store or record any data that communicates via Bluetooth.</string>
+ <key>NSBluetoothPeripheralUsageDescription</key>
+ <string>This application uses Bluetooth to communicate with the device, this application does not collect, store or record any data that communicates via Bluetooth.</string>
+ <key>NSCameraUsageDescription</key>
+ <string>App wants to access your camera to set the background picture of the room</string>
+ <key>NSContactsUsageDescription</key>
+ <string>LC Video will be use</string>
+ <key>NSFaceIDUsageDescription</key>
+ <string>Need to use Face ID for unlock verification</string>
+ <key>NSLocalNetworkUsageDescription</key>
+ <string>APP wants to use local network access permissions for WiFi distribution.</string>
+ <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+ <string>LC Video will be use</string>
+ <key>NSLocationAlwaysUsageDescription</key>
+ <string>Use geographic location to provide services such as weather</string>
+ <key>NSLocationWhenInUseUsageDescription</key>
+ <string>EZ video will be use</string>
+ <key>NSMicrophoneUsageDescription</key>
+ <string>APP wants to use the phone's microphone for voice intercom</string>
+ <key>NSPhotoLibraryAddUsageDescription</key>
+ <string>App wants to access your photo library to set the background image of the room</string>
+ <key>NSPhotoLibraryUsageDescription</key>
+ <string>App wants to access your photo library to set the background image of the room</string>
+ <key>NSSiriUsageDescription</key>
+ <string>On Pro data will be send to Siri.</string>
+ <key>NSUserActivityTypes</key>
+ <array>
+ <string>HDLRunSceneIntent</string>
+ </array>
+ <key>NSVoIPUsageDescription</key>
+ <string>Make audio/video calls</string>
+ <key>UIAppFonts</key>
+ <array>
+ <string>titilliumtext25l005.otf</string>
+ </array>
+ <key>UIBackgroundModes</key>
+ <array>
+ <string>audio</string>
+ <string>location</string>
+ <string>voip</string>
+ <string>remote-notification</string>
+ </array>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
@@ -53,30 +116,8 @@
</array>
<key>UIRequiresFullScreen</key>
<true/>
- <key>NSCameraUsageDescription</key>
- <string>App wants to access your camera to set the background picture of the room</string>
- <key>NSPhotoLibraryUsageDescription</key>
- <string>App wants to access your photo library to set the background image of the room</string>
- <key>NSPhotoLibraryAddUsageDescription</key>
- <string>App wants to access your photo library to set the background image of the room</string>
- <key>NSMicrophoneUsageDescription</key>
- <string>APP wants to use the phone's microphone for voice intercom</string>
- <key>NSLocalNetworkUsageDescription</key>
- <string>APP wants to use local network access permissions for WiFi distribution.</string>
- <key>UISupportedInterfaceOrientations</key>
- <array>
- <string>UIInterfaceOrientationPortrait</string>
- <string>UIInterfaceOrientationLandscapeRight</string>
- <string>UIInterfaceOrientationLandscapeLeft</string>
- </array>
- <key>UIAppFonts</key>
- <array>
- <string>titilliumtext25l005.otf</string>
- </array>
- <key>UISupportedInterfaceOrientations~ipad</key>
- <array>
- <string>UIInterfaceOrientationPortrait</string>
- </array>
+ <key>UIStatusBarStyle</key>
+ <string>UIStatusBarStyleLightContent</string>
<key>UIStatusBarTintParameters</key>
<dict>
<key>UINavigationBar</key>
@@ -87,64 +128,21 @@
<false/>
</dict>
</dict>
+ <key>UISupportedInterfaceOrientations</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ </array>
+ <key>UISupportedInterfaceOrientations~ipad</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ </array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
- <key>XSLaunchImageAssets</key>
- <string>Assets.xcassets/LaunchImage.launchimage</string>
- <key>CFBundleName</key>
- <string>On Pro</string>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>
- <key>CFBundleDisplayName</key>
- <string>On Pro</string>
- <key>UIStatusBarStyle</key>
- <string>UIStatusBarStyleLightContent</string>
- <key>CFBundleShortVersionString</key>
- <string>1.6.602303301</string>
- <key>CFBundleVersion</key>
- <string>1.6.603301</string>
- <key>NSAppleMusicUsageDescription</key>
- <string>App needs to access your music library to connect to an external player to play music.</string>
- <key>NSLocationAlwaysUsageDescription</key>
- <string>Use geographic location to provide services such as weather</string>
- <key>LSApplicationQueriesSchemes</key>
- <array>
- <string>weixinULAPI</string>
- <string>weixin</string>
- <string>xiaoduapp</string>
- <string>AispeechMobile</string>
- <string>qqmusic</string>
- </array>
- <key>UIBackgroundModes</key>
- <array>
- <string>audio</string>
- <string>location</string>
- <string>voip</string>
- <string>remote-notification</string>
- </array>
- <key>NSFaceIDUsageDescription</key>
- <string>Need to use Face ID for unlock verification</string>
- <key>CFBundleAllowMixedLocalizations</key>
- <true/>
- <key>NSBluetoothPeripheralUsageDescription</key>
- <string>This application uses Bluetooth to communicate with the device, this application does not collect, store or record any data that communicates via Bluetooth.</string>
- <key>NSBluetoothAlwaysUsageDescription</key>
- <string>This application uses Bluetooth to communicate with the device, this application does not collect, store or record any data that communicates via Bluetooth.</string>
- <key>NSVoIPUsageDescription</key>
- <string>Make audio/video calls</string>
- <key>NSSiriUsageDescription</key>
- <string>On Pro data will be send to Siri.</string>
- <key>NSUserActivityTypes</key>
- <array>
- <string>HDLRunSceneIntent</string>
- </array>
- <key>NSContactsUsageDescription</key>
- <string>LC Video will be use</string>
- <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
- <string>LC Video will be use</string>
- <key>NSLocationWhenInUseUsageDescription</key>
- <string>EZ video will be use</string>
<key>UILaunchStoryboardName</key>
- <string>LaunchSreen</string>
+ <string>LaunchScreen</string>
</dict>
</plist>
diff --git a/HDL-ON_iOS/LaunchScreen.storyboard b/HDL-ON_iOS/LaunchScreen.storyboard
index 888a9ea..424fa26 100644
--- a/HDL-ON_iOS/LaunchScreen.storyboard
+++ b/HDL-ON_iOS/LaunchScreen.storyboard
@@ -24,7 +24,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
</subviews>
- <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 5bc4b2f..e9cb4c6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -234,10 +234,10 @@
}
string appKey = "1aa98a90489b4838b966b57018b4b04b";//姝ｅ紡鏈嶅姟鍣�
- if (OnAppConfig.Instance.RequestHttpsHost == "https://test-gz.hdlcontrol.com")
- {
- appKey = "941b1b72b6294998acfd36c14931b675";//鐢ㄥ湪娴嬭瘯鏈嶅姟鍣ㄦ帹閫佺殑
- }
+ //if (OnAppConfig.Instance.RequestHttpsHost == "https://test-gz.hdlcontrol.com")
+ //{
+ // appKey = "941b1b72b6294998acfd36c14931b675";//鐢ㄥ湪娴嬭瘯鏈嶅姟鍣ㄦ帹閫佺殑
+ //}
#if __IOS__
--
Gitblit v1.8.0