2.0.12

1. Fix can not read 128bit EPC in in READ/WRITE page 2. change tid/user bank default read length to 2 in multibank inventory page 3. battery level changed the formula1. Inventory auto stop when after Geiger : Fixed 4. Fix : CS108-2 RW can not set frequency
cslrfid · Jan 18, 2019 · 4ae619f · 4ae619f
1 parent a2c1d0d
commit 4ae619f
Show file tree

Hide file tree

Showing 30 changed files with 827 additions and 842 deletions.
diff --git a/CS108 Demo/.DS_Store b/CS108 Demo/.DS_Store
diff --git a/CS108 Demo/Source/.DS_Store b/CS108 Demo/Source/.DS_Store
diff --git a/CS108 Demo/Source/BLE.Client/BLE.Client.Droid/BLE.Client.Droid.csproj b/CS108 Demo/Source/BLE.Client/BLE.Client.Droid/BLE.Client.Droid.csproj
@@ -16,9 +16,7 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
     <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
-    <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
     <AndroidStoreUncompressedFileExtensions />
     <MandroidI18n />
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
@@ -27,6 +25,8 @@
     </NuGetPackageImportStamp>
     <AndroidTlsProvider>
     </AndroidTlsProvider>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <AndroidLinkSkip></AndroidLinkSkip>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -36,18 +36,11 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
-    <AndroidLinkSkip />
-    <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
-    <AndroidSupportedAbis />
-    <AndroidStoreUncompressedFileExtensions />
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <MandroidI18n />
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
     <Debugger>Xamarin</Debugger>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <BundleAssemblies>false</BundleAssemblies>
     <AndroidTlsProvider>btls</AndroidTlsProvider>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
   </PropertyGroup>
@@ -58,20 +51,12 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-    <AndroidLinkSkip />
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
-    <AndroidSupportedAbis />
-    <AndroidStoreUncompressedFileExtensions />
     <MandroidI18n />
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
     <Debugger>Xamarin</Debugger>
     <DebugSymbols>False</DebugSymbols>
-    <EnableProguard>false</EnableProguard>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <BundleAssemblies>false</BundleAssemblies>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/CS108 Demo/Source/BLE.Client/BLE.Client.Droid/Properties/AndroidManifest.xml b/CS108 Demo/Source/BLE.Client/BLE.Client.Droid/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="csl.cs108fulldemo.demo" android:installLocation="auto" android:versionCode="147" android:versionName="2.0.10">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="csl.cs108fulldemo.demo" android:installLocation="auto" android:versionCode="152" android:versionName="2.0.12">
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="26" />
 	<application android:label="CS108 C# Demo" android:icon="@drawable/icon" android:theme="@style/MyTheme"></application>
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

diff --git a/CS108 Demo/Source/BLE.Client/BLE.Client.iOS/BLE.Client.iOS.csproj b/CS108 Demo/Source/BLE.Client/BLE.Client.iOS/BLE.Client.iOS.csproj
@@ -33,13 +33,17 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
+    <DefineConstants></DefineConstants>
+    <DefineConstants></DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile></DocumentationFile>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>i386, x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignProvision>VS: com.RFIDDemoApp Development</CodesignProvision>
     <CodesignKey>iPhone Developer: Wallace Sit (JBBYRB3QK9)</CodesignKey>
+    <MtouchFloat32></MtouchFloat32>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,7 +54,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARMv7, ARMv7s, ARM64</MtouchArch>
     <CodesignKey>iPhone Developer: Wallace Sit (JBBYRB3QK9)</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
@@ -96,7 +100,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARMv7, ARMv7s, ARM64</MtouchArch>
     <CodesignKey>iPhone Developer: Wallace Sit (JBBYRB3QK9)</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>

diff --git a/CS108 Demo/Source/BLE.Client/BLE.Client.iOS/Info.plist b/CS108 Demo/Source/BLE.Client/BLE.Client.iOS/Info.plist
@@ -19,13 +19,13 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>MinimumOSVersion</key>
-	<string>9.3</string>
+	<string>7.0</string>
 	<key>CFBundleDisplayName</key>
 	<string>CS108 RFID Reader</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.10</string>
+	<string>2.0.12</string>
 	<key>NSCalendarsUsageDescription</key>
 	<string>Only for testing, we don&apos;t need the data to do anything</string>
 	<key>UIApplicationExitsOnSuspend</key>
@@ -36,8 +36,6 @@
 	</array>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>the program will detected location of device and send the location to cloud server</string>
-	<key>CFBundleVersion</key>
-	<string>147</string>
 	<key>CFBundleShortVersion</key>
 	<string>0.0.17</string>
 	<key>CFBundleName</key>
@@ -55,5 +53,7 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>CFBundleVersion</key>
+	<string>152</string>
 </dict>
 </plist>
diff --git a/CS108 Demo/Source/BLE.Client/BLE.Client/BleMvxApplication.cs b/CS108 Demo/Source/BLE.Client/BLE.Client/BleMvxApplication.cs
@@ -109,10 +109,10 @@ public CONFIG ()
 			RFID_MBI_MultiBank2Enable = false;
 			RFID_MBI_MultiBank1 = CSLibrary.Constants.MemoryBank.TID;
 			RFID_MBI_MultiBank1Offset = 0;
-			RFID_MBI_MultiBank1Count = 1;
+			RFID_MBI_MultiBank1Count = 2;
 			RFID_MBI_MultiBank2 = CSLibrary.Constants.MemoryBank.USER;
 			RFID_MBI_MultiBank2Offset = 0;
-			RFID_MBI_MultiBank2Count = 1;
+			RFID_MBI_MultiBank2Count = 2;
 
             RFID_InventoryAlertSound = true;
             RFID_QOverride = false;