diff --git a/README.md b/README.md index 37740d42..e8b0276b 100644 --- a/README.md +++ b/README.md @@ -65,13 +65,15 @@ Download and flash [Compiled FW 12 August](https://www.dropbox.com/s/416lsrqpr2l ## App core implementation -If you want to join our project, you must comply with the following development specifications to some extent, including macro architecture and micro implementation. Let us have target time coding. +Comunication: LocalSocket & LocalServerSocket(Android) + Linux api: socket & abstract namespace + +Build: gradle & cmake -- Communication implementation: using JNI mapping C & Java communication, encapsulating posix-compliant UART library, using Google API in the upper layer (Java) and posix-compliant UART in the lower layer (C/C+++). +Framework: MVP -- Console program: Android defaults stdin, stdout, stderr to / dev / null, so the console program will not get normal output, we need to redirect them to the correct path, such as pointing to the file / sdcard / forward. stdxx, core: function freopen (), defined by C stdio. h, can redirect the standard stream. To local file. - -- Program architecture: DXL programming complies with MVP, the core architecture uses MVP to achieve layering, all the underlying data is placed in Model, all UI actions are placed in View, and all data calls are placed in Presenter. Module is used to realize resource management, reusable, and separate business can be placed in separate modules to reduce coupling and achieve reuse. Replacing concrete implementation with abstraction achieves the effects of extracting public implementation, abstracting private implementation, Interface-oriented and abstract programming, such as PN53X and mobile phone NFC read-write card use same UI, and information display. +Now all lib is compile to "libxxx.so", jni and ndk is basic. core is jni and ndk from java to c map. +not a linux executable file(Future) ## Compability list diff --git a/app_main/build.gradle b/app_main/build.gradle index ed9d28b5..05e594fc 100644 --- a/app_main/build.gradle +++ b/app_main/build.gradle @@ -8,8 +8,8 @@ android { minSdkVersion 19 targetSdkVersion 29 testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' - versionCode 14 - versionName "1.4.1" + versionCode 15 + versionName "1.4.2" } buildTypes { release { diff --git a/app_main/src/main/assets/bootrom.elf b/app_main/src/main/assets/bootrom.elf index b39c35a8..727cd60b 100644 Binary files a/app_main/src/main/assets/bootrom.elf and b/app_main/src/main/assets/bootrom.elf differ diff --git a/app_main/src/main/assets/fullimage.elf b/app_main/src/main/assets/fullimage.elf index 7189512e..37dc8fe7 100644 Binary files a/app_main/src/main/assets/fullimage.elf and b/app_main/src/main/assets/fullimage.elf differ diff --git a/app_main/src/main/java/cn/rrg/rdv/util/Commons.java b/app_main/src/main/java/cn/rrg/rdv/util/Commons.java index 899ce212..daa9a159 100644 --- a/app_main/src/main/java/cn/rrg/rdv/util/Commons.java +++ b/app_main/src/main/java/cn/rrg/rdv/util/Commons.java @@ -25,7 +25,7 @@ import cn.dxl.common.util.ArrayUtils; public class Commons { public static final String LOG_TAG = Commons.class.getSimpleName(); - public static String PM3_CLIENT_VERSION = "RRG/Iceman// 2020/02/11"; + public static String PM3_CLIENT_VERSION = "RRG/Iceman// 2020/05/06"; private Commons() { } diff --git a/pm3rdv4rrg/src/main/cpp/proxmark3 b/pm3rdv4rrg/src/main/cpp/proxmark3 index 00b58415..0c233590 160000 --- a/pm3rdv4rrg/src/main/cpp/proxmark3 +++ b/pm3rdv4rrg/src/main/cpp/proxmark3 @@ -1 +1 @@ -Subproject commit 00b5841597742ec3bb902d9d927e962d4b2ba124 +Subproject commit 0c233590a56df9d2de3ccc40bd19288de574bbda