Skip to content

Commit

Permalink
添加nfc的功能
Browse files Browse the repository at this point in the history
  • Loading branch information
杨充 committed Oct 28, 2020
1 parent f8ef4e3 commit d62a257
Show file tree
Hide file tree
Showing 47 changed files with 2,512 additions and 2 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
1 change: 1 addition & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ dependencies {
implementation project(path: ':LibraryLayer')
implementation project(path: ':ImageServer')
implementation project(path: ':ZxingServer')
implementation project(path: ':NfcServer')
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,9 @@ public void setGridView(String[] toolName, ArrayList<Integer> logoList) {
case 3:
ARouterUtils.navigation(RouterConfig.Demo.ACTIVITY_OTHER_PROGRESS1_ACTIVITY);
break;
//nfc测试
case 4:
ARouterUtils.navigation(RouterConfig.Nfc.ACTIVITY_NFC_MAIN);
break;
case 5:
ARouterUtils.navigation(RouterConfig.Game.ACTIVITY_OTHER_AIR_ACTIVITY);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/arrays.xml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
<item>轮播图</item>
<item>爱心表达</item>
<item>杀毒进度</item>
<item>微信新闻</item>
<item>NFC</item>
<item>飞机大战</item>
<item>老虎机</item>
<item>电影评分</item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,12 @@ interface Library{
//跳转到webView详情页面
String ACTIVITY_LIBRARY_WEB_VIEW = "/library/WebViewActivity";
}

/**
* nfc
*/
interface Nfc {
//跳转测试nfc页面
String ACTIVITY_NFC_MAIN = "/nfc/NfcMainActivity";
}
}
1 change: 1 addition & 0 deletions server/NfcServer/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
45 changes: 45 additions & 0 deletions server/NfcServer/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion rootProject.ext.android["compileSdkVersion"]
buildToolsVersion rootProject.ext.android["buildToolsVersion"]

defaultConfig {
minSdkVersion rootProject.ext.android["minSdkVersion"]
targetSdkVersion rootProject.ext.android["targetSdkVersion"]
versionCode rootProject.ext.android["versionCode"]
versionName rootProject.ext.android["versionName"]
multiDexEnabled true

javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}

}


buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

//jdk1.8
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

}

dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.google.guava:guava:25.1-android'
annotationProcessor rootProject.ext.dependencies["router-compiler"]
implementation project(path: ':LibraryLayer')
implementation project(path: ':ConfigLayer')
}
Empty file.
21 changes: 21 additions & 0 deletions server/NfcServer/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# 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

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class 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

0 comments on commit d62a257

Please sign in to comment.