Studio/WinBoLL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整Termux 调用模块 UI显示与环境参数配置。

Browse Source
This commit is contained in:
ZhangShaojian
2026-03-15 13:45:49 +08:00
parent 1512b76c36
commit a076fe50cd
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
winboll/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sun Mar 15 11:48:40 HKT 2026 #Sun Mar 15 05:42:10 GMT 2026
stageCount=26 stageCount=26
libraryProject= libraryProject=
baseVersion=15.11 baseVersion=15.11
publishVersion=15.11.25 publishVersion=15.11.25
buildCount=0 buildCount=8
baseBetaVersion=15.11.26 baseBetaVersion=15.11.26

2
winboll/src/main/java/cc/winboll/studio/winboll/termux/NfcTermuxBridgeActivity.java
View File

@@ -88,7 +88,7 @@ public class NfcTermuxBridgeActivity extends Activity {
public static void testCommand(Context context) { public static void testCommand(Context context) {
try { try {
// 测试用指令 // 测试用指令
String testJson = "{\"script\":\"BuildWinBoLLProject.sh\",\"args\":[\"WinBoLL_Demo\"],\"workDir\":null,\"background\":true,\"resultDir\":null}"; String testJson = "{\"script\":\"BuildWinBoLLProject.sh\",\"args\":[\"DebugTemp\"],\"workDir\":null,\"background\":true,\"resultDir\":null}";
Intent testIntent = new Intent(context, NfcTermuxBridgeActivity.class); Intent testIntent = new Intent(context, NfcTermuxBridgeActivity.class);
testIntent.putExtra(Intent.EXTRA_TEXT, testJson); testIntent.putExtra(Intent.EXTRA_TEXT, testJson);

10
winboll/src/main/java/cc/winboll/studio/winboll/unittest/TermuxEnvTestActivity.java
View File

@@ -38,8 +38,8 @@ public class TermuxEnvTestActivity extends BaseWinBoLLActivity {
// 常量属性（置顶排列） // 常量属性（置顶排列）
public static final String TAG = "TermuxEnvTestActivity"; public static final String TAG = "TermuxEnvTestActivity";
private static final String TERMUX_HOME_PATH = "/sdcard/WinBoLLStudio"; private static final String TERMUX_HOME_PATH = "/data/data/com.termux/files/home/TermuxWorkSpaces";
private static final String CMD_RESULT_FILE = TERMUX_HOME_PATH + "/.authcenter_cmd_result.tmp"; private static final String CMD_RESULT_FILE = TERMUX_HOME_PATH + "/CMD_RESULT_FILE.log";
// 成员属性（常量后排列） // 成员属性（常量后排列）
private Toolbar mToolbar; private Toolbar mToolbar;
@@ -158,7 +158,7 @@ public class TermuxEnvTestActivity extends BaseWinBoLLActivity {
/** /**
* 测试执行Gradle命令（实时输出版，唤起Termux窗口） * 测试执行Gradle命令（实时输出版，唤起Termux窗口）
*/ */
public void onTestTermuxCMD(View view) { public void onTestTermuxGradleBuildCMD(View view) {
LogUtils.d(TAG, "onTestTermuxCMD() 按钮点击，执行Gradle命令（实时输出）"); LogUtils.d(TAG, "onTestTermuxCMD() 按钮点击，执行Gradle命令（实时输出）");
tvMessage.append("\n【测试：执行Gradle命令（实时输出）】\n"); tvMessage.append("\n【测试：执行Gradle命令（实时输出）】\n");
@@ -171,7 +171,7 @@ public class TermuxEnvTestActivity extends BaseWinBoLLActivity {
// 2. 定义核心路径（确保路径与Termux中一致） // 2. 定义核心路径（确保路径与Termux中一致）
String gradleFullPath = "/data/data/com.termux/files/home/gradle/gradle-7.5.1/bin/gradle"; String gradleFullPath = "/data/data/com.termux/files/home/gradle/gradle-7.5.1/bin/gradle";
String projectPath = TERMUX_HOME_PATH + "/Sources/WinBoLL"; // 项目目录 String projectPath = TERMUX_HOME_PATH + "/Sources/DebugTemp"; // 项目目录
// 3. 构造命令（核心：用stdbuf禁用缓冲，实现实时输出） // 3. 构造命令（核心：用stdbuf禁用缓冲，实现实时输出）
String targetCmd = ""; String targetCmd = "";
@@ -235,7 +235,7 @@ public class TermuxEnvTestActivity extends BaseWinBoLLActivity {
// 2. 定义核心路径（确保路径与Termux中一致） // 2. 定义核心路径（确保路径与Termux中一致）
String gradleFullPath = "/data/data/com.termux/files/home/gradle/gradle-7.5.1/bin/gradle"; String gradleFullPath = "/data/data/com.termux/files/home/gradle/gradle-7.5.1/bin/gradle";
String projectPath = TERMUX_HOME_PATH + "/Sources/WinBoLL"; // 项目目录 String projectPath = TERMUX_HOME_PATH + "/"; // 项目目录
// 3. 构造命令（核心：用stdbuf禁用缓冲，实现实时输出） // 3. 构造命令（核心：用stdbuf禁用缓冲，实现实时输出）
String targetCmd = ""; String targetCmd = "";

8
winboll/src/main/res/layout/activity_termux_env_test.xml
View File

@@ -18,24 +18,28 @@
android:gravity="right"> android:gravity="right">
<Button <Button
android:textAllCaps="false"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Open Termux Bash" android:text="Open Termux Bash"
android:onClick="onOpenTermuxBash"/> android:onClick="onOpenTermuxBash"/>
<Button <Button
android:textAllCaps="false"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TestTermuxCMD" android:text="Test Termux Gradle Build CMD"
android:onClick="onTestTermuxCMD"/> android:onClick="onTestTermuxGradleBuildCMD"/>
<Button <Button
android:textAllCaps="false"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Test Termux Env" android:text="Test Termux Env"
android:onClick="onTestTermuxEnv"/> android:onClick="onTestTermuxEnv"/>
<Button <Button
android:textAllCaps="false"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Test WinBoLL Project Build" android:text="Test WinBoLL Project Build"