From d73644adba2d0b2c52002624d107bca0ec97dd8b Mon Sep 17 00:00:00 2001
From: Administrator <352913998@qq.com>
Date: Thu, 16 Jul 2020 10:18:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=9A=E8=AF=9D=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E5=B9=BF=E6=92=AD=E5=BC=82=E5=B8=B8=200.95.8?=
 =?UTF-8?q?6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                   |  2 +-
 .../com/termux/{ => app}/TermuxOpenReceiver.java   |  5 ++---
 app/src/main/AndroidManifest.xml                   |  3 +--
 .../main/java/com/termux/app/TermuxActivity.java   | 14 +++++++++-----
 .../main/java/com/termux/http/UpDateHttpCode.java  |  4 ++--
 app/src/main/res/layout/activity_setting.xml       |  2 +-
 app/src/main/res/layout/activity_xinhao__han.xml   |  2 +-
 app/src/main/res/layout/drawer_layout.xml          |  4 ++--
 app/src/main/res/layout/drawer_layout_include.xml  |  5 ++---
 9 files changed, 21 insertions(+), 20 deletions(-)
 rename app/src/com/termux/{ => app}/TermuxOpenReceiver.java (99%)

diff --git a/app/build.gradle b/app/build.gradle
index d155028..797ed44 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,7 +51,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 84
-        versionName "0.95.85"
+        versionName "0.95.86"
         javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } }
 
     }
diff --git a/app/src/com/termux/TermuxOpenReceiver.java b/app/src/com/termux/app/TermuxOpenReceiver.java
similarity index 99%
rename from app/src/com/termux/TermuxOpenReceiver.java
rename to app/src/com/termux/app/TermuxOpenReceiver.java
index 48b030d..f2b52f2 100644
--- a/app/src/com/termux/TermuxOpenReceiver.java
+++ b/app/src/com/termux/app/TermuxOpenReceiver.java
@@ -1,4 +1,4 @@
-package com.termux;
+package com.termux.app;
 
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
@@ -14,14 +14,13 @@
 import android.util.Log;
 import android.webkit.MimeTypeMap;
 
-import androidx.annotation.NonNull;
-
 import com.termux.terminal.EmulatorDebug;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
+import androidx.annotation.NonNull;
 import main.java.com.termux.app.TermuxService;
 
 public class TermuxOpenReceiver extends BroadcastReceiver {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0f6fb53..0d5930f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -467,7 +467,7 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
-        <receiver android:name="main.com.termux.TermuxOpenReceiver" />
+        <receiver android:name="com.termux.app.TermuxOpenReceiver" />
         <receiver android:name="main.java.com.termux.app.TermuxOpenReceiver" />
         <receiver
             android:name=".tuils.stuff.PolicyReceiver"
@@ -482,7 +482,6 @@
                 android:name="android.app.device_admin"
                 android:resource="@xml/policy" />
         </receiver> <!-- Activities from OI Distribution Library -->
-        <receiver android:name=".app.TermuxOpenReceiver" />
 
         <service
             android:name="main.java.com.termux.activity.DownLoadService"
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 5db8d89..818d8fd 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -60,6 +60,7 @@
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
+import android.widget.ScrollView;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -1415,7 +1416,7 @@ public void run() {
                         visition1.setTextColor(Color.YELLOW);
                         visition.setText(visition.getText());
                         visition1.setText("最新版本:[-.--.--]");
-                        visition4.setText("本地版本:[0.95.85]\n最新版本:[-.--.--]");
+                        visition4.setText("本地版本:[0.95.86]\n最新版本:[-.--.--]");
                     }
                 });
 
@@ -1460,7 +1461,7 @@ public void onFailure(Call call, IOException e) {
                                         @Override
                                         public void run() {
                                             visition1.setText("最新版本:[" + versionName + "]");
-                                            visition4.setText("本地版本:[0.95.85]\n最新版本:[" + versionName + "]");
+                                            visition4.setText("本地版本:[0.95.86]\n最新版本:[" + versionName + "]");
                                         }
                                     });
 
@@ -2301,6 +2302,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {
     private TextView item_50;
     private TextView item_75;
     private TextView item_100;
+    private ScrollView sv_hhh;
 
 
     @Override
@@ -2350,6 +2352,8 @@ public void onCreate(Bundle bundle) {
         seek_bar_tv = findViewById(R.id.seek_bar_tv);
         seek_bar = findViewById(R.id.seek_bar);
 
+        sv_hhh = findViewById(R.id.sv_hhh);
+
         check_up = findViewById(R.id.check_up);
         left_back_kkkk = findViewById(R.id.left_back_kkkk);
 
@@ -5404,7 +5408,7 @@ private void qiehuan(int index) {
         //0会话
         //1功能
 
-        termux_layout_1.setVisibility(View.GONE);
+        sv_hhh.setVisibility(View.GONE);
         listView.setVisibility(View.GONE);
 
 
@@ -5412,13 +5416,13 @@ private void qiehuan(int index) {
             sess_btn.setText("[*]会话");
             fun_btn.setText("功能");
             listView.setVisibility(View.VISIBLE);
-            termux_layout_1.setVisibility(View.GONE);
+            sv_hhh.setVisibility(View.GONE);
 
         } else {
             sess_btn.setText("会话");
             fun_btn.setText("[*]功能");
             listView.setVisibility(View.GONE);
-            termux_layout_1.setVisibility(View.VISIBLE);
+            sv_hhh.setVisibility(View.VISIBLE);
 
         }
 
diff --git a/app/src/main/java/com/termux/http/UpDateHttpCode.java b/app/src/main/java/com/termux/http/UpDateHttpCode.java
index 43bfc86..94ae73b 100644
--- a/app/src/main/java/com/termux/http/UpDateHttpCode.java
+++ b/app/src/main/java/com/termux/http/UpDateHttpCode.java
@@ -3,8 +3,8 @@
 public class UpDateHttpCode {
 
     //当前版本型号
-    public static final int CODE = 85;
-    public static final String CODE1 = "0.95.85";
+    public static final int CODE = 86;
+    public static final String CODE1 = "0.95.86";
 
 
 }
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 61fc544..d598196 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -41,7 +41,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="当前版本:0.95.85"
+                        android:text="当前版本:0.95.86"
                         android:textColor="#fff"
                         android:textSize="24sp" />
 
diff --git a/app/src/main/res/layout/activity_xinhao__han.xml b/app/src/main/res/layout/activity_xinhao__han.xml
index 890b9f3..e55b5f9 100644
--- a/app/src/main/res/layout/activity_xinhao__han.xml
+++ b/app/src/main/res/layout/activity_xinhao__han.xml
@@ -37,7 +37,7 @@
                 android:layout_marginTop="10dp"
                 android:textColor="#000"
                 android:textSize="18sp"
-                android:text="当前版本:0.95.85"
+                android:text="当前版本:0.95.86"
                 android:layout_height="wrap_content" />
 
             <TextView
diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml
index 518bafc..4e04115 100644
--- a/app/src/main/res/layout/drawer_layout.xml
+++ b/app/src/main/res/layout/drawer_layout.xml
@@ -103,7 +103,7 @@
                     android:gravity="center"
                     android:visibility="gone"
                     android:padding="2dp"
-                    android:text="云端版本:[0.95.85]\n本地版本[-.--.--]"
+                    android:text="云端版本:[0.95.86]\n本地版本[-.--.--]"
                     android:textColor="#fff"
                     android:textSize="14sp"
                     android:textStyle="bold" />
@@ -329,7 +329,7 @@
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="100dp"
-            android:text="Termux[0.95.85]"
+            android:text="Termux[0.95.86]"
             android:textColor="#fff"
             android:textSize="28sp" />
 
diff --git a/app/src/main/res/layout/drawer_layout_include.xml b/app/src/main/res/layout/drawer_layout_include.xml
index 7c7a9d0..d5ec0e6 100644
--- a/app/src/main/res/layout/drawer_layout_include.xml
+++ b/app/src/main/res/layout/drawer_layout_include.xml
@@ -15,6 +15,7 @@
         <ScrollView
             android:layout_width="match_parent"
             android:layout_above="@+id/function_ll"
+            android:id="@+id/sv_hhh"
             android:layout_height="match_parent">
 
             <LinearLayout
@@ -56,7 +57,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:padding="2dp"
-                                android:text="本地版本:[0.95.85]"
+                                android:text="本地版本:[0.95.86]"
                                 android:textColor="#fff"
                                 android:textSize="14sp"
                                 android:textStyle="bold" />
@@ -3073,8 +3074,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="top"
-            android:layout_weight="1"
-            android:background="#552b2b2b"
             android:choiceMode="singleChoice"
             android:layout_above="@+id/function_ll"
             android:longClickable="true"