Merge pull request #7 from cslrfid/develop

0.1.9-076
cslrfid · Apr 18, 2024 · c59ffc6 · c59ffc6
2 parents 51f6435 + 5997023
commit c59ffc6
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 21 deletions.
diff --git a/APK Release/CS710SCSDemo0.1.9-075.apk b/APK Release/CS710SCSDemo0.1.9-075.apk
diff --git a/APK Release/CS710SCSDemo0.1.9-076.apk b/APK Release/CS710SCSDemo0.1.9-076.apk
diff --git a/MobileMvxApp/BLE.Client.Droid/BLE.Client.Droid.csproj b/MobileMvxApp/BLE.Client.Droid/BLE.Client.Droid.csproj
@@ -51,7 +51,7 @@
     <EnableLLVM>false</EnableLLVM>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
     <BundleAssemblies>false</BundleAssemblies>
-    <AndroidPackageFormat>aab</AndroidPackageFormat>
+    <AndroidPackageFormat>apk</AndroidPackageFormat>
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>

diff --git a/MobileMvxApp/BLE.Client.Droid/Properties/AndroidManifest.xml b/MobileMvxApp/BLE.Client.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="csl.CS710Sfulldemo.demo" android:installLocation="preferExternal" android:versionName="0.1.8" android:versionCode="74">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="csl.CS710Sfulldemo.demo" android:installLocation="preferExternal" android:versionName="0.1.9" android:versionCode="76">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
 	<application android:label="CS710S C# Reader" android:icon="@drawable/icon" android:theme="@style/MyTheme"></application>
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

diff --git a/MobileMvxApp/BLE.Client.UWP/Properties/AssemblyInfo.cs b/MobileMvxApp/BLE.Client.UWP/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.8.74")]
-[assembly: AssemblyFileVersion("1.0.8.74")]
+[assembly: AssemblyVersion("1.0.9.76")]
+[assembly: AssemblyFileVersion("1.0.9.76")]
 [assembly: ComVisible(false)]
diff --git a/MobileMvxApp/BLE.Client.iOS/Info.plist b/MobileMvxApp/BLE.Client.iOS/Info.plist
@@ -26,7 +26,7 @@
 	<key>CFBundleName</key>
 	<string>BLE.Client</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.8</string>
+	<string>0.1.9</string>
 	<key>UIMainStoryboardFile</key>
 	<string>LaunchScreen</string>
 	<key>NSLocationAlwaysUsageDescription</key>
@@ -50,6 +50,6 @@
 	<key>XSAppIconAssets</key>
 	<string>Media.xcassets/AppIcon.appiconset</string>
 	<key>CFBundleVersion</key>
-	<string>74</string>
+	<string>76</string>
 </dict>
 </plist>
diff --git a/MobileMvxApp/BLE.Client/PagesViewModelsSet/Settings/PageSettingAdministration.xaml b/MobileMvxApp/BLE.Client/PagesViewModelsSet/Settings/PageSettingAdministration.xaml
@@ -130,7 +130,6 @@
                 <Entry x:Name="entryVerificationpassword" HorizontalOptions="FillAndExpand" />
             </StackLayout>
 
-
             <BoxView HorizontalOptions="FillAndExpand" HeightRequest="5" Color="#1690F4"/>
 
             <Label Text="Cloud Server Setting"/>

diff --git a/...lient/PagesViewModelsSet/SpecialFuction/MultiBankInventory/ViewModelMultiBankInventory.cs b/...lient/PagesViewModelsSet/SpecialFuction/MultiBankInventory/ViewModelMultiBankInventory.cs
@@ -349,18 +349,6 @@ void TagInventoryEvent(object sender, CSLibrary.Events.OnAsyncCallbackEventArgs
             if (e.type != CSLibrary.Constants.CallbackType.TAG_RANGING)
                 return;
 
-            if (BleMvxApplication._reader.rfid.Options.TagRanging.multibanks >= 1)
-            {
-                if (e.info.Bank1Data.Length != BleMvxApplication._reader.rfid.Options.TagRanging.count1)
-                    return;
-            }
-
-            if (BleMvxApplication._reader.rfid.Options.TagRanging.multibanks >= 2)
-            {
-                if (e.info.Bank2Data.Length != BleMvxApplication._reader.rfid.Options.TagRanging.count2)
-                    return;
-            }
-
             InvokeOnMainThread(() =>
             {
                 _tagCountForAlert++;
@@ -441,14 +429,31 @@ private void AddOrUpdateTagData(CSLibrary.Structures.TagCallbackInfo info)
                     {
                         if (TagInfoList[cnt].EPC == info.epc.ToString())
                         {
+/*
                             if (BleMvxApplication._reader.rfid.Options.TagRanging.multibanks >= 1 && TagInfoList[cnt].Bank1Data != CSLibrary.Tools.Hex.ToString(info.Bank1Data))
                                 continue;
 
                             if (BleMvxApplication._reader.rfid.Options.TagRanging.multibanks == 2 && TagInfoList[cnt].Bank2Data != CSLibrary.Tools.Hex.ToString(info.Bank2Data))
                                 continue;
+*/
+                            if (BleMvxApplication._reader.rfid.Options.TagRanging.multibanks >= 1)
+                                if (TagInfoList[cnt].Bank1Data.Length > 0)
+                                    if (info.Bank1Data.Length > 0)
+                                        if (TagInfoList[cnt].Bank1Data != CSLibrary.Tools.Hex.ToString(info.Bank1Data))
+                                            continue;
+
+                            if (BleMvxApplication._reader.rfid.Options.TagRanging.multibanks >= 2)
+                                if (TagInfoList[cnt].Bank2Data.Length > 0)
+                                    if (info.Bank2Data.Length > 0)
+                                        if (TagInfoList[cnt].Bank2Data != CSLibrary.Tools.Hex.ToString(info.Bank2Data))
+                                            continue;
+
+                            if (BleMvxApplication._reader.rfid.Options.TagRanging.multibanks >= 1 && info.Bank1Data.Length > 0)
+                                TagInfoList[cnt].Bank1Data = CSLibrary.Tools.Hex.ToString(info.Bank1Data);
+
+                            if (BleMvxApplication._reader.rfid.Options.TagRanging.multibanks >= 2 && info.Bank2Data.Length > 0)
+                                TagInfoList[cnt].Bank2Data = CSLibrary.Tools.Hex.ToString(info.Bank2Data);
 
-                            TagInfoList[cnt].Bank1Data = CSLibrary.Tools.Hex.ToString(info.Bank1Data);
-                            TagInfoList[cnt].Bank2Data = CSLibrary.Tools.Hex.ToString(info.Bank2Data);
                             TagInfoList[cnt].RSSI = info.rssidBm;
                             found = true;
                             break;