Преглед на файлове

3128门口机升级版本到1.2.11

weizhengliang преди 10 месеца
родител
ревизия
de9a6f94c5
променени са 2 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 3 3
      build.gradle
  2. 1 1
      common/build.gradle

+ 3 - 3
build.gradle

@@ -44,15 +44,15 @@ buildscript {
      */
      */
     ext.support_library_version = "28.0.0"
     ext.support_library_version = "28.0.0"
 
 
-    ext.app_device_type = "mk_h10_a133_1"
+    ext.app_device_type = "mk_h10_z_3128_1"
 
 
     //UI版本: default, mom
     //UI版本: default, mom
     ext.ui_type = "default"
     ext.ui_type = "default"
 
 
     if (app_device_type == "mk_h10_z_3128_1") {
     if (app_device_type == "mk_h10_z_3128_1") {
         //rk3128 10寸门口机
         //rk3128 10寸门口机
-        ext.app_version_code = 60
-        ext.app_version = "1.2.10"
+        ext.app_version_code = 61
+        ext.app_version = "1.2.11"
     } else if (app_device_type == "mk_h10_a133_1") {
     } else if (app_device_type == "mk_h10_a133_1") {
         //志合a133 10寸门口机
         //志合a133 10寸门口机
         ext.app_version_code = 61
         ext.app_version_code = 61

+ 1 - 1
common/build.gradle

@@ -235,7 +235,7 @@ dependencies {
      */
      */
     compile 'io.netty:netty-all:4.1.42.Final'
     compile 'io.netty:netty-all:4.1.42.Final'
     //解决 引入上方库,Log4J2Logger报错的问题
     //解决 引入上方库,Log4J2Logger报错的问题
-    implementation 'org.apache.logging.log4j:log4j-core:2.7'
+    annotationProcessor 'org.apache.logging.log4j:log4j-core:2.7'
     implementation 'org.apache.logging.log4j:log4j-api:2.7'
     implementation 'org.apache.logging.log4j:log4j-api:2.7'
 
 
     /**
     /**