From 1ef5d4c4dc6c31ab83a072ef6f639ab9d6c3f6f0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 四月 2024 10:22:33 +0800
Subject: [PATCH] 图片更新
---
HDL-ON_Android/Properties/AndroidManifest.xml | 22 ++--
HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/1024-1.png | 0
HDL-ON_iOS/Entitlements.plist | 2
HDL-ON_iOS/APP_IOS.csproj | 114 ++++------------------------
HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1125x2436.png | 0
HDL-ON_iOS/AppDelegate.cs | 24 ------
HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/750x1334.png | 0
/dev/null | 0
HDL-ON_Android/SplashActivity.cs | 2
HDL-ON_iOS/Info.plist | 12 +-
HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json | 11 --
HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/180x180.png | 0
HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640x1136.png | 0
HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640x960.png | 0
HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json | 14 +--
15 files changed, 43 insertions(+), 158 deletions(-)
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index cb5beb1..e2e64c7 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -42,9 +42,9 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<!--鏋佸厜鎺ㄩ�� Required 涓�浜涚郴缁熻姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�-->
<!-- Required 涓�浜涚郴缁熻姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�-->
- <permission android:name="Application.GetRealHeight(74).permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
+ <permission android:name="com.santan.smartcontrol.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
<!-- Required -->
- <uses-permission android:name="Application.GetRealHeight(74).permission.JPUSH_MESSAGE" />
+ <uses-permission android:name="com.santan.smartcontrol.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -56,7 +56,7 @@
<uses-permission android:name="android.permission.READ_LOGS" />
<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
<application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon" android:requestLegacyExternalStorage="true" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="鎯冲ぉ鏅烘帶">
- <provider android:name="android.support.v4.content.FileProvider" android:authorities="Application.GetRealHeight(74).fileProvider" android:grantUriPermissions="true" android:exported="false">
+ <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.santan.smartcontrol.fileProvider" android:grantUriPermissions="true" android:exported="false">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
</provider>
<!--鏋佸厜鎺ㄩ��-->
@@ -72,22 +72,22 @@
</intent-filter>
</service>
<!-- since 3.0.9 Required SDK 鏍稿績鍔熻兘-->
- <provider android:authorities="Application.GetRealHeight(74).DataProvider" android:name="cn.jpush.android.service.DataProvider" android:exported="true" />
+ <provider android:authorities="com.santan.smartcontrol.DataProvider" android:name="cn.jpush.android.service.DataProvider" android:exported="true" />
<!-- since 1.8.0 option 鍙�夐」銆傜敤浜庡悓涓�璁惧涓笉鍚屽簲鐢ㄧ殑 JPush 鏈嶅姟鐩镐簰鎷夎捣鐨勫姛鑳姐�� -->
<!-- 鑻ヤ笉鍚敤璇ュ姛鑳藉彲鍒犻櫎璇ョ粍浠讹紝鎴栨妸 enabled 璁剧疆鎴� false 锛汚pp 涓嶄細琚叾浠� App 鎷夎捣锛屼絾浼氭媺璧峰叾浠栫殑 App銆� -->
<service android:name="cn.jpush.android.service.DaemonService" android:enabled="false" android:exported="true">
<intent-filter>
<action android:name="cn.jpush.android.intent.DaemonService" />
- <category android:name="Application.GetRealHeight(74)" />
+ <category android:name="com.santan.smartcontrol" />
</intent-filter>
</service>
<!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘-->
- <provider android:authorities="Application.GetRealHeight(74).DownloadProvider" android:name="cn.jpush.android.service.DownloadProvider" android:exported="true" />
+ <provider android:authorities="com.santan.smartcontrol.DownloadProvider" android:name="cn.jpush.android.service.DownloadProvider" android:exported="true" />
<!-- Required SDK 鏍稿績鍔熻兘-->
<receiver android:name="cn.jpush.android.service.PushReceiver" android:enabled="true">
<intent-filter android:priority="1000">
<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
- <category android:name="Application.GetRealHeight(74)" />
+ <category android:name="com.santan.smartcontrol" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.USER_PRESENT" />
@@ -106,7 +106,7 @@
<intent-filter>
<action android:name="cn.jpush.android.ui.PushActivity" />
<category android:name="android.intent.category.DEFAULT" />
- <category android:name="Application.GetRealHeight(74)" />
+ <category android:name="com.santan.smartcontrol" />
</intent-filter>
</activity>
<!-- SDK 鏍稿績鍔熻兘-->
@@ -114,14 +114,14 @@
<activity android:name="cn.jpush.android.ui.PopWinActivity" android:configChanges="orientation|keyboardHidden" android:exported="false" android:theme="@style/MyDialogStyle">
<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
- <category android:name="Application.GetRealHeight(74)" />
+ <category android:name="com.santan.smartcontrol" />
</intent-filter>
</activity>
<!-- since 3.6.0 -->
<activity android:name="cn.jpush.android.service.DActivity" android:enabled="true" android:exported="true" android:theme="@android:style/Theme.Translucent.NoTitleBar" android:taskAffinity="jpush.custom">
<intent-filter>
<action android:name="cn.jpush.android.intent.DActivity" />
- <category android:name="Application.GetRealHeight(74)" />
+ <category android:name="com.santan.smartcontrol" />
</intent-filter>
</activity>
<!-- Required SDK 鏍稿績鍔熻兘-->
@@ -132,7 +132,7 @@
<activity android:name="cn.jpush.android.service.JNotifyActivity" android:exported="true" android:taskAffinity="jpush.custom" android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter>
<action android:name="cn.jpush.android.intent.JNotifyActivity" />
- <category android:name="Application.GetRealHeight(74)" />
+ <category android:name="com.santan.smartcontrol" />
</intent-filter>
</activity>
<!-- Required. For publish channel feature -->
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index a11db62..c45307a 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -27,7 +27,7 @@
{
if (!OnAppConfig.Instance.FirstRunApp)
{
- ////鎵撳紑baseActivity
+ //鎵撳紑baseActivity
Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
StartActivityForResult(i, 1);
OverridePendingTransition(0, 0);
diff --git a/HDL-ON_iOS/APP_IOS.csproj b/HDL-ON_iOS/APP_IOS.csproj
index 87c716b..04246b9 100644
--- a/HDL-ON_iOS/APP_IOS.csproj
+++ b/HDL-ON_iOS/APP_IOS.csproj
@@ -25,9 +25,9 @@
<MtouchArch>x86_64</MtouchArch>
<MtouchLink>Full</MtouchLink>
<MtouchDebug>true</MtouchDebug>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>Apple Development: Zhongwu Zhu (BLBN6556AU)</CodesignKey>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
- <CodesignProvision>OnPro2307291-Dev</CodesignProvision>
+ <CodesignProvision>001_SantanOnPro_Dev_2024-04-15</CodesignProvision>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
@@ -52,7 +52,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>Apple Development: Zhongwu Zhu (BLBN6556AU)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchI18n>cjk</MtouchI18n>
<MtouchLink>None</MtouchLink>
@@ -60,7 +60,7 @@
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-<CodesignProvision>OnPro2307291-Dev</CodesignProvision>
+<CodesignProvision>001_SantanOnPro_Dev_2024-04-15</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -70,12 +70,12 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
+ <CodesignKey>Apple Distribution: Zhongwu Zhu (TD9BRHLD68)</CodesignKey>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <CodesignProvision>OnPro240130-1-Hoc</CodesignProvision>
+ <CodesignProvision>001_SantanOnPro_AdH_2024-04-15</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -92,37 +92,22 @@
<Reference Include="Shared.IOS.JLCountryCode">
<HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS.HDLSceneSiri">
- <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
- </Reference>
<Reference Include="HDL.Shared.IOS.ScanQRCode">
<HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.dll</HintPath>
</Reference>
<Reference Include="Shared.IOS.HDLLinphoneSDK">
<HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS.LCVideoOnSDK">
- <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
- </Reference>
- <Reference Include="Shared.IOS.HDLCNVRSDK">
- <HintPath>..\DLL\IOS\Shared.IOS.HDLCNVRSDK.dll</HintPath>
- </Reference>
- <Reference Include="Shared.IOS.ESVideoOnSDK">
- <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath>
- </Reference>
- <Reference Include="Shared.IOS.HDLFVSDK">
- <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
- </Reference>
- <Reference Include="EZSDK.IOS">
- <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
- </Reference>
<Reference Include="Shared.IOS">
<HintPath>..\DLL\Shared.IOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.HDLSceneSiri">
+ <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
- <Version>13.0.1</Version>
+ <Version>13.0.3</Version>
</PackageReference>
<PackageReference Include="MQTTnet">
<Version>3.1.0</Version>
@@ -440,20 +425,6 @@
<ImageAsset Include="Assets.xcassets\wifi_bg.imageset\wifi_bg.png" />
<ImageAsset Include="Assets.xcassets\device_bg.imageset\Contents.json" />
<ImageAsset Include="Assets.xcassets\device_bg.imageset\device_bg.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422688.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\8281792.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\26881242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792828.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11252436.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\24361125.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320480.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422208.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\7501334.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\22081242.png" />
<ImageAsset Include="Resources\Assets.xcassets\Contents.json" />
<ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\Contents.json" />
<ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\launchIcon2.png" />
@@ -462,6 +433,13 @@
<ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\launchIcon1.png" />
<ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\Contents.json" />
<ImageAsset Include="Resources\Assets.xcassets\.DS_Store" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180x180.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\.DS_Store" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640x960.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125x2436.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750x1334.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640x1136.png" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
@@ -508,10 +486,6 @@
<InterfaceDefinition Include="LaunchScreen.storyboard" />
<InterfaceDefinition Include="Main.storyboard" />
<InterfaceDefinition Include="Resources\LaunchScreen.xib" />
- <InterfaceDefinition Include="Resources\EZ\Base.lproj\EZVideoTalkViewcontroller.xib" />
- <InterfaceDefinition Include="Resources\EZ\Base.lproj\EZSupportViewController.xib" />
- <InterfaceDefinition Include="Resources\EZ\Base.lproj\EZMain.storyboard" />
- <InterfaceDefinition Include="Resources\EZ\Base.lproj\AddDevice.storyboard" />
</ItemGroup>
<ItemGroup>
<None Include="Info.plist" />
@@ -1724,35 +1698,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
<BundleResource Include="Resources\Phone\Collection\GatewayOnlineTipIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
- <BundleResource Include="Resources\h5\index.html" />
- <BundleResource Include="Resources\h5\static\index.63b34199.css" />
- <BundleResource Include="Resources\h5\static\images\coal-save-ic.png" />
- <BundleResource Include="Resources\h5\static\images\inverter-center.svg" />
- <BundleResource Include="Resources\h5\static\images\equal-plant-ic.png" />
- <BundleResource Include="Resources\h5\static\images\left-icon-unselect.png" />
- <BundleResource Include="Resources\h5\static\images\eidt.png" />
- <BundleResource Include="Resources\h5\static\images\switch-off.svg" />
- <BundleResource Include="Resources\h5\static\images\circle-ic.png" />
- <BundleResource Include="Resources\h5\static\images\inverter-center.png" />
- <BundleResource Include="Resources\h5\static\images\pan_ic.png" />
- <BundleResource Include="Resources\h5\static\images\right-icon-unselect.png" />
- <BundleResource Include="Resources\h5\static\images\up-icon-unselect.png" />
- <BundleResource Include="Resources\h5\static\images\switch-on.svg" />
- <BundleResource Include="Resources\h5\static\images\inverter-center.webp" />
- <BundleResource Include="Resources\h5\static\images\yinying.png" />
- <BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" />
- <BundleResource Include="Resources\h5\static\images\co2-reduction-ic.png" />
- <BundleResource Include="Resources\h5\static\images\left-icon.png" />
- <BundleResource Include="Resources\h5\static\js\pages-index-index.a5a00a32.js" />
- <BundleResource Include="Resources\h5\static\js\index.3517131b.js" />
- <BundleResource Include="Resources\h5\static\js\chunk-vendors.56c88730.js" />
- <BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.js" />
- <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
- <BundleResource Include="Resources\h5\static\img\inverter-center.18b181f4.png" />
- <BundleResource Include="Resources\h5\static\img\co2-reduction-ic.9c75228c.png" />
- <BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
- <BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
- <BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
<BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off_home_click.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off_home.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off.png" />
@@ -1794,39 +1739,14 @@
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80x80.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120x120.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120x120-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20x20.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40x40-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29x29.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58x58-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40x40-2.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80x80-1.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\.DS_Store" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024.png" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\SiriIntents\SiriIntents.csproj">
- <IsAppExtension>true</IsAppExtension>
- <Project>{760980F5-1CD3-4F4F-9134-34D87BECD790}</Project>
- <Name>SiriIntents</Name>
- </ProjectReference>
- <ProjectReference Include="..\SiriIntentsUI\SiriIntentsUI.csproj">
- <IsAppExtension>true</IsAppExtension>
- <Project>{ACC48A7F-250B-4915-A250-9BC399DBD6B3}</Project>
- <Name>SiriIntentsUI</Name>
- </ProjectReference>
- <ProjectReference Include="..\SiriKit\SiriKit.csproj">
- <Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project>
- <Name>SiriKit</Name>
- </ProjectReference>
<ProjectReference Include="..\HdlBluWi\Blufi.csproj">
<Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
<Name>Blufi</Name>
- </ProjectReference>
- <ProjectReference Include="..\UMSdk\UMSdk.csproj">
- <Project>{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}</Project>
- <Name>UMSdk</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 769038b..86998b2 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -303,15 +303,6 @@
};
#endregion
-
- //璁剧疆鍏ㄨ閫氱姸鎬�
- //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;
//Bugly.Bugly.StartWithAppId("1dc40c170a");
@@ -331,24 +322,9 @@
SharedMethod.SharedMethod.sharedApp = application;
//NSString* nsCount = [[NSLocale currentLocale] objectForKey: NSLocaleCountryCode];
application.StatusBarStyle = UIStatusBarStyle.DarkContent;
- //window.AccessibilityNavigationStyle = UIAccessibilityNavigationStyle.Automatic;
- // check for a notification
DealWithPushMes(launchOptions);
- //if (UIApplication.SharedApplication.ApplicationIconBadgeNumber > 0)
- //{
- // //RemoteInfo.Current.ReadMsgList(true);
- //}
- try
- {
- UMSdk.HDLUMSDK.InitUMSDKWithAppKey("61d56642e0f9bb492bbc3e72", "IOS");
- }
- catch(Exception ex)
- {
- Console.WriteLine("鍚姩鍙嬬洘SDK寮傚父锛�"+ex.Message);
- }
- Console.WriteLine("FinishedLaunching");
return true;
}
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/1024-1.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/1024-1.png
new file mode 100644
index 0000000..48fdeb9
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/1024-1.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/180.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/180.png
deleted file mode 100644
index 51ac63f..0000000
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/180.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/180x180.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/180x180.png
new file mode 100644
index 0000000..44d9679
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/180x180.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/20x20.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/20x20.png
deleted file mode 100644
index 4c2b0bc..0000000
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/20x20.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/29x29.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/29x29.png
deleted file mode 100644
index 0f95b74..0000000
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/29x29.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40x40-1.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40x40-1.png
deleted file mode 100644
index db9b919..0000000
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40x40-1.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40x40-2.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40x40-2.png
deleted file mode 100644
index db9b919..0000000
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40x40-2.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/58x58-1.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/58x58-1.png
deleted file mode 100644
index 2afe2fd..0000000
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/58x58-1.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/80x80-1.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/80x80-1.png
deleted file mode 100644
index 9fb08a5..0000000
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/80x80-1.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
index 4332296..7bd9d6f 100644
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -43,43 +43,37 @@
"size" : "60x60"
},
{
- "filename" : "180.png",
+ "filename" : "180x180.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
- "filename" : "20x20.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
- "filename" : "40x40-1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
- "filename" : "29x29.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
- "filename" : "58x58-1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
- "filename" : "40x40-2.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
- "filename" : "80x80-1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
@@ -110,7 +104,7 @@
"size" : "60x60"
},
{
- "filename" : "1024.png",
+ "filename" : "1024-1.png",
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
@@ -276,6 +270,7 @@
"subtype" : "49mm"
},
{
+ "filename" : "1024.png",
"idiom" : "watch-marketing",
"scale" : "1x",
"size" : "1024x1024"
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/11252436.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/11252436.png
deleted file mode 100644
index 3127235..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/11252436.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1125x2436.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1125x2436.png
new file mode 100644
index 0000000..2f25210
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1125x2436.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422208.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422208.png
deleted file mode 100644
index e6ac1c0..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422208.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422688.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422688.png
deleted file mode 100644
index b588e7a..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/12422688.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792828.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792828.png
deleted file mode 100644
index 3a7131a..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792828.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/22081242.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/22081242.png
deleted file mode 100644
index 455b69f..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/22081242.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/24361125.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/24361125.png
deleted file mode 100644
index 673d0dd..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/24361125.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/26881242.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/26881242.png
deleted file mode 100644
index a713003..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/26881242.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320480.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320480.png
deleted file mode 100644
index 8bfcd0e..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320480.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136-1.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136-1.png
deleted file mode 100644
index 73314f9..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136-1.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136.png
deleted file mode 100644
index 73314f9..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/6401136.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960-1.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960-1.png
deleted file mode 100644
index f1bf830..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960-1.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960.png
deleted file mode 100644
index f1bf830..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640960.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640x1136.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640x1136.png
new file mode 100644
index 0000000..f284964
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640x1136.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640x960.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640x960.png
new file mode 100644
index 0000000..f146a17
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640x960.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/7501334.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/7501334.png
deleted file mode 100644
index 67fbaf1..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/7501334.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/750x1334.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/750x1334.png
new file mode 100644
index 0000000..45c3f6a
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/750x1334.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/8281792.png b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/8281792.png
deleted file mode 100644
index 0e6e665..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/8281792.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
index 66eb5c9..8ba3591 100644
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -2,7 +2,7 @@
"images" : [
{
"extent" : "full-screen",
- "filename" : "11252436.png",
+ "filename" : "1125x2436.png",
"idiom" : "iphone",
"minimum-system-version" : "11.0",
"orientation" : "portrait",
@@ -11,7 +11,6 @@
},
{
"extent" : "full-screen",
- "filename" : "24361125.png",
"idiom" : "iphone",
"minimum-system-version" : "11.0",
"orientation" : "landscape",
@@ -34,7 +33,6 @@
},
{
"extent" : "full-screen",
- "filename" : "12422208.png",
"idiom" : "iphone",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
@@ -43,7 +41,6 @@
},
{
"extent" : "full-screen",
- "filename" : "22081242.png",
"idiom" : "iphone",
"minimum-system-version" : "8.0",
"orientation" : "landscape",
@@ -52,7 +49,7 @@
},
{
"extent" : "full-screen",
- "filename" : "7501334.png",
+ "filename" : "750x1334.png",
"idiom" : "iphone",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
@@ -61,7 +58,7 @@
},
{
"extent" : "full-screen",
- "filename" : "640960.png",
+ "filename" : "640x960.png",
"idiom" : "iphone",
"minimum-system-version" : "7.0",
"orientation" : "portrait",
@@ -69,7 +66,7 @@
},
{
"extent" : "full-screen",
- "filename" : "6401136.png",
+ "filename" : "640x1136.png",
"idiom" : "iphone",
"minimum-system-version" : "7.0",
"orientation" : "portrait",
@@ -106,21 +103,18 @@
},
{
"extent" : "full-screen",
- "filename" : "320480.png",
"idiom" : "iphone",
"orientation" : "portrait",
"scale" : "1x"
},
{
"extent" : "full-screen",
- "filename" : "640960-1.png",
"idiom" : "iphone",
"orientation" : "portrait",
"scale" : "2x"
},
{
"extent" : "full-screen",
- "filename" : "6401136-1.png",
"idiom" : "iphone",
"orientation" : "portrait",
"scale" : "2x",
diff --git a/HDL-ON_iOS/Entitlements.plist b/HDL-ON_iOS/Entitlements.plist
index 4d737ef..19cd56b 100644
--- a/HDL-ON_iOS/Entitlements.plist
+++ b/HDL-ON_iOS/Entitlements.plist
@@ -12,7 +12,7 @@
<true/>
<key>com.apple.security.application-groups</key>
<array>
- <string>group.com.hdl.onpro</string>
+ <string>group.com.santian.hdlon</string>
</array>
<key>com.apple.developer.networking.multicast</key>
<true/>
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 1eb9e94..26681ca 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -5,13 +5,13 @@
<key>CFBundleAllowMixedLocalizations</key>
<true/>
<key>CFBundleDisplayName</key>
- <string>On Pro</string>
+ <string>鎯冲ぉ鏅烘帶</string>
<key>CFBundleIdentifier</key>
- <string>com.hdl.onpro</string>
+ <string>com.santian.hdlon</string>
<key>CFBundleName</key>
- <string>On Pro</string>
+ <string>鎯冲ぉ鏅烘帶</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.4</string>
+ <string>4.1.0</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>2.4.4</string>
+ <string>4.1.0</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>weixinULAPI</string>
@@ -88,7 +88,7 @@
<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>
+ <string>App data will be send to Siri.</string>
<key>NSUserActivityTypes</key>
<array>
<string>HDLRunSceneIntent</string>
--
Gitblit v1.8.0