diff --git a/app/build.gradle b/app/build.gradle
index 5765fac..abbf78a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,7 +51,7 @@ android {
minSdkVersion 21
targetSdkVersion 28
versionCode 84
- versionName "0.95.87"
+ versionName "0.95.89"
javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } }
}
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index d95f84e..47bcf59 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -1416,7 +1416,7 @@ public void run() {
visition1.setTextColor(Color.YELLOW);
visition.setText(visition.getText());
visition1.setText("最新版本:[-.--.--]");
- visition4.setText("本地版本:[0.95.87]\n最新版本:[-.--.--]");
+ visition4.setText("本地版本:[0.95.89]\n最新版本:[-.--.--]");
}
});
@@ -1461,7 +1461,7 @@ public void onFailure(Call call, IOException e) {
@Override
public void run() {
visition1.setText("最新版本:[" + versionName + "]");
- visition4.setText("本地版本:[0.95.87]\n最新版本:[" + versionName + "]");
+ visition4.setText("本地版本:[0.95.89]\n最新版本:[" + versionName + "]");
}
});
@@ -1901,6 +1901,10 @@ private void mianbanSwitch(int index){
chouti_1 .setBackgroundColor(Color.parseColor("#00000000"));
chouti_2 .setBackgroundColor(Color.parseColor("#00000000"));
+ chouti_3 .setTextColor(Color.parseColor("#ffffff"));
+ chouti_3 .setBackgroundColor(Color.parseColor("#00000000"));
+
+
chouti_1 .setTextColor(Color.parseColor("#10202f"));
chouti_1 .setBackgroundResource(R.drawable.shape_login_btn_true);
@@ -1918,6 +1922,9 @@ private void mianbanSwitch(int index){
chouti_1 .setBackgroundColor(Color.parseColor("#00000000"));
chouti_2 .setBackgroundColor(Color.parseColor("#00000000"));
+ chouti_3 .setTextColor(Color.parseColor("#ffffff"));
+ chouti_3 .setBackgroundColor(Color.parseColor("#00000000"));
+
chouti_2 .setTextColor(Color.parseColor("#10202f"));
chouti_2 .setBackgroundResource(R.drawable.shape_login_btn_true);
@@ -1928,6 +1935,27 @@ private void mianbanSwitch(int index){
break;
+ case 2:
+
+ chouti_1 .setTextColor(Color.parseColor("#ffffff"));
+ chouti_2 .setTextColor(Color.parseColor("#ffffff"));
+
+
+ chouti_1 .setBackgroundColor(Color.parseColor("#00000000"));
+ chouti_2 .setBackgroundColor(Color.parseColor("#00000000"));
+
+ chouti_3 .setTextColor(Color.parseColor("#ffffff"));
+ chouti_3 .setBackgroundColor(Color.parseColor("#00000000"));
+
+
+ chouti_3 .setTextColor(Color.parseColor("#10202f"));
+ chouti_3 .setBackgroundResource(R.drawable.shape_login_btn_true);
+
+
+ SaveData.saveData("zhedie","false");
+
+ break;
+
}
@@ -1975,6 +2003,43 @@ private void startCT() {
String zhedie = SaveData.getData("zhedie");
+ if("false".equals(zhedie)){
+
+
+ item_1_5.setVisibility(View.VISIBLE);
+
+ other_group_content.setVisibility(View.VISIBLE);
+
+ gongju_group_content.setVisibility(View.VISIBLE);
+
+ meihua_group_content.setVisibility(View.VISIBLE);
+
+ item_1.setVisibility(View.VISIBLE);
+
+ item_2.setVisibility(View.VISIBLE);
+
+ ziyuan_group_content.setVisibility(View.VISIBLE);
+
+ item_3.setVisibility(View.VISIBLE);
+
+ item_4.setVisibility(View.VISIBLE);
+
+
+ item_1_5_img.setVisibility(View.GONE);
+ item_8_img.setVisibility(View.GONE);
+ item_7_img.setVisibility(View.GONE);
+ item_6_img.setVisibility(View.GONE);
+ item_1_img.setVisibility(View.GONE);
+ item_2_img.setVisibility(View.GONE);
+ item_3_img.setVisibility(View.GONE);
+ item_4_img.setVisibility(View.GONE);
+ item_5_img.setVisibility(View.GONE);
+
+
+
+ // return;
+ }
+
if(zhedie == null || zhedie.isEmpty() || zhedie.equals("def")) {
@@ -1984,7 +2049,13 @@ private void startCT() {
}else{
- mianbanSwitch(0);
+ if(zhedie.equals("false")){
+ mianbanSwitch(2);
+ }else{
+ mianbanSwitch(0);
+ }
+
+
}
@@ -1992,15 +2063,128 @@ private void startCT() {
@Override
public void onClick(View v) {
mianbanSwitch(0);
+
+ other_group_content.setVisibility(View.GONE);
+
+ gongju_group_content.setVisibility(View.GONE);
+
+ meihua_group_content.setVisibility(View.GONE);
+
+ item_1.setVisibility(View.GONE);
+
+ item_2.setVisibility(View.GONE);
+
+ ziyuan_group_content.setVisibility(View.GONE);
+
+ item_3.setVisibility(View.GONE);
+
+ item_4.setVisibility(View.GONE);
+ item_1_5.setVisibility(View.GONE);
+
+
+ item_1_5_img.setVisibility(View.VISIBLE);
+ item_8_img.setVisibility(View.VISIBLE);
+ item_7_img.setVisibility(View.VISIBLE);
+ item_6_img.setVisibility(View.VISIBLE);
+ item_1_img.setVisibility(View.VISIBLE);
+ item_2_img.setVisibility(View.VISIBLE);
+ item_3_img.setVisibility(View.VISIBLE);
+ item_4_img.setVisibility(View.VISIBLE);
+ item_5_img.setVisibility(View.VISIBLE);
+
+ item_1_5_img.setImageResource(R.drawable.down_saojiao);
+ item_8_img.setImageResource(R.drawable.down_saojiao);
+ item_7_img.setImageResource(R.drawable.down_saojiao);
+ item_6_img.setImageResource(R.drawable.down_saojiao);
+ item_1_img.setImageResource(R.drawable.down_saojiao);
+ item_2_img.setImageResource(R.drawable.down_saojiao);
+ item_3_img.setImageResource(R.drawable.down_saojiao);
+ item_4_img.setImageResource(R.drawable.down_saojiao);
+ item_5_img.setImageResource(R.drawable.down_saojiao);
}
});
chouti_2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mianbanSwitch(1);
+
+ other_group_content.setVisibility(View.GONE);
+
+ gongju_group_content.setVisibility(View.GONE);
+
+ meihua_group_content.setVisibility(View.GONE);
+
+ item_1.setVisibility(View.GONE);
+
+ item_2.setVisibility(View.GONE);
+
+ ziyuan_group_content.setVisibility(View.GONE);
+
+ item_3.setVisibility(View.GONE);
+
+ item_4.setVisibility(View.GONE);
+
+ item_1_5.setVisibility(View.GONE);
+
+
+ item_1_5_img.setVisibility(View.VISIBLE);
+ item_8_img.setVisibility(View.VISIBLE);
+ item_7_img.setVisibility(View.VISIBLE);
+ item_6_img.setVisibility(View.VISIBLE);
+ item_1_img.setVisibility(View.VISIBLE);
+ item_2_img.setVisibility(View.VISIBLE);
+ item_3_img.setVisibility(View.VISIBLE);
+ item_4_img.setVisibility(View.VISIBLE);
+ item_5_img.setVisibility(View.VISIBLE);
+
+ item_1_5_img.setImageResource(R.drawable.down_saojiao);
+ item_8_img.setImageResource(R.drawable.down_saojiao);
+ item_7_img.setImageResource(R.drawable.down_saojiao);
+ item_6_img.setImageResource(R.drawable.down_saojiao);
+ item_1_img.setImageResource(R.drawable.down_saojiao);
+ item_2_img.setImageResource(R.drawable.down_saojiao);
+ item_3_img.setImageResource(R.drawable.down_saojiao);
+ item_4_img.setImageResource(R.drawable.down_saojiao);
+ item_5_img.setImageResource(R.drawable.down_saojiao);
}
});
+ chouti_3.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mianbanSwitch(2);
+
+ item_1_5.setVisibility(View.VISIBLE);
+
+ other_group_content.setVisibility(View.VISIBLE);
+
+ gongju_group_content.setVisibility(View.VISIBLE);
+
+ meihua_group_content.setVisibility(View.VISIBLE);
+
+ item_1.setVisibility(View.VISIBLE);
+
+ item_2.setVisibility(View.VISIBLE);
+
+ ziyuan_group_content.setVisibility(View.VISIBLE);
+
+ item_3.setVisibility(View.VISIBLE);
+
+ item_4.setVisibility(View.VISIBLE);
+
+
+ item_1_5_img.setVisibility(View.GONE);
+ item_8_img.setVisibility(View.GONE);
+ item_7_img.setVisibility(View.GONE);
+ item_6_img.setVisibility(View.GONE);
+ item_1_img.setVisibility(View.GONE);
+ item_2_img.setVisibility(View.GONE);
+ item_3_img.setVisibility(View.GONE);
+ item_4_img.setVisibility(View.GONE);
+ item_5_img.setVisibility(View.GONE);
+ }
+ });
+
item_1_5_title.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -2008,6 +2192,11 @@ public void onClick(View v) {
String zhedie = SaveData.getData("zhedie");
+ if("false".equals(zhedie)){
+ return;
+ }
+
+
if(zhedie == null || zhedie.isEmpty() || zhedie.equals("def")) {
if (item_1_5.getVisibility() == View.GONE) {
@@ -2022,11 +2211,21 @@ public void onClick(View v) {
}else{
- setLayGone();
- item_1_5_img.setImageResource(R.drawable.up_sanjiao);
+ if (item_1_5.getVisibility() == View.VISIBLE){
+
+ setLayGone();
+
+ }else {
+
+ setLayGone();
+
+ item_1_5_img.setImageResource(R.drawable.up_sanjiao);
+
+ item_1_5.setVisibility(View.VISIBLE);
+ }
+
- item_1_5.setVisibility(View.VISIBLE);
@@ -2043,6 +2242,10 @@ public void onClick(View v) {
String zhedie = SaveData.getData("zhedie");
+ if("false".equals(zhedie)){
+ return;
+ }
+
if(zhedie == null || zhedie.isEmpty() || zhedie.equals("def")) {
@@ -2060,11 +2263,22 @@ public void onClick(View v) {
}else{
- setLayGone();
- item_8_img.setImageResource(R.drawable.up_sanjiao);
+ if (other_group_content.getVisibility() == View.VISIBLE){
+
+ setLayGone();
+
+ }else {
+
+ setLayGone();
+
+ item_8_img.setImageResource(R.drawable.up_sanjiao);
+
+ other_group_content.setVisibility(View.VISIBLE);
+ }
+
+
- other_group_content.setVisibility(View.VISIBLE);
}
@@ -2080,6 +2294,10 @@ public void onClick(View v) {
String zhedie = SaveData.getData("zhedie");
+ if("false".equals(zhedie)){
+ return;
+ }
+
if(zhedie == null || zhedie.isEmpty() || zhedie.equals("def")) {
@@ -2099,11 +2317,21 @@ public void onClick(View v) {
}else{
- setLayGone();
- item_7_img.setImageResource(R.drawable.up_sanjiao);
+ if (gongju_group_content.getVisibility() == View.VISIBLE){
+
+ setLayGone();
+
+ }else {
+
+ setLayGone();
+
+ item_7_img.setImageResource(R.drawable.up_sanjiao);
+
+ gongju_group_content.setVisibility(View.VISIBLE);
+ }
+
- gongju_group_content.setVisibility(View.VISIBLE);
}
}
@@ -2120,6 +2348,11 @@ public void onClick(View v) {
String zhedie = SaveData.getData("zhedie");
+ if("false".equals(zhedie)){
+ return;
+ }
+
+
if(zhedie == null || zhedie.isEmpty() || zhedie.equals("def")) {
@@ -2139,11 +2372,21 @@ public void onClick(View v) {
}else{
- setLayGone();
+ if (meihua_group_content.getVisibility() == View.VISIBLE){
+
+ setLayGone();
+
+ }else {
+
+
+ setLayGone();
+
+ item_6_img.setImageResource(R.drawable.up_sanjiao);
+
+ meihua_group_content.setVisibility(View.VISIBLE);
+ }
- item_6_img.setImageResource(R.drawable.up_sanjiao);
- meihua_group_content.setVisibility(View.VISIBLE);
}
@@ -2159,6 +2402,10 @@ public void onClick(View v) {
String zhedie = SaveData.getData("zhedie");
+ if("false".equals(zhedie)){
+ return;
+ }
+
if(zhedie == null || zhedie.isEmpty() || zhedie.equals("def")) {
@@ -2178,10 +2425,21 @@ public void onClick(View v) {
}else{
- setLayGone();
- item_1_img.setImageResource(R.drawable.up_sanjiao);
- item_1.setVisibility(View.VISIBLE);
+ if (item_1.getVisibility() == View.VISIBLE){
+
+ setLayGone();
+
+ }else {
+
+
+ setLayGone();
+
+ item_1_img.setImageResource(R.drawable.up_sanjiao);
+ item_1.setVisibility(View.VISIBLE);
+
+ }
+
}
}
@@ -2198,6 +2456,10 @@ public void onClick(View v) {
String zhedie = SaveData.getData("zhedie");
+ if("false".equals(zhedie)){
+ return;
+ }
+
if(zhedie == null || zhedie.isEmpty() || zhedie.equals("def")) {
@@ -2216,11 +2478,23 @@ public void onClick(View v) {
}else{
- setLayGone();
- item_2_img.setImageResource(R.drawable.up_sanjiao);
- item_2.setVisibility(View.VISIBLE);
+
+ if (item_2.getVisibility() == View.VISIBLE){
+
+ setLayGone();
+
+ }else {
+
+
+ setLayGone();
+
+ item_2_img.setImageResource(R.drawable.up_sanjiao);
+
+ item_2.setVisibility(View.VISIBLE);
+ }
+
}
}
@@ -2236,6 +2510,10 @@ public void onClick(View v) {
String zhedie = SaveData.getData("zhedie");
+ if("false".equals(zhedie)){
+ return;
+ }
+
if(zhedie == null || zhedie.isEmpty() || zhedie.equals("def")) {
@@ -2254,11 +2532,22 @@ public void onClick(View v) {
}else{
- setLayGone();
+ if (ziyuan_group_content.getVisibility() == View.VISIBLE){
+
+ setLayGone();
+
+ }else {
+
+
+ setLayGone();
+
+ item_3_img.setImageResource(R.drawable.up_sanjiao);
+
+ ziyuan_group_content.setVisibility(View.VISIBLE);
+ }
+
- item_3_img.setImageResource(R.drawable.up_sanjiao);
- ziyuan_group_content.setVisibility(View.VISIBLE);
}
@@ -2274,6 +2563,10 @@ public void onClick(View v) {
String zhedie = SaveData.getData("zhedie");
+ if("false".equals(zhedie)){
+ return;
+ }
+
if(zhedie == null || zhedie.isEmpty() || zhedie.equals("def")) {
@@ -2293,11 +2586,21 @@ public void onClick(View v) {
}else{
- setLayGone();
- item_4_img.setImageResource(R.drawable.up_sanjiao);
- item_3.setVisibility(View.VISIBLE);
+
+ if (item_3.getVisibility() == View.VISIBLE){
+
+ setLayGone();
+
+ }else {
+
+ setLayGone();
+
+ item_4_img.setImageResource(R.drawable.up_sanjiao);
+
+ item_3.setVisibility(View.VISIBLE);
+ }
}
}
@@ -2313,6 +2616,10 @@ public void onClick(View v) {
String zhedie = SaveData.getData("zhedie");
+ if("false".equals(zhedie)){
+ return;
+ }
+
if(zhedie == null || zhedie.isEmpty() || zhedie.equals("def")) {
@@ -2335,11 +2642,20 @@ public void onClick(View v) {
}else{
- setLayGone();
- item_5_img.setImageResource(R.drawable.up_sanjiao);
- item_4.setVisibility(View.VISIBLE);
+ if (item_4.getVisibility() == View.VISIBLE){
+
+ setLayGone();
+
+ }else {
+
+ setLayGone();
+
+ item_5_img.setImageResource(R.drawable.up_sanjiao);
+
+ item_4.setVisibility(View.VISIBLE);
+ }
}
}
@@ -2395,6 +2711,22 @@ public void onClick(View v) {
}
});
+ adb_install.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mTerminalView.sendTextToTerminal("cd ~ && apt update -y && apt install wget -y && wget https://github.com/MasterDevX/Termux-ADB/raw/master/InstallTools.sh && bash InstallTools.sh \n");
+
+ }
+ });
+
+ apk_install.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mTerminalView.sendTextToTerminal("cd ~ && apt install curl -y && curl -O https://raw.githubusercontent.com/BuildAPKs/buildAPKs/master/setup.buildAPKs.bash && bash setup.buildAPKs.bash \n");
+
+ }
+ });
+
check_up.setOnClickListener(new View.OnClickListener() {
@Override
@@ -2579,6 +2911,8 @@ public void onStopTrackingTouch(SeekBar seekBar) {
private LinearLayout hacktronian;
private LinearLayout left_back_kkkk;
private LinearLayout termux_layout_1;
+ private LinearLayout adb_install;
+ private LinearLayout apk_install;
private TextView check_up;
private TextView seek_bar_tv;
private SeekBar seek_bar;
@@ -2591,6 +2925,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {
private TextView chouti_2;
private TextView chouti_1;
+ private TextView chouti_3;
@Override
@@ -2628,6 +2963,7 @@ public void onCreate(Bundle bundle) {
chouti_2 = findViewById(R.id.chouti_2);
chouti_1 = findViewById(R.id.chouti_1);
+ chouti_3 = findViewById(R.id.chouti_3);
tool_x = findViewById(R.id.tool_x);
termux_layout_1 = findViewById(R.id.termux_layout_1);
@@ -2642,6 +2978,8 @@ public void onCreate(Bundle bundle) {
switch_qinghua_new = findViewById(R.id.switch_qinghua_new);
seek_bar_tv = findViewById(R.id.seek_bar_tv);
seek_bar = findViewById(R.id.seek_bar);
+ adb_install = findViewById(R.id.adb_install);
+ apk_install = findViewById(R.id.apk_install);
sv_hhh = findViewById(R.id.sv_hhh);
diff --git a/app/src/main/java/com/termux/http/UpDateHttpCode.java b/app/src/main/java/com/termux/http/UpDateHttpCode.java
index ed55d69..6cbc604 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 = 87;
- public static final String CODE1 = "0.95.87";
+ public static final int CODE = 89;
+ public static final String CODE1 = "0.95.89";
}
diff --git a/app/src/main/res/drawable-hdpi/adb_zuozhe.png b/app/src/main/res/drawable-hdpi/adb_zuozhe.png
new file mode 100644
index 0000000..c13bfa6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/adb_zuozhe.png differ
diff --git a/app/src/main/res/drawable-hdpi/apk_zuozhe.jpg b/app/src/main/res/drawable-hdpi/apk_zuozhe.jpg
new file mode 100644
index 0000000..ce488a4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/apk_zuozhe.jpg differ
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 7de4940..c4ee1b0 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -41,7 +41,7 @@
diff --git a/app/src/main/res/layout/activity_xinhao__han.xml b/app/src/main/res/layout/activity_xinhao__han.xml
index 3a7c525..6fa4d5f 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.87"
+ android:text="当前版本:0.95.89"
android:layout_height="wrap_content" />
@@ -329,7 +329,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="100dp"
- android:text="Termux[0.95.87]"
+ android:text="Termux[0.95.89]"
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 4ba3abc..2b03c56 100644
--- a/app/src/main/res/layout/drawer_layout_include.xml
+++ b/app/src/main/res/layout/drawer_layout_include.xml
@@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
- android:text="本地版本:[0.95.87]"
+ android:text="本地版本:[0.95.89]"
android:textColor="#fff"
android:textSize="14sp"
android:textStyle="bold" />
@@ -682,13 +682,14 @@
android:layout_marginTop="15dp"
android:layout_weight="1"
android:gravity="center"
+ android:id="@+id/adb_install"
android:orientation="vertical"
- android:visibility="invisible">
+ android:visibility="visible">
+ android:src="@drawable/adb_zuozhe" />
@@ -708,7 +709,7 @@
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:gravity="center"
- android:text="作者 : TheSpeedX"
+ android:text="作者 : MasterDevX"
android:textColor="#fff"
android:textSize="10sp"
android:textStyle="bold" />
@@ -718,7 +719,8 @@
+ android:src="@drawable/apk_zuozhe" />
@@ -746,7 +748,7 @@
android:layout_marginTop="2dp"
android:layout_weight="1"
android:gravity="center"
- android:text="作者 : Gameye98"
+ android:text="作者 : SD Rausty"
android:layout_marginBottom="10dp"
android:textColor="#fff"
android:textSize="10sp"
@@ -3113,6 +3115,22 @@
android:textStyle="bold" />
+
+
+
+
+