CrabtreeOn,印度客户定制APP,迁移2.0平台版本
JLChen
2022-01-11 56f53785be98a098028391bc624bfac4e42b15e4
2022-01-11 1.Android目标版本调到30 2.修改版本号
2个文件已添加
6个文件已修改
43 ■■■■ 已修改文件
Crabtree/.vs/SmartHome/xs/UserPrefs.xml 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/ON.Ios/Info.plist 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/ON.Ios/ON.Ios.csproj 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/ON/ON.Droid.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/ON/Properties/AndroidManifest.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/SmartHome/UI/SimpleControl/MainPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/keystore/crabtreeNew.keyInfo 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/keystore/crabtreeNew.keystore 补丁 | 查看 | 原始文档 | blame | 历史
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>
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>
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>
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" />
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" />
    <!-- 在安卓P版本之后,必须要授予FOREGROUND_SERVICE权限,才能够使用前台服务 -->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <!--  定位权限,用于APP通过获取定位坐标查询当前地区天气-->
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。为什么会声明这样变量,因为有些接口必须使用原来的Token)
Crabtree/keystore/crabtreeNew.keyInfo
New file
@@ -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>
Crabtree/keystore/crabtreeNew.keystore
Binary files differ