diff --git a/README.md b/README.md
index 7391e72..2b9be41 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Gradle:
Add the dependency
```
- implementation 'com.whatspos.sdk:paxstore-3rd-app-android-sdk:9.4.1'
+ implementation 'com.whatspos.sdk:paxstore-3rd-app-android-sdk:9.5.0'
```
##### Tips: In the near future, our platform will only support applications integrated with sdk version v8.7.0 or higher. Please upgrade the sdk to the latest version as soon as possible
diff --git a/demo/build.gradle b/demo/build.gradle
index 0c077d1..2919b2c 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -6,8 +6,8 @@ android {
applicationId "com.pax.android.demoapp"
minSdkVersion 19
targetSdkVersion 31
- versionCode 1041
- versionName "9.4.1"
+ versionCode 1050
+ versionName "9.5.0"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
@@ -43,15 +43,13 @@ configurations.all {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'net.grandcentrix.tray:tray:0.12.0'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.google.code.gson:gson:2.9.0'
implementation 'org.slf4j:slf4j-android:1.7.25'
- implementation 'com.whatspos.sdk:paxstore-3rd-app-android-sdk:9.4.1'
+ implementation 'com.whatspos.sdk:paxstore-3rd-app-android-sdk:9.5.0'
//to download below imports, please add this to root build.gradle repositories >> maven { url 'https://jitpack.io' }
- implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'commons-io:commons-io:2.7'
diff --git a/demo/src/main/java/com/pax/android/demoapp/BaseApplication.java b/demo/src/main/java/com/pax/android/demoapp/BaseApplication.java
index bce27e1..592301f 100644
--- a/demo/src/main/java/com/pax/android/demoapp/BaseApplication.java
+++ b/demo/src/main/java/com/pax/android/demoapp/BaseApplication.java
@@ -10,7 +10,6 @@
import com.pax.market.android.app.sdk.StoreSdk;
import com.pax.market.android.app.sdk.msg.utils.Notifications;
-import net.grandcentrix.tray.AppPreferences;
/**
* Created by fojut on 2017/8/24.
@@ -29,7 +28,6 @@ public class BaseApplication extends Application {
//todo please make sure get the correct SN here, for pax device you can integrate NeptuneLite SDK to get the correct SN
- public static AppPreferences appPreferences;
@Override
@@ -37,8 +35,6 @@ public void onCreate() {
super.onCreate();
//initial the SDK
initStoreSdk();
- appPreferences = new AppPreferences(getApplicationContext()); // this Preference comes for free from the library
-
}
private void initStoreSdk() {
diff --git a/demo/src/main/java/com/pax/android/demoapp/DownloadParamService.java b/demo/src/main/java/com/pax/android/demoapp/DownloadParamService.java
index fa22031..a67eccb 100644
--- a/demo/src/main/java/com/pax/android/demoapp/DownloadParamService.java
+++ b/demo/src/main/java/com/pax/android/demoapp/DownloadParamService.java
@@ -87,8 +87,8 @@ protected void onHandleIntent(@Nullable Intent intent) {
//todo check the Error Code and Error Message for fail reason
Log.e(TAG, "ErrorCode: " + downloadResult.getBusinessCode() + "ErrorMessage: " + downloadResult.getMessage());
//update download fail info in main page for Demo
- spUtil.setString(DemoConstants.PUSH_RESULT_BANNER_TITLE, DemoConstants.DOWNLOAD_FAILED);
- spUtil.setString(DemoConstants.PUSH_RESULT_BANNER_TEXT, "Your push parameters file task failed at " + sdf.format(new Date()) + ", please check error log.");
+ spUtil.setString(getApplicationContext(), DemoConstants.PUSH_RESULT_BANNER_TITLE, DemoConstants.DOWNLOAD_FAILED);
+ spUtil.setString(getApplicationContext(), DemoConstants.PUSH_RESULT_BANNER_TEXT, "Your push parameters file task failed at " + sdf.format(new Date()) + ", please check error log.");
updateUI(DemoConstants.DOWNLOAD_STATUS_FAILED);
}
}
@@ -101,7 +101,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
}
private void readDataToDisplay() {
- spUtil.setString(DemoConstants.PUSH_RESULT_BANNER_TITLE, DemoConstants.DOWNLOAD_SUCCESS);
+ spUtil.setString(getApplicationContext(), DemoConstants.PUSH_RESULT_BANNER_TITLE, DemoConstants.DOWNLOAD_SUCCESS);
// get specific display data resource sys_cap.p
File parameterFile = getDisplayFile();
@@ -125,15 +125,15 @@ private void saveDisplayFileDataToSp(File parameterFile) {
String bannerSubTextValue = "Files are stored in " + parameterFile.getPath();
Log.i(TAG, "run=====: " + bannerTextValue);
//save result for demo display
- spUtil.setString(DemoConstants.PUSH_RESULT_BANNER_TEXT, bannerTextValue);
- spUtil.setString(DemoConstants.PUSH_RESULT_BANNER_SUBTEXT, bannerSubTextValue);
+ spUtil.setString(getApplicationContext(), DemoConstants.PUSH_RESULT_BANNER_TEXT, bannerTextValue);
+ spUtil.setString(getApplicationContext(), DemoConstants.PUSH_RESULT_BANNER_SUBTEXT, bannerSubTextValue);
List> datalist = getParameters(parameterFile);
//save result for demo display
- spUtil.setDataList(DemoConstants.PUSH_RESULT_DETAIL, datalist);
+ spUtil.setDataList(getApplicationContext(), DemoConstants.PUSH_RESULT_DETAIL, datalist);
} else {
Log.i(TAG, "parameterFile is null ");
- spUtil.setString(DemoConstants.PUSH_RESULT_BANNER_TEXT, "Download file not found. This demo only accept parameter file with name 'sys_cap.p'");
+ spUtil.setString(getApplicationContext(), DemoConstants.PUSH_RESULT_BANNER_TEXT, "Download file not found. This demo only accept parameter file with name 'sys_cap.p'");
}
}
diff --git a/demo/src/main/java/com/pax/android/demoapp/PushFragment.java b/demo/src/main/java/com/pax/android/demoapp/PushFragment.java
index cf367b3..b4cc19a 100644
--- a/demo/src/main/java/com/pax/android/demoapp/PushFragment.java
+++ b/demo/src/main/java/com/pax/android/demoapp/PushFragment.java
@@ -93,13 +93,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
nodataLayout = view.findViewById(R.id.nodata);
- String pushResultBannerTitle = spUtil.getString(DemoConstants.PUSH_RESULT_BANNER_TITLE);
+ String pushResultBannerTitle = spUtil.getString(getContext(), DemoConstants.PUSH_RESULT_BANNER_TITLE);
if(DemoConstants.DOWNLOAD_SUCCESS.equals(pushResultBannerTitle)){
- bannerTitleTV.setText(spUtil.getString(DemoConstants.PUSH_RESULT_BANNER_TITLE));
- bannerTextTV.setText(spUtil.getString(DemoConstants.PUSH_RESULT_BANNER_TEXT));
- bannerSubTextTV.setText(spUtil.getString(DemoConstants.PUSH_RESULT_BANNER_SUBTEXT));
+ bannerTitleTV.setText(spUtil.getString(getContext(), DemoConstants.PUSH_RESULT_BANNER_TITLE));
+ bannerTextTV.setText(spUtil.getString(getContext(), DemoConstants.PUSH_RESULT_BANNER_TEXT));
+ bannerSubTextTV.setText(spUtil.getString(getContext(), DemoConstants.PUSH_RESULT_BANNER_SUBTEXT));
- datalist = spUtil.getDataList(DemoConstants.PUSH_RESULT_DETAIL);
+ datalist = spUtil.getDataList(getContext(), DemoConstants.PUSH_RESULT_DETAIL);
//if have push history, display it. the demo will only store the latest push record.
if(datalist!=null && datalist.size() >0) {
//display push history detail
@@ -116,8 +116,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
}
}else {
if(DemoConstants.DOWNLOAD_FAILED.equals(pushResultBannerTitle)) {
- bannerTitleTV.setText(spUtil.getString(DemoConstants.PUSH_RESULT_BANNER_TITLE));
- bannerTextTV.setText(spUtil.getString(DemoConstants.PUSH_RESULT_BANNER_TEXT));
+ bannerTitleTV.setText(spUtil.getString(getContext(), DemoConstants.PUSH_RESULT_BANNER_TITLE));
+ bannerTextTV.setText(spUtil.getString(getContext(), DemoConstants.PUSH_RESULT_BANNER_TEXT));
}
//display as no data
detailListView.setVisibility(View.GONE);
@@ -158,10 +158,10 @@ public void onRecive(Context context, Intent intent) {
int resultCode = intent.getIntExtra(DemoConstants.DOWNLOAD_RESULT_CODE, 0);
switch (resultCode) {
case DemoConstants.DOWNLOAD_STATUS_SUCCESS:
- bannerTitleTV.setText(spUtil.getString(DemoConstants.PUSH_RESULT_BANNER_TITLE));
- bannerTextTV.setText(spUtil.getString(DemoConstants.PUSH_RESULT_BANNER_TEXT));
- bannerSubTextTV.setText(spUtil.getString(DemoConstants.PUSH_RESULT_BANNER_SUBTEXT));
- datalist = spUtil.getDataList(DemoConstants.PUSH_RESULT_DETAIL);
+ bannerTitleTV.setText(spUtil.getString(getContext(), DemoConstants.PUSH_RESULT_BANNER_TITLE));
+ bannerTextTV.setText(spUtil.getString(getContext(), DemoConstants.PUSH_RESULT_BANNER_TEXT));
+ bannerSubTextTV.setText(spUtil.getString(getContext(), DemoConstants.PUSH_RESULT_BANNER_SUBTEXT));
+ datalist = spUtil.getDataList(getContext(), DemoConstants.PUSH_RESULT_DETAIL);
if (datalist != null && datalist.size() > 0) {
//display push history detail
detailListView.setVisibility(View.VISIBLE);
@@ -180,7 +180,7 @@ public void onRecive(Context context, Intent intent) {
break;
case DemoConstants.DOWNLOAD_STATUS_FAILED:
bannerTitleTV.setText(DemoConstants.DOWNLOAD_FAILED);
- bannerTextTV.setText(spUtil.getString(DemoConstants.PUSH_RESULT_BANNER_TEXT));
+ bannerTextTV.setText(spUtil.getString(getContext(), DemoConstants.PUSH_RESULT_BANNER_TEXT));
//display as no data
detailListView.setVisibility(View.GONE);
nodataLayout.setVisibility(View.VISIBLE);
diff --git a/demo/src/main/java/com/pax/android/demoapp/SPUtil.java b/demo/src/main/java/com/pax/android/demoapp/SPUtil.java
index 0cdd21f..a9c6059 100644
--- a/demo/src/main/java/com/pax/android/demoapp/SPUtil.java
+++ b/demo/src/main/java/com/pax/android/demoapp/SPUtil.java
@@ -1,7 +1,10 @@
package com.pax.android.demoapp;
+import android.content.Context;
+
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
+import com.pax.market.android.app.sdk.util.PreferencesUtils;
import java.util.ArrayList;
import java.util.List;
@@ -10,12 +13,12 @@
public class SPUtil {
- public void setString(String tag, String value) {
- BaseApplication.appPreferences.put(tag, value);
+ public void setString(Context context, String tag, String value) {
+ PreferencesUtils.putString(context, tag, value);
}
- public String getString(String tag) {
- String value = BaseApplication.appPreferences.getString(tag,null);
+ public String getString(Context context, String tag) {
+ String value = PreferencesUtils.getString(context, tag,null);
return value;
}
@@ -25,13 +28,13 @@ public String getString(String tag) {
* @param tag
* @param datalist
*/
- public void setDataList(String tag, List datalist) {
+ public void setDataList(Context context, String tag, List datalist) {
if (null == datalist || datalist.size() <= 0)
return;
Gson gson = new Gson();
//转换成json数据，再保存
String strJson = gson.toJson(datalist);
- BaseApplication.appPreferences.put(tag, strJson);
+ PreferencesUtils.putString(context, tag, strJson);
}
@@ -40,9 +43,9 @@ public void setDataList(String tag, List datalist) {
* @param tag
* @return
*/
- public List getDataList(String tag) {
+ public List getDataList(Context context, String tag) {
List datalist=new ArrayList();
- String strJson = BaseApplication.appPreferences.getString(tag, null);
+ String strJson = PreferencesUtils.getString(context, tag, null);
if (null == strJson) {
return datalist;
}
diff --git a/gradle.properties b/gradle.properties
index da36ce5..07648d2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,5 @@ org.gradle.jvmargs=-Xmx1024m
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
-version=9.4.1
\ No newline at end of file
+version=9.5.0
+
diff --git a/sdk/build.gradle b/sdk/build.gradle
index 34de145..7314500 100644
--- a/sdk/build.gradle
+++ b/sdk/build.gradle
@@ -46,7 +46,7 @@ dependencies {
api 'com.whatspos.sdk:paxstore-3rd-app-java-sdk:9.4.1'
- api 'com.whatspos.sdk:paxstore-3rd-app-android-cloud-msg-sdk:9.2.0'
+ api 'com.whatspos.sdk:paxstore-3rd-app-android-cloud-msg-sdk:9.5.0'
diff --git a/sdk/src/main/AndroidManifest.xml b/sdk/src/main/AndroidManifest.xml
index 0ea7850..dd13271 100644
--- a/sdk/src/main/AndroidManifest.xml
+++ b/sdk/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
package="com.pax.market.android.app.sdk">
+
@@ -18,8 +19,7 @@
-
+