From 56f53785be98a098028391bc624bfac4e42b15e4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 11 一月 2022 18:05:38 +0800
Subject: [PATCH] 2022-01-11 1.Android目标版本调到30 2.修改版本号
---
Crabtree/keystore/crabtreeNew.keyInfo | 5 +++++
Crabtree/ON.Ios/Info.plist | 6 +++---
Crabtree/ON/Properties/AndroidManifest.xml | 4 ++--
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 17 +++++------------
Crabtree/ON/ON.Droid.csproj | 2 ++
Crabtree/keystore/crabtreeNew.keystore | 0
Crabtree/ON.Ios/ON.Ios.csproj | 7 ++++---
Crabtree/SmartHome/UI/SimpleControl/MainPage.cs | 2 +-
8 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 2c82ff4..432810c 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,20 +1,13 @@
锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c4650918" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/MainPage.cs">
- <Files>
- <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="22" Column="14" />
- </Files>
+ <MonoDevelop.Ide.Workbench>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
- <Node name="Shared" expanded="True">
- <Node name="UI" expanded="True">
- <Node name="SimpleControl" expanded="True">
- <Node name="MainPage.cs" selected="True" />
- </Node>
- </Node>
- </Node>
+ <Node name="ON.Droid" selected="True" />
+ <Node name="ON.Ios" expanded="True" />
+ <Node name="Shared" expanded="True" />
</Node>
</State>
</Pad>
@@ -29,7 +22,7 @@
<String>DroidService/DroidService.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.ED470421-805C-4716-A37A-2F00FD3DF71D" />
+ <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget." />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/Crabtree/ON.Ios/Info.plist b/Crabtree/ON.Ios/Info.plist
index 9afa4dd..9d6fa38 100755
--- a/Crabtree/ON.Ios/Info.plist
+++ b/Crabtree/ON.Ios/Info.plist
@@ -15,11 +15,11 @@
<false/>
</dict>
<key>CFBundleIdentifier</key>
- <string>com.hdl.on</string>
+ <string>com.hdl.crabtreenew</string>
<key>CFBundleShortVersionString</key>
- <string>2.701051</string>
+ <string>2.701111</string>
<key>CFBundleVersion</key>
- <string>2.701051</string>
+ <string>2.701111</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
diff --git a/Crabtree/ON.Ios/ON.Ios.csproj b/Crabtree/ON.Ios/ON.Ios.csproj
index 3c7673e..14299b3 100644
--- a/Crabtree/ON.Ios/ON.Ios.csproj
+++ b/Crabtree/ON.Ios/ON.Ios.csproj
@@ -37,7 +37,7 @@
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;HDL;HDLVideo;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>iPhone Distribution: Havells India Limited (6FQDUKMB48)</CodesignKey>
<MtouchFloat32>true</MtouchFloat32>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchArch>ARM64</MtouchArch>
@@ -50,6 +50,7 @@
<NoStdLib>false</NoStdLib>
<MtouchUseThumb></MtouchUseThumb>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+<CodesignProvision>CrabtreeSmartH_Prod</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<Optimize>true</Optimize>
@@ -75,7 +76,7 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DocumentationFile></DocumentationFile>
- <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>Apple Development: Yogesh Sharma (79Q4G2A772)</CodesignKey>
<MtouchFastDev>true</MtouchFastDev>
<MtouchFastDev>true</MtouchFastDev>
<MtouchProfiling>false</MtouchProfiling>
@@ -105,7 +106,7 @@
<WarningsNotAsErrors></WarningsNotAsErrors>
<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
<OnDemandResourcesPrefetchOrder></OnDemandResourcesPrefetchOrder>
-<CodesignProvision>Test</CodesignProvision>
+<CodesignProvision>CrabtreeSmartH_Dev</CodesignProvision>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
</PropertyGroup>
<ItemGroup>
diff --git a/Crabtree/ON/ON.Droid.csproj b/Crabtree/ON/ON.Droid.csproj
index 2449ed6..873ad7c 100644
--- a/Crabtree/ON/ON.Droid.csproj
+++ b/Crabtree/ON/ON.Droid.csproj
@@ -33,6 +33,7 @@
<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
<AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>
<AndroidDexTool>d8</AndroidDexTool>
+ <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -50,6 +51,7 @@
<NoWarn></NoWarn>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
+<AndroidPackageFormat>aab</AndroidPackageFormat>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
diff --git a/Crabtree/ON/Properties/AndroidManifest.xml b/Crabtree/ON/Properties/AndroidManifest.xml
index 7c0830b..dcd1030 100644
--- a/Crabtree/ON/Properties/AndroidManifest.xml
+++ b/Crabtree/ON/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.701051" android:versionCode="202201051">
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.701111" android:versionCode="202201111">
+ <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="30" />
<!-- 鍦ㄥ畨鍗揚鐗堟湰涔嬪悗锛屽繀椤昏鎺堜簣FOREGROUND_SERVICE鏉冮檺锛屾墠鑳藉浣跨敤鍓嶅彴鏈嶅姟 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<!-- 瀹氫綅鏉冮檺锛岀敤浜嶢PP閫氳繃鑾峰彇瀹氫綅鍧愭爣鏌ヨ褰撳墠鍦板尯澶╂皵-->
diff --git a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
index afe6012..bf2fc92 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
@@ -38,7 +38,7 @@
//public static Button LogoButton = new Button ();
- public static string RequestVersion = "2.701051";
+ public static string RequestVersion = "2.701111";
public static UserInfo LoginUser;
/// <summary>
/// 鏄惁鏄鐞嗗憳鏉冮檺(鍙樻洿浜�,鎴愬憳鐨勬椂鍊�,杩欎釜涔熶负ture銆備负浠�涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken)
diff --git a/Crabtree/keystore/crabtreeNew.keyInfo b/Crabtree/keystore/crabtreeNew.keyInfo
new file mode 100644
index 0000000..b7c9c5e
--- /dev/null
+++ b/Crabtree/keystore/crabtreeNew.keyInfo
@@ -0,0 +1,5 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<KeyStore>
+ <CreationDate>2020-03-13T00:00:00</CreationDate>
+ <ValidityInfo>49:54 CST 2020 ? Sun Mar 06 13:49:54 CST 2050</ValidityInfo>
+</KeyStore>
\ No newline at end of file
diff --git a/Crabtree/keystore/crabtreeNew.keystore b/Crabtree/keystore/crabtreeNew.keystore
new file mode 100644
index 0000000..f189fa7
--- /dev/null
+++ b/Crabtree/keystore/crabtreeNew.keystore
Binary files differ
--
Gitblit v1.8.0