Skip to content

Commit a721b95

Browse files
WallaceSitWallaceSit
WallaceSit
authored and
WallaceSit
committed
v2.14.0
v2.14.0: • Version number/code is changed • Add back some missing codes during code relocation.
1 parent f448a84 commit a721b95

File tree

6 files changed

+22
-4
lines changed

6 files changed

+22
-4
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
applicationId "com.csl.cs108ademoapp"
1212
minSdk 21
1313
targetSdk 34
14-
versionCode 40
15-
versionName "2.13.1"
14+
versionCode 41
15+
versionName "2.14.0"
1616
}
1717
}
1818

Binary file not shown.
Binary file not shown.

cs108library4a/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
defaultConfig {
1111
minSdk 21
1212
targetSdk 34
13-
buildConfigField 'String', 'VERSION_NAME', "\"2.13.1\""
13+
buildConfigField 'String', 'VERSION_NAME', "\"2.14.0\""
1414
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1515
}
1616
buildTypes {

cslibrary4a/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
defaultConfig {
1111
minSdk 21
1212
targetSdk 34
13-
buildConfigField 'String', 'VERSION_NAME', "\"1\""
13+
buildConfigField 'String', 'VERSION_NAME', "\"0\""
1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
}
1616

cslibrary4a/src/main/java/com/csl/cslibrary4a/RfidReader.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,6 +1722,7 @@ public boolean setFastId(boolean fastIdNew) {
17221722
return bRetValue;
17231723
}
17241724
public int FreqChnCnt(RegionCodes regionCode) {
1725+
if (bis108) {
17251726
switch (regionCode) {
17261727
case FCC:
17271728
case AG:
@@ -1810,6 +1811,23 @@ public int FreqChnCnt(RegionCodes regionCode) {
18101811
default:
18111812
return 0;
18121813
}
1814+
} else {
1815+
boolean DEBUG = true;
1816+
int iFreqChnCnt = -1, iValue = -1; //mRfidDevice.mRfidReaderChip.mRfidReaderChip.mRx000Setting.getCountryEnum(); //iValue--;
1817+
iValue = regionCode.ordinal() - RegionCodes.Albania1.ordinal() + 1;
1818+
if (DEBUG) appendToLog("regionCode = " + regionCode.toString() + ", regionCodeEnum = " + iValue);
1819+
if (iValue > 0) {
1820+
String strFreqChnCnt = csReaderConnector.rfidReader.strCountryEnumInfo[(iValue - 1) * csReaderConnector.rfidReader.iCountryEnumInfoColumn + 3];
1821+
if (DEBUG) appendToLog("strFreqChnCnt = " + strFreqChnCnt);
1822+
try {
1823+
iFreqChnCnt = Integer.parseInt(strFreqChnCnt);
1824+
} catch (Exception ex) {
1825+
appendToLog("!!! CANNOT parse strFreqChnCnt = " + strFreqChnCnt);
1826+
}
1827+
}
1828+
if (DEBUG) appendToLog("iFreqChnCnt = " + iFreqChnCnt);
1829+
return iFreqChnCnt; //1 for hopping, 0 for fixed
1830+
}
18131831
}
18141832
void macRead(int address) {
18151833
if (rfidReaderChipR2000 != null) rfidReaderChipR2000.rx000Setting.readMAC(address);

0 commit comments

Comments
 (0)