Skip to content

Commit 3e4ad1c

Browse files
can-mikican-miki
committed
1.5.1
1 parent d1fcf31 commit 3e4ad1c

File tree

10 files changed

+98
-39
lines changed

10 files changed

+98
-39
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# StarMgsIO Android SDK Ver 1.5.0
1+
# StarMgsIO Android SDK Ver 1.5.1
22
## Overview
33
This package contains StarMgsIO SDK.
44
starmgsio.jar is a library for supporting application development for Star scales. Please refer to [StarMgsIO Android SDK document](https://www.star-m.jp/products/s_print/sdk/starmgsio_sdk/manual/android/en/index.html) for detail of usage.
@@ -12,7 +12,7 @@ Supported models:
1212
- MG-S8200
1313
- MG-S322 USCA
1414
- MG-S1501 USCA
15-
- MG-S8200 USCA<br><br>
15+
- MG-S8200 CA<br><br>
1616
- MG-T Scale
1717
- MG-T12
1818
- MG-T30
@@ -22,8 +22,8 @@ Supported models:
2222
- MG-T60 UDB
2323

2424
Supported OS :<br>
25-
Android 9.0 - Android 14.0
25+
Android 9.0 - Android 15.0
2626

2727
## Copyright
28-
Copyright 2020 - 2023 Star Micronics Co., Ltd. All rights reserved.
28+
Copyright 2020 Star Micronics Co., Ltd. All rights reserved.
2929

‎Software/Distributables/starmgsio.aar

96 KB
Binary file not shown.

‎Software/Distributables/starmgsio.jar

-107 KB
Binary file not shown.

‎Software/SDK/app/build.gradle

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 33
4+
namespace 'com.starmicronics.starmgsiosdk'
5+
compileSdk 35
56
defaultConfig {
67
applicationId "com.starmicronics.starmgsiosdk"
78
minSdkVersion 23
8-
targetSdkVersion 33
9+
targetSdkVersion 35
910
versionCode 1
10-
versionName "1.5.0"
11+
versionName "1.5.1"
1112
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1213
}
1314
buildTypes {
@@ -18,11 +19,17 @@ android {
1819
}
1920
}
2021

22+
configurations.implementation {
23+
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
24+
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
25+
}
26+
2127
dependencies {
22-
implementation 'com.starmicronics:starmgsio:1.5.0'
23-
implementation 'androidx.appcompat:appcompat:1.0.2'
24-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
25-
testImplementation 'junit:junit:4.12'
26-
androidTestImplementation 'androidx.test:runner:1.2.0'
27-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
28+
implementation 'com.starmicronics:starmgsio:1.5.1'
29+
implementation 'androidx.appcompat:appcompat:1.7.0'
30+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
31+
//implementation files('libs/starmgsio.aar')
32+
testImplementation 'junit:junit:4.13.2'
33+
androidTestImplementation 'androidx.test:runner:1.6.1'
34+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
2835
}

‎Software/SDK/app/src/main/AndroidManifest.xml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,34 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.starmicronics.starmgsiosdk">
3+
xmlns:tools="http://schemas.android.com/tools">
44

5-
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
6-
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
7-
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
8-
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
5+
<uses-permission
6+
android:name="android.permission.BLUETOOTH"
7+
android:maxSdkVersion="30" />
8+
<uses-permission
9+
android:name="android.permission.BLUETOOTH_ADMIN"
10+
android:maxSdkVersion="30" />
911

12+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"
13+
android:maxSdkVersion="30" />
14+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"
15+
android:maxSdkVersion="30" />
16+
17+
<uses-permission
18+
android:name="android.permission.BLUETOOTH_SCAN"
19+
android:usesPermissionFlags="neverForLocation"
20+
tools:targetApi="31" />
21+
<uses-permission
22+
android:name="android.permission.BLUETOOTH_CONNECT"
23+
tools:targetApi="31" />
1024

1125
<!-- Declare this required feature if you want to make the app available to BLE-capable
1226
devices only. If you want to make your app available to devices that don't support BLE,
1327
you should omit this in the manifest. Instead, determine BLE capability by using
1428
PackageManager.hasSystemFeature(FEATURE_BLUETOOTH_LE) -->
15-
<!--<uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/>-->
16-
17-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
18-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
29+
<uses-feature
30+
android:name="android.hardware.bluetooth_le"
31+
android:required="true"/>
1932

2033
<application
2134
android:allowBackup="true"

‎Software/SDK/app/src/main/java/com/starmicronics/starmgsiosdk/ScaleActivity.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
import android.widget.Spinner;
99
import android.widget.TextView;
1010
import android.widget.Toast;
11+
import androidx.core.graphics.Insets;
12+
import androidx.core.view.ViewCompat;
13+
import androidx.core.view.WindowInsetsCompat;
1114

1215
import com.starmicronics.starmgsio.ConnectionInfo;
1316
import com.starmicronics.starmgsio.Scale;
@@ -37,6 +40,7 @@ public class ScaleActivity extends AppCompatActivity {
3740
@Override
3841
protected void onCreate(Bundle savedInstanceState) {
3942
super.onCreate(savedInstanceState);
43+
4044
setContentView(R.layout.activity_scale);
4145
setTitle("MG series Scale Sample");
4246

@@ -129,9 +133,19 @@ public void onClick(View v) {
129133

130134
}
131135

136+
public void setPadding(View view) {
137+
ViewCompat.setOnApplyWindowInsetsListener(view, (v, insets) -> {
138+
int insetTypes = WindowInsetsCompat.Type.displayCutout() | WindowInsetsCompat.Type.systemBars();
139+
Insets bars = insets.getInsets(insetTypes);
140+
v.setPadding(bars.left, bars.top, bars.right, bars.bottom);
141+
return WindowInsetsCompat.CONSUMED;
142+
});
143+
}
144+
132145
@Override
133146
protected void onResume() {
134147
super.onResume();
148+
setPadding(findViewById(R.id.BottomLinerLayout));
135149

136150
if(mScale == null) {
137151

‎Software/SDK/app/src/main/java/com/starmicronics/starmgsiosdk/ScanActivity.java

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.starmicronics.starmgsiosdk;
22

3+
import static android.os.Build.VERSION.SDK_INT;
4+
35
import android.Manifest;
46
import android.content.Intent;
57
import android.content.pm.PackageManager;
@@ -10,6 +12,10 @@
1012
import androidx.core.app.ActivityCompat;
1113
import androidx.core.content.ContextCompat;
1214
import androidx.appcompat.app.AppCompatActivity;
15+
import androidx.core.graphics.Insets;
16+
import androidx.core.view.ViewCompat;
17+
import androidx.core.view.WindowInsetsCompat;
18+
1319
import android.view.View;
1420
import android.widget.AdapterView;
1521
import android.widget.ListView;
@@ -40,30 +46,38 @@ public class ScanActivity extends AppCompatActivity {
4046
@Override
4147
protected void onCreate(Bundle savedInstanceState) {
4248
super.onCreate(savedInstanceState);
49+
4350
setContentView(R.layout.activity_scan);
4451
setTitle("MG series Scale Sample");
4552

46-
if (Build.VERSION_CODES.S <= Build.VERSION.SDK_INT) {
53+
if (SDK_INT <= 30) {
4754
if( (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) ||
48-
(ContextCompat.checkSelfPermission(this,Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) ||
49-
(ContextCompat.checkSelfPermission(this,Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED) ){
50-
// If you are using Android 12 and targetSdkVersion is 31 or later,
51-
// you have to request Bluetooth permission (Nearby devices permission) to use the Bluetooth printer.
52-
// https://developer.android.com/about/versions/12/features/bluetooth-permissions
53-
54-
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION,
55-
Manifest.permission.BLUETOOTH_CONNECT,
56-
Manifest.permission.BLUETOOTH_SCAN}, 0x00);
55+
(ContextCompat.checkSelfPermission(this,Manifest.permission.BLUETOOTH) != PackageManager.PERMISSION_GRANTED) ||
56+
(ContextCompat.checkSelfPermission(this,Manifest.permission.BLUETOOTH_ADMIN) != PackageManager.PERMISSION_GRANTED) ){
57+
// If you are using Android 11 and targetSdkVersion is 30 or earlier,
58+
// you have to request Bluetooth permission to use the Bluetooth printer.
59+
// https://developer.android.com/develop/connectivity/bluetooth/bt-permissions#declare-android11-or-lower
60+
61+
ActivityCompat.requestPermissions(this, new String[]{
62+
Manifest.permission.ACCESS_FINE_LOCATION,
63+
Manifest.permission.BLUETOOTH,
64+
Manifest.permission.BLUETOOTH_ADMIN}, 0x00);
5765
}
5866
}
5967
else
6068
{
61-
if(ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
62-
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 0x00);
69+
if((ContextCompat.checkSelfPermission(this,Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED) ||
70+
(ContextCompat.checkSelfPermission(this,Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) ){
71+
// If you are using Android 12 and targetSdkVersion is 31 or later,
72+
// you have to request Bluetooth permission to use the Bluetooth printer.
73+
// https://developer.android.com/develop/connectivity/bluetooth/bt-permissions#declare-android12-or-higher
74+
75+
ActivityCompat.requestPermissions(this, new String[]{
76+
Manifest.permission.BLUETOOTH_SCAN,
77+
Manifest.permission.BLUETOOTH_CONNECT}, 0x00);
6378
}
6479
}
6580

66-
6781
ListView discoveredListView = findViewById(R.id.DiscoveredListView);
6882

6983
mDataMapList = new ArrayList<>();
@@ -102,9 +116,19 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
102116
});
103117
}
104118

119+
public void setPadding(View view) {
120+
ViewCompat.setOnApplyWindowInsetsListener(view, (v, insets) -> {
121+
int insetTypes = WindowInsetsCompat.Type.displayCutout() | WindowInsetsCompat.Type.systemBars();
122+
Insets bars = insets.getInsets(insetTypes);
123+
v.setPadding(bars.left, bars.top, bars.right, bars.bottom);
124+
return WindowInsetsCompat.CONSUMED;
125+
});
126+
}
127+
105128
@Override
106129
protected void onResume() {
107130
super.onResume();
131+
setPadding(findViewById(R.id.DiscoveredListView));
108132

109133
mStarDeviceManager = new StarDeviceManager(ScanActivity.this, StarDeviceManager.InterfaceType.All);
110134

‎Software/SDK/app/src/main/res/layout/activity_scale.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
android:layout_width="match_parent"
3636
android:layout_height="wrap_content"
3737
android:layout_gravity="bottom|right"
38-
android:orientation="vertical">
38+
android:orientation="vertical"
39+
android:id="@+id/BottomLinerLayout">
3940

4041
<Button
4142
android:id="@+id/ZeroPointAdjustmentButton"

‎Software/SDK/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.4.2'
10+
classpath 'com.android.tools.build:gradle:8.5.2'
1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
1313
}

‎Software/SDK/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Nov 26 13:07:41 JST 2019
1+
#Wed Aug 14 10:15:10 JST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

0 commit comments

Comments
 (0)