Merge pull request #55 from PAXSTORE/develop

ReleaseV8.7.0
PAXSTORE · Jan 6, 2023 · 4972b9b · 4972b9b
2 parents b58c07c + 3e7cce1
commit 4972b9b
Show file tree

Hide file tree

Showing 40 changed files with 475 additions and 1,224 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ Gradle:
  Add the dependency
 
 ```
-    implementation 'com.whatspos.sdk:paxstore-3rd-app-android-sdk:8.4.0'
+    implementation 'com.whatspos.sdk:paxstore-3rd-app-android-sdk:8.7.0'
 ```
 
 ##### Tips: For apps that are not used in PAX terminals, you need to make sure you are using PAXSTORE client version at least V8.4.0. Otherwise you should use [V8.2.3](https://github.com/PAXSTORE/paxstore-3rd-app-android-sdk/tree/v8.2.3)
@@ -70,7 +70,7 @@ Initializing AppKey,AppSecret and SN
 >Please note, make sure you have put your own app's AppKey and AppSecret correctly
 
     public class BaseApplication extends Application {
-
+    
         private static final String TAG = BaseApplication.class.getSimpleName();
         
         //todo make sure to replace with your own app's appKey and appSecret
@@ -80,10 +80,10 @@ Initializing AppKey,AppSecret and SN
         @Override
         public void onCreate() {
             super.onCreate();
-            initPaxStoreSdk();
+            initStoreSdk();
         }
         
-        private void initPaxStoreSdk() {
+        private void initStoreSdk() {
            //todo Init AppKey，AppSecret, make sure the appKey and appSecret is corret.
             StoreSdk.getInstance().init(getApplicationContext(), appkey, appSecret, new BaseApiService.Callback() {
                 @Override
@@ -94,7 +94,7 @@ Initializing AppKey,AppSecret and SN
                 @Override
                 public void initFailed(RemoteException e) {
                    //TODO Do failed logic here
-                    Toast.makeText(getApplicationContext(), "Cannot get API URL from PAXSTORE, Please install PAXSTORE first.", Toast.LENGTH_LONG).show();
+                    Toast.makeText(getApplicationContext(), "Cannot get API URL from STORE client, Please install STORE client first.", Toast.LENGTH_LONG).show();
                 }
             });
         }
@@ -106,13 +106,13 @@ Initializing AppKey,AppSecret and SN
 
 #### [ParamApi](docs/ParamApi.md)
 
-#### [SyncApi](docs/SyncApi.md)
+#### [SyncApiStrategy](docs/SyncApiStrategy.md)
 
 #### [UpdateApi](docs/UpdateApi.md)
 
 #### [ResultCode](docs/ResultCode.md)
 
-#### [SyncMsgTagApi](docs/SyncMsgTagApi.md)
+#### [CloudMessageApi](docs/CloudMessageApi.md)
 
 
 ## Migrating to Android 8.0

diff --git a/build.gradle b/build.gradle
@@ -16,6 +16,10 @@ buildscript {
     }
 }
 
+configurations.all {
+    // check for updates every build
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
 allprojects {
     repositories {
         google()

diff --git a/demo/build.gradle b/demo/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.pax.android.demoapp"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 300
-        versionName "8.4.0"
+        versionCode 700
+        versionName "8.7.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
@@ -36,26 +36,30 @@ android {
     }
 
 }
-
+configurations.all {
+    // check for updates every build
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
 
 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.8.5'
 
-    implementation 'com.whatspos.sdk:paxstore-3rd-app-android-sdk:8.4.0'
+//    implementation 'com.whatspos.sdk:paxstore-3rd-app-android-sdk:8.7.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'
 
-//    implementation project(':sdk')
-//    implementation 'commons-io:commons-io:2.7'
-//    implementation 'org.slf4j:slf4j-api:1.7.12'
-//    implementation 'org.dom4j:dom4j:2.1.3'
-//    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
-//    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
+    implementation project(':sdk')
+    implementation 'org.slf4j:slf4j-api:1.7.12'
+    implementation 'org.dom4j:dom4j:2.1.3'
+    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
 
 }
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
@@ -9,14 +9,16 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
+    <uses-permission android:name="com.market.android.app.API_LOCATION" />
+    <uses-permission android:name="com.market.android.app.API_MERCHANT_INFO" />
+
     <application
         android:name=".BaseApplication"
         android:allowBackup="true"
         android:icon="@mipmap/logo_demo"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".GenerateDataActivity" />
         <activity android:name=".LauncherActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />