Skip to content

U
在这里-examples-android-block-read
Commit2d44bd4e by developer4
Options

Preparation for 3.0 release

Application is configured to target Android 8.0 (API level 26) Android project have been ported to Android Studio 3.2 and Gradle 4.6 (Android Gradle plugin 3.2.1) Added new uFR Plus devices descriptions to res/xml/dev_desc_filter.xml Updated DlReader lib sub-module to 2.9
家长 ecb05cc7
Showing with110 additionsand111 deletions
.gitignore
.gradle
.idea
build
/*.iml
/local.properties
*.iml
/app/libs/d2xx.jar
*.iml
app/build.gradle
applyplugin:'com.android.application'
android{
compileSdkVersion23
buildToolsVersion'25.0.0'
compileSdkVersion26
defaultConfig{
applicationId"net.dlogic.android.ufr.block_read_example"
applicationId"net.dlogic.在这里.block_read"
minSdkVersion15
targetSdkVersion15
versionCode29
versionName'2.9'
targetSdkVersion26
versionCode30
versionName'3.0'
}
buildTypes{
release{
... ... @@ -21,7 +20,6 @@ android {
}
dependencies{
compilefileTree(include:['*.jar'],dir:'libs')
testCompile'junit:junit:4.12'
compilefiles('libs/d2xx.jar')
implementationfileTree(include:['*.jar'],dir:'libs')
implementationfiles('libs/d2xx.jar')
}
app/build/outputs/apk/output.json 0 → 100644
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":30,"versionName":"3.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"app-debug.apk","properties":{}}]
\ No newline at end of file
app/proguard-rules.pro
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in C:\android\sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
# -keepclassmembers类fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
app/release/output.json 0 → 100644
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":30,"versionName":"3.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
app/src/androidTest/java/net/dlogic/android/ufr/block_read_example/ApplicationTest.javadeleted 100644 → 0
packagenet.dlogic.android.在这里.block_read_example;
importandroid.app.Application;
importandroid.test.ApplicationTestCase;
/**
* Testing Fundamentals
*/
publicclassApplicationTestextendsApplicationTestCase<Application>{
publicApplicationTest(){
super(Application.class);
}
}
\ No newline at end of file
app/src/main/AndroidManifest.xml
xmlns:android="http://schemas.android.com/apk/res/android"
package="net.dlogic.ufr.block_read"
android:versionCode="29"
android:versionName="2.9">
android:minSdkVersion="15"/>
android:name="android.hardware.usb.host"/>
package="net.dlogic.ufr.block_read">
android:name="android.hardware.usb.host"/>
android:name="android.hardware.usb.accessory"/>
... ... @@ -18,23 +16,38 @@
android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@style/AppTheme"
android:autoRemoveFromRecents="true"
android:screenOrientation="portrait"
>
android:screenOrientation="portrait">
android:name="android.intent.action.MAIN"/>
android:name="android.intent.category.LAUNCHER"/>
android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>
android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"android:resource="@xml/device_filter"/>
android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
android:resource="@xml/device_filter"/>
android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"/>
android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"android:resource="@xml/accessory_filter"/>
android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
android:resource="@xml/accessory_filter"/>
android:name="android.intent.action.VIEW"/>
android:name="android.intent.category.DEFAULT"/>
android:name="android.intent.category.BROWSABLE"/>
android:scheme="https"
android:host="www.d-logic.net"
android:pathPattern="/nfc-rfid-reader-sdk"/>
... ...
lib@8719a1a5
Subproject commit2a190e3686c9ced86c0e06625bc3064c185b7c4f
Subproject commit8719a1a5b5c8a5bb0c14e97223d1cf82b5f2994b
app/src/main/res/values/strings.xml
name="app_name">NFC card Block Read
name="title_activity_main">NFC card Block Read2.9
name="title_activity_main">NFC card Block Read3.0
name="site_url">www.d-logic.net/nfc-rfid-reader-sdk/
name="default_value_block_addr">0
... ...
app/src/main/res/xml/dev_desc_filter.xml
... ... @@ -14,4 +14,10 @@
description="uFR CLASSIC CS"/>
description="uFR PRO CS RF AMP"/>
description="uFR PRO CS"/>
description="uFR Nano Plus"/>
description="uFR Nano PRO Plus"/>
description="uFR Classic CS Plus"/>
description="uFR Classic CS PRO Plus"/>
description="uFR Classic CS Plus RF AMP"/>
description="uFR Classic PRO Plus RF AMP"/>
app/src/test/java/net/dlogic/android/ufr/block_read_example/ExampleUnitTest.javadeleted 100644 → 0
packagenet.dlogic.android.在这里.block_read_example;
importorg.junit.Test;
importstaticorg.junit.Assert.*;
/**
* To work on unit tests, switch the Test Artifact in the Build Variants view.
*/
publicclassExampleUnitTest{
@Test
publicvoidaddition_isCorrect()throwsException{
assertEquals(4,2+2);
}
}
\ No newline at end of file
build.gradle
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript{
repositories{
google()
jcenter()
}
dependencies{
classpath'com.android.tools.build:gradle:2.3.2'
classpath'com.android.tools.build:gradle:3.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
... ... @@ -14,6 +17,7 @@ buildscript {
allprojects{
repositories{
google()
jcenter()
}
}
... ...
gradle.properties
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
#org.gradle.parallel=true
\ No newline at end of file
# org.gradle.parallel=true
gradle/wrapper/gradle-wrapper.properties
#Mon Nov 06 09:11:07 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\:/ / services.gradle.org/distributions/gradle-4.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\:/ / services.gradle.org/distributions/gradle-3.3-all.zip
gradlew
#!/usr/bin/envbash
#!/usr/bin/env sh
##############################################################################
##
... ... @@ -6,20 +6,38 @@
##
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while[-h"$PRG"];do
ls=`ls-ld"$PRG"`
link=`expr"$ls":'.*-> \(.*\)$'`
ifexpr"$link":'/.*'>/dev/null;then
PRG="$link"
else
PRG=`dirname"$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd"`dirname\"$PRG\"`/">/dev/null
APP_HOME="`pwd-P`"
cd"$SAVED">/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename"$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
#使用的最大可用,或一组MAX_FD ! = 1 to use that value.
MAX_FD="maximum"
warn(){
warn(){
echo"$*"
}
die(){
die(){
echo
echo"$*"
echo
... ... @@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case"`uname`"in
CYGWIN*)
cygwin=true
... ... @@ -40,26 +59,11 @@ case "`uname`" in
MINGW*)
msys=true
;;
NONSTOP*)
nonstop=true
;;
esac
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while[-h"$PRG"];do
ls=`ls-ld"$PRG"`
link=`expr"$ls":'.*-> \(.*\)$'`
ifexpr"$link":'/.*'>/dev/null;then
PRG="$link"
else
PRG=`dirname"$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd"`dirname\"$PRG\"`/">/dev/null
APP_HOME="`pwd-P`"
cd"$SAVED">/dev/null
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
... ... @@ -85,7 +89,7 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if["$cygwin"="false"-a"$darwin"="false"];then
if["$cygwin"="false"-a"$darwin"="false"-a"$nonstop"="false"];then
MAX_FD_LIMIT=`ulimit-H-n`
if[$?-eq0];then
if["$MAX_FD"="maximum"-o"$MAX_FD"="max"];then
... ... @@ -150,11 +154,19 @@ if $cygwin ; then
esac
fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
functionsplitJvmOpts(){
JVM_OPTS=("$@")
# Escape application args
save(){
foridoprintf%s\\n"$i"|sed"s/'/'\\\\''/g;1s/^/'/;\$s/\$/'\\\\/";done
echo" "
}
evalsplitJvmOpts$DEFAULT_JVM_OPTS$JAVA_OPTS$GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
APP_ARGS=$(save"$@")
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set--$DEFAULT_JVM_OPTS$JAVA_OPTS$GRADLE_OPTS"\"-Dorg.gradle.appname=$APP_BASE_NAME\""-classpath"\"$CLASSPATH\""org.gradle.wrapper.GradleWrapperMain"$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if["$(uname)"="Darwin"]&&["$HOME"="$PWD"];then
cd"$(dirname"$0")"
fi
exec"$JAVACMD""${JVM_OPTS[@]}"-classpath"$CLASSPATH"org.gradle.wrapper.GradleWrapperMain"$@"
exec"$JAVACMD""$@"
gradlew.bat
... ... @@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
... ... @@ -46,10 +46,9 @@ echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windowzvariants
@rem Get command-line arguments, handling Windowsvariants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
... ... @@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
... ...
    Markdownis supported
    0%or
    You are about to add0peopleto the discussion. Proceed with caution.
    Finish editing this message first!
    Pleaseregisterorto comment
    Baidu
    map