diff --git a/.gitignore b/.gitignore
index b05ec35..648a7ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,18 @@
-#/CYTAndroid4.0.iml
-#build.gradle
-#local.properties
-#license.dat
-#proguard-project.txt
-#local.properties
-#gradle
-#.gradle
-#.idea
-#*.iml
-#.project
-#gradlew
-#gradlew.bat
-#.gitignore
-#build
-#.settings
-#project.properties
-#/release/
+/CYTAndroid4.0.iml
+build.gradle
+local.properties
+license.dat
+proguard-project.txt
+local.properties
+gradle
+.gradle
+.idea
+*.iml
+.project
+gradlew
+gradlew.bat
+.gitignore
+build
+.settings
+project.properties
+/release/
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dca9a07..bd897d1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -239,6 +239,13 @@
android:screenOrientation="portrait"
android:theme="@style/Theme"
android:windowSoftInputMode="adjustPan|stateHidden" />
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 91c224e..593438a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,6 +30,7 @@ dependencies {
implementation files('libs/zbar.jar')
implementation files('libs/zxing.jar')
implementation files('libs/gson-2.6.2.jar')
+ implementation files('libs\\zypos1.8.jar')
compileOnly files('external_libs/classes_2.1.11_20160907.jar')
compileOnly files('external_libs/bw_odm_20160526.jar')
implementation files('libs/bw_pos_sdk2.0.18.jar')
@@ -37,7 +38,11 @@ dependencies {
android {
compileSdkVersion 24
-
+ defaultConfig {
+ ndk {
+ abiFilters "armeabi-v7a"//可以适当补填其他
+ }
+ }
buildTypes {
release {
diff --git a/res/layout/app_settings.xml b/res/layout/app_settings.xml
index 031a06e..e3ddf18 100644
--- a/res/layout/app_settings.xml
+++ b/res/layout/app_settings.xml
@@ -355,18 +355,17 @@
+ android:textColor="#333333"
+ android:textSize="18sp" />