From 06c2342d8ac1dadeae92636b56bed5be509a818e Mon Sep 17 00:00:00 2001
From: dxl <64101226@qq.com>
Date: Mon, 29 Jun 2020 16:03:52 +0800
Subject: [PATCH] TermuxView test Work.

---
 .gitignore                                    | 20 +++++++++++++++++++
 app_main/build.gradle                         |  6 ++++--
 app_main/src/main/AndroidManifest.xml         | 14 -------------
 .../cn/rrg/rdv/activities/main/AppMain.java   |  4 ++++
 settings.gradle                               |  3 +--
 utils/src/main/AndroidManifest.xml            |  1 -
 6 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3889eda0..0270dbf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@ captures/
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
+*.zip
 
 # Google Services (e.g. APIs or Firebase)
 google-services.json
@@ -60,3 +61,22 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 fastlane/readme.md
+
+# Crashlytics configuations
+com_crashlytics_export_strings.xml
+
+# Gradle generated files
+.gradle/
+
+# Signing files
+.signing/
+
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+.swp
+ehthumbs.db
+Thumbs.db
diff --git a/app_main/build.gradle b/app_main/build.gradle
index 7b22a5bf..4f8b633d 100644
--- a/app_main/build.gradle
+++ b/app_main/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "29.0.2"
     defaultConfig {
         applicationId "com.rfidresearchgroup.rfidtools"
-        minSdkVersion 19
+        minSdkVersion 24
         targetSdkVersion 29
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         versionCode 21
@@ -70,5 +70,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     implementation project(path: ':pm3flasher')
     implementation project(path: ':xmodem')
-    implementation project(":terminal-view")
+
+    // The dep from TERMUX(A FullTerminal implements.)
+    implementation project(":termux-app")
 }
\ No newline at end of file
diff --git a/app_main/src/main/AndroidManifest.xml b/app_main/src/main/AndroidManifest.xml
index 98b7473d..0f19e468 100644
--- a/app_main/src/main/AndroidManifest.xml
+++ b/app_main/src/main/AndroidManifest.xml
@@ -2,21 +2,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="cn.rrg.rdv">
 
-    <!--蓝牙使用-->
     <uses-permission android:name="android.permission.BLUETOOTH" />
-    <!--蓝牙管理-->
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <!--定位权限-->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <!--定位权限-->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <!--写入文件-->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <!--读取文件-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <!--NFC权限-->
     <uses-permission android:name="android.permission.NFC" />
-    <!--网络连接-->
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
@@ -30,17 +22,12 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="q">
 
-        <!--初始化Activity-->
         <activity android:name=".activities.tools.LoginActivity">
             <intent-filter>
-                <!--桌面启动的意图!-->
                 <action android:name="android.intent.action.MAIN" />
-                <!--USB插入的意图!-->
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
-                <!--桌面启动的标签!-->
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <!--USB的支持类型静态注册!-->
             <meta-data
                 android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
                 android:resource="@xml/device_filter" />
@@ -51,7 +38,6 @@
         <activity android:name=".activities.tools.DumpEditActivity" />
         <activity android:name=".activities.tools.FormatCovertActivity" />
         <activity android:name=".activities.tools.ChameleonSoltAliasesActivity" />
-        <activity android:name=".fragment.tools.ToolsAccessFragment" />
         <activity android:name=".activities.tools.AboutActicity" />
 
         <activity android:name=".activities.px53x.EmulateConsoleActivity" />
diff --git a/app_main/src/main/java/cn/rrg/rdv/activities/main/AppMain.java b/app_main/src/main/java/cn/rrg/rdv/activities/main/AppMain.java
index d802d25e..7b67e307 100644
--- a/app_main/src/main/java/cn/rrg/rdv/activities/main/AppMain.java
+++ b/app_main/src/main/java/cn/rrg/rdv/activities/main/AppMain.java
@@ -1,6 +1,7 @@
 package cn.rrg.rdv.activities.main;
 
 import android.app.AlertDialog;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
 
@@ -10,6 +11,7 @@ import androidx.fragment.app.Fragment;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.iobridges.com.LocalComBridgeAdapter;
+import com.termux.app.TermuxActivity;
 
 import cn.dxl.common.util.DisplayUtil;
 import cn.dxl.common.util.FragmentUtil;
@@ -45,6 +47,8 @@ public class AppMain extends BaseActivity {
         initActions();
 
         gotoFragment(appMainDevicesFragment);
+
+        startActivity(new Intent(this, TermuxActivity.class));
     }
 
     private void initViews() {
diff --git a/settings.gradle b/settings.gradle
index 5531fe74..0ec19362 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,4 @@
 include ':app_main', ':utils', ':chameleon', ':communication', ':libnfc_pn53x', ':pm3rdv4rrg'
 include ':pm3flasher'
 include ':xmodem'
-include ':terminal-emulator'
-include ':terminal-view'
\ No newline at end of file
+include ':termux-app', ':terminal-emulator', ':terminal-view'
\ No newline at end of file
diff --git a/utils/src/main/AndroidManifest.xml b/utils/src/main/AndroidManifest.xml
index a1af171f..61086b1b 100644
--- a/utils/src/main/AndroidManifest.xml
+++ b/utils/src/main/AndroidManifest.xml
@@ -18,7 +18,6 @@
 
         </provider>
 
-        <!--APP重启服务-->
         <service
             android:name="cn.dxl.common.services.RestartService"
             android:enabled="true"