Skip to content

Commit fd429f8

Browse files
zebradcszebradcs
committed
v2.5.8.0 release.
1 parent 7c27f50 commit fd429f8

File tree

90 files changed

+2839
-815
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+2839
-815
lines changed

‎android_scanner_sdk_demo_app/BarcodeScannerLibrary/barcode_scanner_library_v2.4.6.0.aar‎

-388 KB
Binary file not shown.

‎android_scanner_sdk_demo_app/build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.1.3'
12+
classpath 'com.android.tools.build:gradle:3.4.2'
1313
}
1414

1515
allprojects {
@@ -19,6 +19,8 @@ buildscript {
1919
maven { url "https://jitpack.io" }
2020
}
2121
}
22+
23+
2224
}
2325

2426

‎android_scanner_sdk_demo_app/gradle.properties‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Project-wide Gradle settings.
2+
3+
# IDE (e.g. Android Studio) users:
4+
# Settings specified in this file will override any Gradle settings
5+
# configured through the IDE.
6+
7+
# For more details on how to configure your build environment visit
8+
# http://www.gradle.org/docs/current/userguide/build_environment.html
9+
10+
# Specifies the JVM arguments used for the daemon process.
11+
# The setting is particularly useful for tweaking memory settings.
12+
# Default value: -Xmx10248m -XX:MaxPermSize=256m
13+
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14+
15+
# When configured, Gradle will run in incubating parallel mode.
16+
# This option should only be used with decoupled projects. More details, visit
17+
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18+
# org.gradle.parallel=true
19+
#systemProp.http.proxyHost=wwwgate0.mot.com
20+
#systemProp.http.proxyPort=1080
21+
android.enableD8=true
22+
android.enableJetifier=true
23+
android.useAndroidX=true

‎android_scanner_sdk_demo_app/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

‎android_scanner_sdk_demo_app/scannercontrol/build.gradle‎

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

33
android {
4-
compileSdkVersion 28
4+
compileSdkVersion 29
55
defaultConfig {
66
applicationId "com.zebra.scannercontrol.app"
77
minSdkVersion 19
8-
targetSdkVersion 28
9-
versionCode 119
10-
versionName "2.4.6.0"
8+
targetSdkVersion 29
9+
versionCode 132
10+
versionName "2.5.8.0"
1111
if (project.hasProperty('ADD_BUILD_TO_VERSION')) {
1212
versionName = versionName.substring(0,versionName.lastIndexOf(".") + 1) + (System.getenv("BUILD_NUMBER") ?: "0")
1313
}
@@ -50,9 +50,9 @@ repositories {
5050
dependencies {
5151
implementation fileTree(dir: 'libs', include: ['*.jar'])
5252
implementation project(':BarcodeScannerLibrary')
53-
implementation 'com.android.support:appcompat-v7:28.0.0-alpha3'
54-
implementation 'com.android.support:design:28.0.0-alpha3'
55-
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
56-
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.2'
53+
implementation 'androidx.appcompat:appcompat:1.0.0'
54+
implementation 'com.google.android.material:material:1.0.0'
55+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
56+
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
5757
implementation 'com.github.chrisbanes:PhotoView:2.0.0'
5858
}

‎android_scanner_sdk_demo_app/scannercontrol/src/main/AndroidManifest.xml‎

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
<uses-permission android:name="android.permission.BLUETOOTH" />
66
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
77
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
8-
8+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
99
<application
1010
android:name=".application.Application"
1111
android:allowBackup="true"
1212
android:icon="@mipmap/app_icon"
1313
android:label="@string/app_name"
1414
android:supportsRtl="true"
1515
android:theme="@style/AppTheme"
16-
android:fullBackupContent="@xml/backup_descriptor">
16+
android:fullBackupContent="@xml/backup_descriptor"
17+
android:requestLegacyExternalStorage="true"> <!--Allows Android v10 to use legacy storage -->
1718
<activity
1819
android:name=".activities.HomeActivity"
1920
android:configChanges="orientation|screenSize"
@@ -92,7 +93,7 @@
9293
<activity
9394
android:name=".activities.BeeperActionsActivity"
9495
android:configChanges="orientation|screenSize"
95-
android:label="@string/title_activity_beeper_actions"
96+
android:label="@string/title_activity_active_scanner"
9697
android:parentActivityName=".activities.ActiveScannerActivity"
9798
android:theme="@style/AppTheme.NoActionBar">
9899
<meta-data
@@ -102,7 +103,7 @@
102103
<activity
103104
android:name=".activities.AssertActivity"
104105
android:configChanges="orientation|screenSize"
105-
android:label="@string/title_activity_assert"
106+
android:label="@string/title_activity_active_scanner"
106107
android:parentActivityName=".activities.ActiveScannerActivity"
107108
android:theme="@style/AppTheme.NoActionBar">
108109
<meta-data
@@ -112,7 +113,7 @@
112113
<activity
113114
android:name=".activities.LEDActivity"
114115
android:configChanges="orientation|screenSize"
115-
android:label="@string/title_activity_led"
116+
android:label="@string/title_activity_active_scanner"
116117
android:parentActivityName=".activities.ActiveScannerActivity"
117118
android:theme="@style/AppTheme.NoActionBar">
118119
<meta-data
@@ -122,7 +123,7 @@
122123
<activity
123124
android:name=".activities.SymbologiesActivity"
124125
android:configChanges="orientation|screenSize"
125-
android:label="@string/title_activity_symbologies"
126+
android:label="@string/title_activity_active_scanner"
126127
android:parentActivityName=".activities.ActiveScannerActivity"
127128
android:theme="@style/AppTheme.NoActionBar">
128129
<meta-data
@@ -132,7 +133,7 @@
132133
<activity
133134
android:name=".activities.BeeperSettingsActivity"
134135
android:configChanges="orientation|screenSize"
135-
android:label="@string/title_activity_beeper_settings"
136+
android:label="@string/title_activity_active_scanner"
136137
android:parentActivityName=".activities.ActiveScannerActivity">
137138
<meta-data
138139
android:name="android.support.PARENT_ACTIVITY"
@@ -150,7 +151,7 @@
150151
<activity
151152
android:name=".activities.VibrationFeedback"
152153
android:configChanges="orientation|screenSize"
153-
android:label="@string/title_activity_vibration_feedback"
154+
android:label="@string/title_activity_active_scanner"
154155
android:parentActivityName=".activities.ActiveScannerActivity"
155156
android:theme="@style/AppTheme.NoActionBar">
156157
<meta-data
@@ -160,7 +161,7 @@
160161
<activity
161162
android:name=".activities.BatteryStatistics"
162163
android:configChanges="orientation|screenSize"
163-
android:label="@string/title_activity_battery_statistics"
164+
android:label="@string/title_activity_active_scanner"
164165
android:parentActivityName=".activities.ActiveScannerActivity"
165166
android:theme="@style/AppTheme.NoActionBar">
166167
<meta-data
@@ -170,7 +171,7 @@
170171
<activity
171172
android:name=".activities.UpdateFirmware"
172173
android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
173-
android:label="@string/title_activity_update_firmware"
174+
android:label="@string/title_activity_active_scanner"
174175
android:parentActivityName=".activities.ActiveScannerActivity"
175176
android:theme="@style/AppTheme.NoActionBar">
176177
<meta-data
@@ -216,7 +217,7 @@
216217
<activity
217218
android:name=".activities.SampleBarcodes"
218219
android:configChanges="orientation|screenSize"
219-
android:label="@string/title_activity_sample_barcodes"
220+
android:label="@string/title_activity_active_scanner"
220221
android:parentActivityName=".activities.ActiveScannerActivity"
221222
android:theme="@style/AppTheme.NoActionBar">
222223
<meta-data
@@ -226,7 +227,7 @@
226227
<activity android:name=".activities.SsaSetSymbologyActivity"
227228
android:noHistory="true"
228229
android:configChanges="orientation|screenSize"
229-
android:label="@string/title_activity_scan_speed_analytics"
230+
android:label="@string/title_activity_active_scanner"
230231
android:parentActivityName=".activities.ActiveScannerActivity"
231232
android:theme="@style/AppTheme.NoActionBar" >
232233
<meta-data
@@ -236,7 +237,27 @@
236237
<activity
237238
android:name=".activities.ScanSpeedAnalyticsActivity"
238239
android:configChanges="orientation|screenSize"
239-
android:label="@string/title_activity_scan_speed_analytics"
240+
android:label="@string/title_activity_active_scanner"
241+
android:parentActivityName=".activities.ActiveScannerActivity"
242+
android:theme="@style/AppTheme.NoActionBar">
243+
<meta-data
244+
android:name="android.support.PARENT_ACTIVITY"
245+
android:value="com.zebra.scannercontrol.app.activities.ActiveScannerActivity" />
246+
</activity>
247+
<activity
248+
android:name=".activities.ImageActivity"
249+
android:configChanges="orientation|screenSize"
250+
android:label="@string/title_activity_active_scanner"
251+
android:parentActivityName=".activities.ActiveScannerActivity"
252+
android:theme="@style/AppTheme.NoActionBar">
253+
<meta-data
254+
android:name="android.support.PARENT_ACTIVITY"
255+
android:value="com.zebra.scannercontrol.app.activities.ActiveScannerActivity" />
256+
</activity>
257+
<activity
258+
android:name=".activities.IntelligentImageCaptureActivity"
259+
android:configChanges="orientation|screenSize"
260+
android:label="@string/title_activity_active_scanner"
240261
android:parentActivityName=".activities.ActiveScannerActivity"
241262
android:theme="@style/AppTheme.NoActionBar">
242263
<meta-data
@@ -246,7 +267,7 @@
246267
<activity
247268
android:name=".activities.ScaleActivity"
248269
android:configChanges="orientation|screenSize"
249-
android:label="Scale"
270+
android:label="@string/title_activity_active_scanner"
250271
android:parentActivityName=".activities.ActiveScannerActivity"
251272
android:theme="@style/AppTheme.NoActionBar">
252273
<meta-data

‎android_scanner_sdk_demo_app/scannercontrol/src/main/java/com/zebra/scannercontrol/app/activities/AboutActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.content.pm.PackageManager;
77
import android.content.res.Configuration;
88
import android.os.Bundle;
9-
import android.support.v7.app.AppCompatActivity;
9+
import androidx.appcompat.app.AppCompatActivity;
1010
import android.view.Menu;
1111
import android.view.MenuItem;
1212
import android.widget.TextView;
@@ -42,7 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
4242
version = pInfo.versionName;
4343
((TextView) findViewById(R.id.about)).setText(getResources().getString(R.string.app_name)+" Application v"+version+"\n\n"+
4444
"SDK version "+ Application.sdkHandler.dcssdkGetVersion()+"\n\n"
45-
+"\u00a9 2015 ZIH Corp and/or its affiliates. All rights reserved. Zebra and the stylized Zebra head are trademarks of ZIH Corp., registered in many jurisdictions worldwide. All other trademarks are the property of their respective owners.");
45+
+"\u00a9 2019 Zebra Technologies Corp. and/or its affiliates. All rights reserved.");
4646
}
4747
}
4848

‎android_scanner_sdk_demo_app/scannercontrol/src/main/java/com/zebra/scannercontrol/app/activities/ActiveScannerActivity.java‎

Lines changed: 57 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
import android.content.res.Configuration;
1111
import android.os.AsyncTask;
1212
import android.os.Bundle;
13-
import android.support.annotation.NonNull;
14-
import android.support.design.widget.NavigationView;
15-
import android.support.design.widget.TabLayout;
16-
import android.support.v4.app.FragmentTransaction;
17-
import android.support.v4.view.GravityCompat;
18-
import android.support.v4.view.ViewPager;
19-
import android.support.v4.widget.DrawerLayout;
20-
import android.support.v7.app.ActionBar;
21-
import android.support.v7.app.ActionBarDrawerToggle;
22-
import android.support.v7.widget.Toolbar;
13+
import androidx.annotation.NonNull;
14+
import com.google.android.material.navigation.NavigationView;
15+
import com.google.android.material.tabs.TabLayout;
16+
import androidx.fragment.app.FragmentTransaction;
17+
import androidx.core.view.GravityCompat;
18+
import androidx.viewpager.widget.ViewPager;
19+
import androidx.drawerlayout.widget.DrawerLayout;
20+
import androidx.appcompat.app.ActionBar;
21+
import androidx.appcompat.app.ActionBarDrawerToggle;
22+
import androidx.appcompat.widget.Toolbar;
2323
import android.util.Log;
2424
import android.util.Xml;
2525
import android.view.Menu;
@@ -178,9 +178,9 @@ protected void onCreate(Bundle savedInstanceState) {
178178

179179
pagerMotorAvailable = getIntent().getBooleanExtra(Constants.PAGER_MOTOR_STATUS,false);
180180

181-
Application.CurScannerId = scannerID;
182-
Application.CurScannerName = scannerName;
183-
Application.CurScannerAddress = address;
181+
Application.currentScannerId = scannerID;
182+
Application.currentScannerName = scannerName;
183+
Application.currentScannerAddress = address;
184184
// Initilization
185185
viewPager = (ViewPager) findViewById(R.id.activeScannerPager);
186186

@@ -616,7 +616,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
616616
if (id == R.id.nav_pair_device) {
617617
disconnect(scannerID);
618618
Application.barcodeData.clear();
619-
Application.CurScannerId = Application.SCANNER_ID_NONE;
619+
Application.currentScannerId = Application.SCANNER_ID_NONE;
620620
finish();
621621
intent = new Intent(ActiveScannerActivity.this, HomeActivity.class);
622622
startActivity(intent);
@@ -635,7 +635,7 @@ public void onClick(DialogInterface dialog, int arg) {
635635

636636
disconnect(scannerID);
637637
Application.barcodeData.clear();
638-
Application.CurScannerId = Application.SCANNER_ID_NONE;
638+
Application.currentScannerId = Application.SCANNER_ID_NONE;
639639
finish();
640640
Intent intent = new Intent(ActiveScannerActivity.this, FindCabledScanner.class);
641641
startActivity(intent);
@@ -679,6 +679,48 @@ public void loadUpdateFirmware(View view) {
679679
startActivity(intent);
680680
}
681681

682+
public void ImageVideo(View view) {
683+
if(scannerType != 2)
684+
{
685+
String message = "Video feature not supported in bluetooth scanners.";
686+
alertShow(message,false);
687+
}
688+
else
689+
{
690+
loadImageVideo();
691+
}
692+
}
693+
694+
private void alertShow(String message, boolean error) {
695+
696+
if (error) {
697+
} else {
698+
AlertDialog.Builder dialog = new AlertDialog.Builder(ActiveScannerActivity.this);
699+
dialog.setTitle("Video not supported")
700+
.setMessage(message)
701+
.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
702+
public void onClick(DialogInterface dialoginterface, int i) {
703+
loadImageVideo();
704+
}
705+
}).show();
706+
}
707+
}
708+
709+
private void loadImageVideo()
710+
{
711+
Intent intent = new Intent(this, ImageActivity.class);
712+
intent.putExtra(Constants.SCANNER_ID, scannerID);
713+
intent.putExtra(Constants.SCANNER_NAME, getIntent().getStringExtra(Constants.SCANNER_NAME));
714+
intent.putExtra(Constants.SCANNER_TYPE, scannerType);
715+
startActivity(intent);
716+
}
717+
718+
public void loadIdc(View view) {
719+
Intent intent = new Intent(this, IntelligentImageCaptureActivity.class);
720+
intent.putExtra(Constants.SCANNER_ID, scannerID);
721+
intent.putExtra(Constants.SCANNER_NAME, getIntent().getStringExtra(Constants.SCANNER_NAME));
722+
startActivity(intent);
723+
}
682724
public void loadBatteryStatistics(View view) {
683725
String in_xml = "<inArgs><scannerID>" + scannerID + "</scannerID></inArgs>";
684726
new AsyncTaskBatteryAvailable(scannerID,DCSSDKDefs.DCSSDK_COMMAND_OPCODE.DCSSDK_RSM_ATTR_GETALL,this,BatteryStatistics.class).execute(new String[]{in_xml});

‎android_scanner_sdk_demo_app/scannercontrol/src/main/java/com/zebra/scannercontrol/app/activities/AssertActivity.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import android.content.pm.ActivityInfo;
77
import android.content.res.Configuration;
88
import android.os.Bundle;
9-
import android.support.annotation.NonNull;
10-
import android.support.design.widget.NavigationView;
11-
import android.support.v4.view.GravityCompat;
12-
import android.support.v4.widget.DrawerLayout;
13-
import android.support.v7.app.ActionBar;
14-
import android.support.v7.app.ActionBarDrawerToggle;
15-
import android.support.v7.widget.Toolbar;
9+
import androidx.annotation.NonNull;
10+
import com.google.android.material.navigation.NavigationView;
11+
import androidx.core.view.GravityCompat;
12+
import androidx.drawerlayout.widget.DrawerLayout;
13+
import androidx.appcompat.app.ActionBar;
14+
import androidx.appcompat.app.ActionBarDrawerToggle;
15+
import androidx.appcompat.widget.Toolbar;
1616
import android.util.Log;
1717
import android.util.Xml;
1818
import android.view.Menu;
@@ -74,7 +74,7 @@ protected void onCreate(Bundle savedInstanceState) {
7474
if(actionBar!=null){
7575
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
7676
getSupportActionBar().setDisplayShowHomeEnabled(true);
77-
getSupportActionBar().setTitle("Active Scanner");
77+
getSupportActionBar().setTitle("Asset Information");
7878
}
7979

8080
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -137,7 +137,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
137137
if (id == R.id.nav_pair_device) {
138138
disconnect(scannerID);
139139
Application.barcodeData.clear();
140-
Application.CurScannerId = Application.SCANNER_ID_NONE;
140+
Application.currentScannerId = Application.SCANNER_ID_NONE;
141141
finish();
142142
intent = new Intent(AssertActivity.this, HomeActivity.class);
143143
startActivity(intent);
@@ -155,7 +155,7 @@ public void onClick(DialogInterface dialog, int arg) {
155155

156156
disconnect(scannerID);
157157
Application.barcodeData.clear();
158-
Application.CurScannerId = Application.SCANNER_ID_NONE;
158+
Application.currentScannerId = Application.SCANNER_ID_NONE;
159159
finish();
160160
Intent intent = new Intent(AssertActivity.this, FindCabledScanner.class);
161161
startActivity(intent);

0 commit comments

Comments
 (0)