Skip to content

Commit 3f377b1

Browse files
WallaceSitWallaceSit
authored andcommitted
v2.6.0
v2.6.0 This version is the version released to the google play. Version number/code is changed v2.5.2 • Disable the popup to show the not-latest version v2.5.1 • Both: Add Toast message when requesting permission • Library: revert the latest firmware version for Bluetooth and SiliconLab • Library: remove unused code. Relocate some codes.
1 parent 80c9e42 commit 3f377b1

14 files changed

+77
-36
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "com.csl.cs108ademoapp"
77
minSdkVersion 19
88
targetSdkVersion 31
9-
versionCode 36
10-
versionName "2.5.0"
9+
versionCode 37
10+
versionName "2.6.0"
1111
}
1212
}
1313

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

app/src/main/java/com/csl/cs108ademoapp/SaveList2ExternalTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.os.Build;
1111
import android.os.Environment;
1212
import android.provider.Settings;
13+
import android.widget.Toast;
1314

1415
import com.csl.cs108library4a.Cs108Library4A;
1516
import com.csl.cs108library4a.ReaderDevice;
@@ -380,6 +381,7 @@ public String save2File(String messageStr, boolean requestPermission) {
380381
if (requestPermission) {
381382
mCs108Library4a.appendToLog("requestPermissions WRITE_EXTERNAL_STORAGE 1");
382383
MainActivity.permissionRequesting = true; requestPermissions((Activity) mContext, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
384+
Toast.makeText(mContext, com.csl.cs108library4a.R.string.toast_permission_not_granted, Toast.LENGTH_SHORT).show();
383385
return null;
384386
}
385387
} else mCs108Library4a.appendToLog("WRITE_EXTERNAL_STORAGE Permission is GRANTED !!!");

app/src/main/java/com/csl/cs108ademoapp/fragments/HomeFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void run() {
8484
stopProgressDialog();
8585
if (MainActivity.sharedObjects.versioinWarningShown == false) {
8686
String stringPopup = MainActivity.mCs108Library4a.checkVersion();
87-
if (stringPopup != null && stringPopup.length() != 0) {
87+
if (false && stringPopup != null && stringPopup.length() != 0) {
8888
stringPopup = "Firmware too old\nPlease upgrade firmware to at least:" + stringPopup;
8989
CustomPopupWindow customPopupWindow = new CustomPopupWindow((Context)getActivity());
9090
customPopupWindow.popupStart(stringPopup, false);

cs108library4a/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ android {
55
defaultConfig {
66
minSdkVersion 19
77
targetSdkVersion 31
8-
versionCode 36
9-
versionName "2.5.0"
10-
buildConfigField 'String', 'VERSION_NAME', "\"2.5.0\""
8+
versionCode 37
9+
versionName "2.6.0"
10+
buildConfigField 'String', 'VERSION_NAME', "\"2.6.0\""
1111

1212
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1313
}

0 commit comments

Comments
 (0)