Merge pull request #58 from xianglin1998/master

PM3 res updated.

Author: xianglin1998

app_main/build.gradle

@@ -52,14 +52,11 @@ dependencies {
 
     annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0'
 
-    // This my project maven from github release!
-    implementation 'com.github.xianglin1998:IORedirector:1.0'
-    implementation 'com.github.xianglin1998:Crapto1:1.3'
-    implementation 'com.github.xianglin1998:nfctag:1.0'
-    implementation 'com.github.xianglin1998:nfc_console:1.0'
-
-    implementation 'com.github.xianglin1998:ComBridge:1.0.7'
-    // implementation project(path: ':iobridges')
+    implementation project(path: ':iobridges')
+    implementation project(path: ':crapto1')
+    implementation project(path: ':nfctag')
+    implementation project(path: ':console')
+    implementation project(path: ':redirector')
 
     implementation project(':utils')
     implementation project(':libnfc_pn53x')
@@ -68,7 +65,6 @@ dependencies {
 
     implementation project(path: ':pm3flasher')
     implementation project(':pm3rdv4rrg')
-    implementation project(path: ':xmodem')
 
     // The dep from TERMUX(A FullTerminal implements.)
     implementation project(":termux-app")

app_main/src/main/AndroidManifest.xml

@@ -35,9 +35,7 @@
         </activity>
 
         <activity android:name=".activities.tools.KeyFileEditActivity" />
-        <activity android:name=".activities.tools.DumpEqualActivity" />
         <activity android:name=".activities.tools.DumpEditActivity" />
-        <activity android:name=".activities.tools.FormatCovertActivity" />
         <activity android:name=".activities.tools.ChameleonSoltAliasesActivity" />
         <activity android:name=".activities.tools.AboutActicity" />
 

app_main/src/main/assets/help.html

@@ -0,0 +1,10 @@
+20201026_5
+
+pattern:	*_*
+
+frist *:	date
+second:	number
+
+example:	20201026_1
+example:	20201026_2
+example:	20201027_1

app_main/src/main/assets/pm3_version.txt

@@ -18,7 +18,7 @@
 import android.widget.TextView;
 
 import com.iobridges.com.Communication;
-import com.proxgrind.xmodem.XModem128;
+import cn.rrg.chameleon.xmodem.XModem128;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

app_main/src/main/assets/proxmark3.zip

@@ -80,10 +80,12 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         box.setChecked(Commons.getAutoGoToTerminal());
 
         // Must have init pm3 client and check auto go and have the terminal type selected!
-        if (Commons.getAutoGoToTerminal()
-                && Commons.isPM3ClientDecompressed()
-                && Commons.getTerminalType() != -1) {
-            go();
+        if (Commons.getAutoGoToTerminal() && Commons.getTerminalType() != -1) {
+            if (Proxmark3Installer.isCanInstall(activity)) {
+                Proxmark3Installer.installIfNeed(activity, this::go);
+            } else {
+                go();
+            }
         }
     }
 

app_main/src/main/java/cn/rrg/rdv/activities/chameleon/ChameleonGUIActivity.java

@@ -1,42 +1,22 @@
 package cn.rrg.rdv.activities.tools;
 
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Bundle;
+
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 
 import android.view.View;
-import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.TextView;
-import android.widget.Toast;
-
-import java.io.File;
 
-import cn.dxl.common.util.AppUtil;
-import cn.dxl.common.util.FileUtils;
-import cn.dxl.common.widget.FilesSelectorDialog;
 import cn.rrg.rdv.R;
 import cn.rrg.rdv.activities.main.BaseActivity;
 import cn.rrg.rdv.util.Commons;
-import cn.rrg.rdv.util.Paths;
-import cn.dxl.common.util.RestartUtils;
-import cn.dxl.common.widget.ToastUtil;
 
 public class AboutActicity extends BaseActivity {
 
-    private TextView txtUserHelp = null;
-    private TextView txtDisclaimer = null;
-    private TextView txtJoinGroup = null;
-    private TextView txtContactDev = null;
     private TextView txtShowVersion = null;
-    private TextView txtSendLogFile = null;
-    private TextView txtCleanData = null;
-
     private Button btnGo2ProxgrindWebsite;
     private Button btnGo2RRGWebsite;
 
@@ -51,105 +31,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     }
 
     private void initViews() {
-        txtUserHelp = findViewById(R.id.txtUserHelp);
-        txtDisclaimer = findViewById(R.id.txtDisclaimer);
-        txtJoinGroup = findViewById(R.id.txtJoinQQGroup);
-        txtContactDev = findViewById(R.id.txtContactDev);
         txtShowVersion = findViewById(R.id.txtShowAppVersion);
-        txtSendLogFile = findViewById(R.id.txtSendLogFile);
-        txtCleanData = findViewById(R.id.txtCleanData);
 
         btnGo2ProxgrindWebsite = findViewById(R.id.btnGo2ProxgrindWebsite);
         btnGo2RRGWebsite = findViewById(R.id.btnGo2RRGWebsite);
     }
 
     private void initActions() {
-        txtUserHelp.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //建立视图
-                WebView wv = new WebView(AboutActicity.this);
-                //加载文件
-                wv.loadUrl("file:///android_asset/help.html");
-                //加载进对话框中
-                new AlertDialog.Builder(AboutActicity.this)
-                        .setView(wv).show();
-            }
-        });
-
-        txtDisclaimer.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-            }
-        });
-
-        txtJoinGroup.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                boolean result = joinQQGroup("4QQrqUHKMNZDNWLvi4kEWeEDHYMekp7x");
-                if (!result) {
-                    Toast.makeText(AboutActicity.this, "未安装手Q或安装的版本不支持!", Toast.LENGTH_SHORT).show();
-                }
-            }
-        });
-
-        txtContactDev.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Commons.callQQ(AboutActicity.this, "64101226", new Runnable() {
-                    @Override
-                    public void run() {
-                        ToastUtil.show(context, getString(R.string.error), false);
-                    }
-                });
-            }
-        });
-
-        txtSendLogFile.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                new FilesSelectorDialog.Builder(AboutActicity.this)
-                        .setPathOnLoad(Paths.LOG_DIRECTORY)
-                        .setTitle(R.string.logList)
-                        .setOnSelectListener(new FilesSelectorDialog.OnSelectListener() {
-                            @Override
-                            public void selected(File file) {
-                                FileUtils.shareFile(file);
-                            }
-                        })
-                        .create().show();
-            }
-        });
-
-        txtCleanData.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                new AlertDialog.Builder(AboutActicity.this)
-                        .setTitle(R.string.warning)
-                        .setMessage(R.string.tipls_clearData)
-                        .setPositiveButton(getString(R.string.clear), new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                Toast.makeText(AboutActicity.this, getString(R.string.cleaning), Toast.LENGTH_SHORT).show();
-                                FileUtils.delete(new File(Paths.TOOLS_DIRECTORY));
-                                Toast.makeText(AboutActicity.this, getString(R.string.clearFinish), Toast.LENGTH_SHORT).show();
-                                //必须重启APP
-                                RestartUtils.restartAPP(AboutActicity.this, 1000, new RestartUtils.OnExitAction() {
-                                    @Override
-                                    public boolean usingSystemExit() {
-                                        //调用act管理器结束所有的活动！
-                                        AppUtil.getInstance().finishAll();
-                                        return false;
-                                    }
-                                });
-                                AppUtil.getInstance().finishAll();
-                            }
-                        })
-                        .setNegativeButton(R.string.cancel, null)
-                        .show();
-            }
-        });
-
         btnGo2ProxgrindWebsite.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -177,27 +65,6 @@ private void showVersion() {
         }
     }
 
-    /****************
-     *
-     * 发起添加群流程。群号：NFC PN532 计算机 单片机(573359551) 的 key 为： 4QQrqUHKMNZDNWLvi4kEWeEDHYMekp7x
-     * 调用 joinQQGroup(4QQrqUHKMNZDNWLvi4kEWeEDHYMekp7x) 即可发起手Q客户端申请加群 NFC PN532 计算机 单片机(573359551)
-     *
-     * @param key 由官网生成的key
-     * @return 返回true表示呼起手Q成功，返回fals表示呼起失败
-     ******************/
-    public boolean joinQQGroup(String key) {
-        Intent intent = new Intent();
-        intent.setData(Uri.parse("mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26k%3D" + key));
-        // 此Flag可根据具体产品需要自定义，如设置，则在加群界面按返回，返回手Q主界面，不设置，按返回会返回到呼起产品界面    //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        try {
-            startActivity(intent);
-            return true;
-        } catch (Exception e) {
-            // 未安装手Q或安装的版本不支持
-            return false;
-        }
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();