From 6d2ed9913ef58fca072457759e8b1fa71fc60361 Mon Sep 17 00:00:00 2001 From: bandit-ibayashi Date: Fri, 15 Sep 2023 19:02:58 +0900 Subject: [PATCH] V2.5.0 --- Readme_En.txt | 13 +++++++++---- Readme_Jp.txt | 13 +++++++++---- Samples/.gitignore | 0 Samples/app/.gitignore | 0 Samples/app/build.gradle | 15 +++++++-------- Samples/app/proguard-rules.pro | 0 .../star_m/passprnttester/ApplicationTest.java | 0 Samples/app/src/main/AndroidManifest.xml | 5 ++++- Samples/app/src/main/assets/font_ML.html | 0 Samples/app/src/main/assets/index.html | 0 Samples/app/src/main/assets/receiptPDF.pdf | Bin .../jp/star_m/passprnttester/MainActivity.java | 2 +- .../app/src/main/res/layout/activity_main.xml | 0 .../app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../app/src/main/res/values-w820dp/dimens.xml | 0 Samples/app/src/main/res/values/colors.xml | 0 Samples/app/src/main/res/values/dimens.xml | 0 Samples/app/src/main/res/values/strings.xml | 0 Samples/app/src/main/res/values/styles.xml | 0 .../star_m/passprnttester/ExampleUnitTest.java | 0 Samples/build.gradle | 6 +++--- Samples/gradle.properties | 0 Samples/gradle/wrapper/gradle-wrapper.jar | Bin Samples/gradle/wrapper/gradle-wrapper.properties | 6 +++--- Samples/gradlew | 0 Samples/gradlew.bat | 0 Samples/settings.gradle | 0 SoftwareLicenseAgreement.pdf | Bin SoftwareLicenseAgreement_Jp.pdf | Bin UsersManual_Android.url | 0 34 files changed, 36 insertions(+), 24 deletions(-) mode change 100644 => 100755 Readme_En.txt mode change 100644 => 100755 Readme_Jp.txt mode change 100644 => 100755 Samples/.gitignore mode change 100644 => 100755 Samples/app/.gitignore mode change 100644 => 100755 Samples/app/build.gradle mode change 100644 => 100755 Samples/app/proguard-rules.pro mode change 100644 => 100755 Samples/app/src/androidTest/java/jp/star_m/passprnttester/ApplicationTest.java mode change 100644 => 100755 Samples/app/src/main/AndroidManifest.xml mode change 100644 => 100755 Samples/app/src/main/assets/font_ML.html mode change 100644 => 100755 Samples/app/src/main/assets/index.html mode change 100644 => 100755 Samples/app/src/main/assets/receiptPDF.pdf mode change 100644 => 100755 Samples/app/src/main/java/jp/star_m/passprnttester/MainActivity.java mode change 100644 => 100755 Samples/app/src/main/res/layout/activity_main.xml mode change 100644 => 100755 Samples/app/src/main/res/mipmap-hdpi/ic_launcher.png mode change 100644 => 100755 Samples/app/src/main/res/mipmap-mdpi/ic_launcher.png mode change 100644 => 100755 Samples/app/src/main/res/mipmap-xhdpi/ic_launcher.png mode change 100644 => 100755 Samples/app/src/main/res/mipmap-xxhdpi/ic_launcher.png mode change 100644 => 100755 Samples/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png mode change 100644 => 100755 Samples/app/src/main/res/values-w820dp/dimens.xml mode change 100644 => 100755 Samples/app/src/main/res/values/colors.xml mode change 100644 => 100755 Samples/app/src/main/res/values/dimens.xml mode change 100644 => 100755 Samples/app/src/main/res/values/strings.xml mode change 100644 => 100755 Samples/app/src/main/res/values/styles.xml mode change 100644 => 100755 Samples/app/src/test/java/jp/star_m/passprnttester/ExampleUnitTest.java mode change 100644 => 100755 Samples/build.gradle mode change 100644 => 100755 Samples/gradle.properties mode change 100644 => 100755 Samples/gradle/wrapper/gradle-wrapper.jar mode change 100644 => 100755 Samples/gradle/wrapper/gradle-wrapper.properties mode change 100644 => 100755 Samples/gradlew mode change 100644 => 100755 Samples/gradlew.bat mode change 100644 => 100755 Samples/settings.gradle mode change 100644 => 100755 SoftwareLicenseAgreement.pdf mode change 100644 => 100755 SoftwareLicenseAgreement_Jp.pdf mode change 100644 => 100755 UsersManual_Android.url diff --git a/Readme_En.txt b/Readme_En.txt old mode 100644 new mode 100755 index 7053833..5a13899 --- a/Readme_En.txt +++ b/Readme_En.txt @@ -1,5 +1,5 @@ ************************************************************ - Star PassPRNT Android SDK Ver 2.4.0 + Star PassPRNT Android SDK Ver 2.5.0 Readme_En.txt Star Micronics Co., Ltd. ************************************************************ @@ -37,7 +37,7 @@ 2. Contents ============= - PassPRNT_Android_SDK_Ver2.4.0 + PassPRNT_Android_SDK_Ver2.5.0 | | Readme_En.txt // Release Note(English) | Readme_Jp.txt // Release Note(Japanese) @@ -52,10 +52,10 @@ ================= [OS] - Android OS 7.0 - 13 + Android OS 9.0 - 13 [Software] - PassPRNT Ver 2.7.0 + PassPRNT Ver 2.8.0 [Printer Model] Please refer to Users Manual. @@ -70,6 +70,11 @@ 5. Release History ==================== + Ver 2.5.0 + 2023/09/07 : Added `2w6` and `2w7` to `size` query. + Updated target OS and target software. + Change `launchMode` to `singleTask`. + Ver 2.4.0 2023/04/10 : Added `gap` query. Added `1` and `2w5` to `size` query. diff --git a/Readme_Jp.txt b/Readme_Jp.txt old mode 100644 new mode 100755 index 04ef9ca..b77122b --- a/Readme_Jp.txt +++ b/Readme_Jp.txt @@ -1,5 +1,5 @@ ************************************************************ - Star PassPRNT Android SDK Ver 2.4.0 + Star PassPRNT Android SDK Ver 2.5.0 Readme_Jp.txt スター精密（株） ************************************************************ @@ -36,7 +36,7 @@ 2. 内容 ========== - PassPRNT_Android_SDK_Ver2.4.0 + PassPRNT_Android_SDK_Ver2.5.0 | | Readme_En.txt // リリースノート(英語) | Readme_Jp.txt // リリースノート(日本語) @@ -51,10 +51,10 @@ ============= ■ 対象OS - Android OS 7.0 - 13 + Android OS 9.0 - 13 ■ 対象ソフトウェア - PassPRNT Ver 2.7.0 + PassPRNT Ver 2.8.0 ■ 対象プリンタモデル Users Manualをご参照ください。 @@ -69,6 +69,11 @@ 5. Star PassPRNT Android SDK 更新履歴 ====================================== + Ver 2.5.0 + 2023/09/07 : `size`クエリに`2w6`と`2w7`を追加 + 対象OS、対象ソフトウェアを更新 + `launchMode`を`singleTask`に変更 + Ver 2.4.0 2023/04/10 : `gap`クエリを追加 `size`クエリに`1`と`2w5`を追加 diff --git a/Samples/.gitignore b/Samples/.gitignore old mode 100644 new mode 100755 diff --git a/Samples/app/.gitignore b/Samples/app/.gitignore old mode 100644 new mode 100755 diff --git a/Samples/app/build.gradle b/Samples/app/build.gradle old mode 100644 new mode 100755 index d2b9f08..3eb8e3d --- a/Samples/app/build.gradle +++ b/Samples/app/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 - buildToolsVersion '29.0.1' + compileSdkVersion 33 defaultConfig { applicationId "jp.star_m.passprnttester" - minSdkVersion 21 - targetSdkVersion 29 - versionCode 6 - versionName "2.4.0" + minSdkVersion 28 + targetSdkVersion 33 + versionCode 7 + versionName "2.5.0" } buildTypes { release { @@ -21,6 +20,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - testImplementation 'junit:junit:4.12' - implementation 'androidx.appcompat:appcompat:1.1.0' + testImplementation 'junit:junit:4.13.2' + implementation 'androidx.appcompat:appcompat:1.6.1' } diff --git a/Samples/app/proguard-rules.pro b/Samples/app/proguard-rules.pro old mode 100644 new mode 100755 diff --git a/Samples/app/src/androidTest/java/jp/star_m/passprnttester/ApplicationTest.java b/Samples/app/src/androidTest/java/jp/star_m/passprnttester/ApplicationTest.java old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/AndroidManifest.xml b/Samples/app/src/main/AndroidManifest.xml old mode 100644 new mode 100755 index 144664c..b35bb27 --- a/Samples/app/src/main/AndroidManifest.xml +++ b/Samples/app/src/main/AndroidManifest.xml @@ -8,7 +8,10 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/Samples/app/src/main/assets/font_ML.html b/Samples/app/src/main/assets/font_ML.html old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/assets/index.html b/Samples/app/src/main/assets/index.html old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/assets/receiptPDF.pdf b/Samples/app/src/main/assets/receiptPDF.pdf old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/java/jp/star_m/passprnttester/MainActivity.java b/Samples/app/src/main/java/jp/star_m/passprnttester/MainActivity.java old mode 100644 new mode 100755 index 5b928df..7e9d565 --- a/Samples/app/src/main/java/jp/star_m/passprnttester/MainActivity.java +++ b/Samples/app/src/main/java/jp/star_m/passprnttester/MainActivity.java @@ -238,7 +238,7 @@ public void onClick(DialogInterface dialog, int which) { break; case 3: //Width // Configured for printing area - final String[] widthIndexList = {"none", "1", "2", "2w1", "2w2", "2w3", "2w4", "2w5", "3", "3w", "3w2", "4"}; + final String[] widthIndexList = {"none", "1", "2", "2w1", "2w2", "2w3", "2w4", "2w5", "2w6", "2w7", "3", "3w", "3w2", "4"}; for (int i = 0; i < widthIndexList.length; i++) { if (widthIndexList[i].equalsIgnoreCase(m_width)) { diff --git a/Samples/app/src/main/res/layout/activity_main.xml b/Samples/app/src/main/res/layout/activity_main.xml old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Samples/app/src/main/res/mipmap-hdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Samples/app/src/main/res/mipmap-mdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Samples/app/src/main/res/mipmap-xhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Samples/app/src/main/res/mipmap-xxhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Samples/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/res/values-w820dp/dimens.xml b/Samples/app/src/main/res/values-w820dp/dimens.xml old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/res/values/colors.xml b/Samples/app/src/main/res/values/colors.xml old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/res/values/dimens.xml b/Samples/app/src/main/res/values/dimens.xml old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/res/values/strings.xml b/Samples/app/src/main/res/values/strings.xml old mode 100644 new mode 100755 diff --git a/Samples/app/src/main/res/values/styles.xml b/Samples/app/src/main/res/values/styles.xml old mode 100644 new mode 100755 diff --git a/Samples/app/src/test/java/jp/star_m/passprnttester/ExampleUnitTest.java b/Samples/app/src/test/java/jp/star_m/passprnttester/ExampleUnitTest.java old mode 100644 new mode 100755 diff --git a/Samples/build.gradle b/Samples/build.gradle old mode 100644 new mode 100755 index ec08ad5..db3c09c --- a/Samples/build.gradle +++ b/Samples/build.gradle @@ -2,11 +2,11 @@ buildscript { repositories { - jcenter() + mavenCentral() google() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:7.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,7 +15,7 @@ buildscript { allprojects { repositories { - jcenter() + mavenCentral() google() } } diff --git a/Samples/gradle.properties b/Samples/gradle.properties old mode 100644 new mode 100755 diff --git a/Samples/gradle/wrapper/gradle-wrapper.jar b/Samples/gradle/wrapper/gradle-wrapper.jar old mode 100644 new mode 100755 diff --git a/Samples/gradle/wrapper/gradle-wrapper.properties b/Samples/gradle/wrapper/gradle-wrapper.properties old mode 100644 new mode 100755 index d68aa21..aaf0220 --- a/Samples/gradle/wrapper/gradle-wrapper.properties +++ b/Samples/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jun 10 13:39:06 JST 2021 +#Thu Jul 13 19:00:44 JST 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/Samples/gradlew b/Samples/gradlew old mode 100644 new mode 100755 diff --git a/Samples/gradlew.bat b/Samples/gradlew.bat old mode 100644 new mode 100755 diff --git a/Samples/settings.gradle b/Samples/settings.gradle old mode 100644 new mode 100755 diff --git a/SoftwareLicenseAgreement.pdf b/SoftwareLicenseAgreement.pdf old mode 100644 new mode 100755 diff --git a/SoftwareLicenseAgreement_Jp.pdf b/SoftwareLicenseAgreement_Jp.pdf old mode 100644 new mode 100755 diff --git a/UsersManual_Android.url b/UsersManual_Android.url old mode 100644 new mode 100755