diff --git a/winboll/build.properties b/winboll/build.properties index 3427cb7..58310b6 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jan 13 16:53:24 HKT 2026 +#Mon Jan 19 03:20:58 GMT 2026 stageCount=11 libraryProject= baseVersion=15.11 publishVersion=15.11.10 -buildCount=0 +buildCount=5 baseBetaVersion=15.11.11 diff --git a/winboll/src/main/AndroidManifest.xml b/winboll/src/main/AndroidManifest.xml index 8236f00..6fac454 100644 --- a/winboll/src/main/AndroidManifest.xml +++ b/winboll/src/main/AndroidManifest.xml @@ -1,7 +1,8 @@ + package="cc.winboll.studio.winboll" + android:sharedUserId="com.termux"> @@ -282,6 +283,8 @@ + + - \ No newline at end of file + diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java index a8e81f9..356a756 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -1,6 +1,5 @@ package cc.winboll.studio.winboll; -import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.os.Handler; @@ -10,7 +9,6 @@ import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; -import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; import cc.winboll.studio.libaes.models.DrawerMenuBean; import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libappbase.LogUtils; @@ -18,6 +16,7 @@ import cc.winboll.studio.winboll.R; import cc.winboll.studio.winboll.activities.AboutActivity; import cc.winboll.studio.winboll.activities.SettingsActivity; import cc.winboll.studio.winboll.fragments.BrowserFragment; +import cc.winboll.studio.winboll.unittest.TermuxEnvTestActivity; import java.util.ArrayList; public class MainActivity extends DrawerFragmentActivity { @@ -129,6 +128,7 @@ public class MainActivity extends DrawerFragmentActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.toolbar_main, menu); + getMenuInflater().inflate(R.menu.toolbar_termux, menu); return super.onCreateOptionsMenu(menu); } @@ -158,6 +158,10 @@ public class MainActivity extends DrawerFragmentActivity { } else if (nItemId == R.id.item_about) { Intent intent = new Intent(getApplicationContext(), AboutActivity.class); + WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class); + } else if (nItemId == R.id.item_termux_env_test) { + Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class); + WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class); } else { return super.onOptionsItemSelected(item); diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/unittest/TermuxEnvTestActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/unittest/TermuxEnvTestActivity.java new file mode 100644 index 0000000..5b15027 --- /dev/null +++ b/winboll/src/main/java/cc/winboll/studio/winboll/unittest/TermuxEnvTestActivity.java @@ -0,0 +1,56 @@ +package cc.winboll.studio.winboll.unittest; + +import android.os.Bundle; +import android.view.View; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.winboll.MainActivity; +import cc.winboll.studio.winboll.R; +import cc.winboll.studio.winboll.activities.BaseWinBoLLActivity; + +/** + * @Author 豆包&ZhanGSKen + * @Date 2026/01/19 11:11 + * @Describe Termux 环境测试 + */ +public class TermuxEnvTestActivity extends BaseWinBoLLActivity { + + public static final String TAG = "TermuxEnvTestActivity"; + + private Toolbar mToolbar; + + @Override + public String getTag() { + return TAG; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_termux_env_test); + initToolbar(); + } + + private void initToolbar() { + LogUtils.d(TAG, "initToolbar() 开始初始化"); + mToolbar = (Toolbar) findViewById(R.id.toolbar); + if (mToolbar == null) { + LogUtils.e(TAG, "initToolbar() | Toolbar未找到"); + return; + } + setSupportActionBar(mToolbar); + mToolbar.setSubtitle(getTag()); + ((AppCompatActivity)getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true); + mToolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + LogUtils.d(TAG, "导航栏 点击返回按钮"); + getActivity().finish(); + WinBoLLActivityManager.getInstance().startWinBoLLActivity(getActivity(), MainActivity.class); + } + }); + LogUtils.d(TAG, "initToolbar() 配置完成"); + } +} diff --git a/winboll/src/main/res/layout/activity_termux_env_test.xml b/winboll/src/main/res/layout/activity_termux_env_test.xml new file mode 100644 index 0000000..9029a06 --- /dev/null +++ b/winboll/src/main/res/layout/activity_termux_env_test.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/winboll/src/main/res/menu/toolbar_termux.xml b/winboll/src/main/res/menu/toolbar_termux.xml new file mode 100644 index 0000000..28e17a6 --- /dev/null +++ b/winboll/src/main/res/menu/toolbar_termux.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/winboll/src/main/res/xml/network_security_config.xml b/winboll/src/main/res/xml/network_security_config.xml index e0ea145..84e403f 100644 --- a/winboll/src/main/res/xml/network_security_config.xml +++ b/winboll/src/main/res/xml/network_security_config.xml @@ -11,5 +11,11 @@ + + + 127.0.0.1 + localhost + +