恢复winboll项目文件为当前origin/winboll分支最新提交版

winboll/build.gradle

@@ -31,7 +31,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.11"
+        versionName "15.20"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-    
+	api project(':libwinboll')
     api 'com.google.code.gson:gson:2.10.1'
 	
 	// 下拉控件
@@ -67,8 +67,6 @@ dependencies {
     api 'io.github.medyo:android-about-page:2.0.0'
 	// 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
-	// OkHttp网络请求
-     implementation 'com.squareup.okhttp3:okhttp:3.14.9'
      // FastJSON解析
      implementation 'com.alibaba:fastjson:1.2.76'
     
@@ -86,7 +84,6 @@ dependencies {
      //注意：以下5个库必须要引入
     //implementation 'androidx.appcompat:appcompat:1.4.1'
     api 'androidx.recyclerview:recyclerview:1.0.0'
-    api 'com.google.code.gson:gson:2.8.5'
     api 'com.github.bumptech.glide:glide:4.9.0'
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 
@@ -107,13 +104,5 @@ dependencies {
 	implementation 'com.termux:terminal-view:0.118.0'
 	implementation 'com.termux:termux-shared:0.118.0'
 	
-	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.15.2'
-    api 'cc.winboll.studio:libappbase:15.15.11'
-	
-	// WinBoLL备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:AES:aes-v15.15.7'
-	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4'
-	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

winboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed May 06 13:39:52 CST 2026
+#Wed May 13 13:48:00 CST 2026
-stageCount=27
+stageCount=2
-libraryProject=
+libraryProject=libwinboll
-baseVersion=15.11
+baseVersion=15.20
-publishVersion=15.11.26
+publishVersion=15.20.1
-buildCount=22
+buildCount=2
-baseBetaVersion=15.11.27
+baseBetaVersion=15.20.2

winboll/src/beta/res/layout/activity_ollama_window.xml

@@ -29,13 +29,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="16dp" android:background="@drawable/bg_container_border">
+            android:padding="16dp">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Ollama 模型对话"
-                
+                android:textColor="#FFFFFF"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
@@ -43,13 +43,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:orientation="vertical" android:background="@drawable/bg_container_border">
+                android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="系统提示："
-                     />
+                    android:textColor="#B0B0B0" />
 
                 <EditText
                     android:id="@+id/etSystemPrompt"
@@ -57,7 +57,7 @@
                     android:layout_height="100dp"
                     android:background="#2D2D2D"
                     android:hint="请输入系统提示"
-                    
+                    android:textColor="#FFFFFF"
                     android:textColorHint="#666666"
                     android:gravity="top|start"
                     android:inputType="textMultiLine" />
@@ -67,7 +67,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:text="模型名称："
-                     />
+                    android:textColor="#B0B0B0" />
 
                 <EditText
                     android:id="@+id/etModelName"
@@ -76,7 +76,7 @@
                     android:background="#2D2D2D"
                     android:hint="llama3"
                     android:text="llama3"
-                    
+                    android:textColor="#FFFFFF"
                     android:textColorHint="#666666"
                     android:singleLine="true" />
 
@@ -85,7 +85,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="系统消息："
-                     />
+                    android:textColor="#B0B0B0" />
 
                 <EditText
                     android:id="@+id/etUserMessage"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:orientation="horizontal" android:background="@drawable/bg_container_border">
+                android:orientation="horizontal">
 
                 <Button
                     android:id="@+id/btnSend"
@@ -120,7 +120,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="3"
                     android:text="发送"
-                     />
+                    android:textColor="#FFFFFF" />
 
                 <Button
                     android:id="@+id/btnStop"
@@ -129,7 +129,7 @@
                     android:layout_marginStart="8dp"
                     android:layout_weight="1"
                     android:text="停止"
-                     />
+                    android:textColor="#FF5252" />
 
             </LinearLayout>
 

winboll/src/main/AndroidManifest.xml

@@ -15,14 +15,13 @@
     <uses-permission android:name="android.permission.REORDER_TASKS"/>
 
     <!-- 计算应用存储空间 -->
-    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
+    <uses-permission
+        android:name="android.permission.GET_PACKAGE_SIZE"/>
 
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission"/>
 
-    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
-
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"

winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java

@@ -11,6 +11,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.models.DrawerMenuBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.winboll.R;
@@ -36,33 +37,32 @@ public class MainActivity extends DrawerFragmentActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(this));
         super.onCreate(savedInstanceState);
-        // ------------------- 新增：初始化MainActivity的Handler（关键） -------------------
         initMainHandler();
-
         if (mBrowserFragment == null) {
             String externalUrl = extractExternalUrl(getIntent());
             if (externalUrl != null) {
                 mBrowserFragment = BrowserFragment.newInstance(externalUrl);
             } else {
-                mBrowserFragment = new BrowserFragment();
+                mBrowserFragment = BrowserFragment.newInstance();
             }
             addFragment(mBrowserFragment);
         }
         showFragment(mBrowserFragment);
     }
 
-    @Override
+//    @Override
-    protected void onNewIntent(Intent intent) {
+//    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
+//        super.onNewIntent(intent);
-        String externalUrl = extractExternalUrl(intent);
+//        String externalUrl = extractExternalUrl(intent);
-        if (externalUrl != null && mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
+//        if (externalUrl != null && mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
-            Message msg = Message.obtain();
+//            Message msg = Message.obtain();
-            msg.what = BrowserFragment.MSG_OPEN_URL;
+//            msg.what = BrowserFragment.MSG_OPEN_URL;
-            msg.obj = externalUrl;
+//            msg.obj = externalUrl;
-            mBrowserFragment.getBrowserHandler().sendMessage(msg);
+//            mBrowserFragment.getBrowserHandler().sendMessage(msg);
-        }
+//        }
-    }
+//    }
 
     private String extractExternalUrl(Intent intent) {
         if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) {
@@ -170,9 +170,11 @@ public class MainActivity extends DrawerFragmentActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        if (AESThemeUtil.onWinBoLLThemeItemSelected(this, item)) {
+            recreate();
+        } else {
             int nItemId = item.getItemId();
             if (nItemId == R.id.item_home) {
-			// 发送MSG_HOMEPAGE消息给BrowserFragment
                 if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
                     Message msg = Message.obtain();
                     msg.what = BrowserFragment.MSG_HOMEPAGE;
@@ -182,7 +184,6 @@ public class MainActivity extends DrawerFragmentActivity {
                 WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
             } 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_mytermux) {
                 Intent intent = new Intent(getApplicationContext(), MyTermuxActivity.class);
@@ -190,12 +191,14 @@ public class MainActivity extends DrawerFragmentActivity {
                 startActivity(intent);
             } else if (nItemId == R.id.item_termux_env_test) {
                 Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class);
-
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+            } else if (nItemId == R.id.item_library_activity) {
+                Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class);
                 WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
             } else {
                 return super.onOptionsItemSelected(item);
             }
-
+        }
         return true;
     }
 

winboll/src/main/java/cc/winboll/studio/winboll/activities/BaseWinBoLLActivity.java

@@ -5,8 +5,8 @@ import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.models.AESThemeBean;
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.winboll.theme.WinBoLLThemeUtil;
 
 /**
  * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
@@ -29,16 +29,11 @@ public abstract class BaseWinBoLLActivity extends AppCompatActivity implements I
     }
 
     AESThemeBean.ThemeType getThemeType() {
-        /*SharedPreferences sharedPreferences = getSharedPreferences(
+        return WinBoLLThemeUtil.getThemeStyleType(WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
-         SHAREDPREFERENCES_NAME, MODE_PRIVATE);
-         return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))];
-         */
-        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
     }
 
     void setThemeStyle() {
-        //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
+        setTheme(WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
-        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
     }
 
     @Override

winboll/src/main/java/cc/winboll/studio/winboll/applications/MyTermuxActivity.java

@@ -1,31 +1,46 @@
 package cc.winboll.studio.winboll.applications;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.winboll.R;
+import cc.winboll.studio.winboll.models.TermuxButtonManager;
+import cc.winboll.studio.winboll.models.TermuxButtonModel;
 import cc.winboll.studio.winboll.termux.TermuxCommandExecutor;
+import java.util.ArrayList;
 
 public class MyTermuxActivity extends AppCompatActivity {
 
     public static final String TAG = "MyTermuxActivity";
 
     private Toolbar mToolbar;
-    private Button mTermuxButton;
+    private ListView mListView;
-	private Button mTermuxWorkSpacesButton;
+    private Button mBtnAdd;
+    private ButtonAdapter mAdapter;
+    private ArrayList<TermuxButtonModel> mButtonList;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_my_termux);
 
-        // 初始化工具栏
         initToolbar();
-        // 初始化按钮
+        initListView();
-        initView();
+        initAddButton();
+        refreshList();
     }
 
     private void initToolbar() {
@@ -36,42 +51,187 @@ public class MyTermuxActivity extends AppCompatActivity {
             mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-						LogUtils.d(TAG, "点击返回按钮");
                     finish();
                 }
             });
-            LogUtils.d(TAG, "工具栏初始化完成");
         }
     }
 
-    private void initView() {
+    private void initListView() {
-        mTermuxButton = findViewById(R.id.btn_termux);
+        mListView = findViewById(R.id.list_termux_buttons);
-        if (mTermuxButton != null) {
+        mButtonList = new ArrayList<TermuxButtonModel>();
-            mTermuxButton.setOnClickListener(new View.OnClickListener() {
+        mAdapter = new ButtonAdapter();
+        mListView.setAdapter(mAdapter);
+
+        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
-					public void onClick(View v) {
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-						LogUtils.d(TAG, "点击 Termux 按钮");
+                TermuxButtonModel model = mButtonList.get(position);
-						TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this, "cd ~");
+                TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this,
-						//TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this, "cd ~/TermuxWorkSpaces", "./TermuxWorkSpaces");
+                    model.getExeCommand(), model.getWorkDir());
             }
         });
-            LogUtils.d(TAG, "Termux 按钮初始化完成");
-        }
 
-		mTermuxWorkSpacesButton = findViewById(R.id.btn_termuxworkspaces);
+        mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
-        if (mTermuxWorkSpacesButton != null) {
-            mTermuxWorkSpacesButton.setOnClickListener(new View.OnClickListener() {
             @Override
-					public void onClick(View v) {
+            public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-						LogUtils.d(TAG, "点击 TermuxWorkSpaces 按钮");
+                showContextMenu(position);
-						TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this, "cd ~/TermuxWorkSpaces", "./TermuxWorkSpaces");
+                return true;
             }
         });
-            LogUtils.d(TAG, "TermuxWorkSpaces 按钮初始化完成");
-        }
     }
 
-    private boolean isTermuxAvailable() {
+    private void initAddButton() {
-        return TermuxCommandExecutor.isTermuxInstalled(this);
+        mBtnAdd = findViewById(R.id.btn_add_termux_button);
+        mBtnAdd.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showButtonDialog(-1, null);
+            }
+        });
+    }
+
+    private void refreshList() {
+        mButtonList.clear();
+        ArrayList<TermuxButtonModel> loaded = TermuxButtonManager.loadButtons(this);
+        if (loaded != null) {
+            mButtonList.addAll(loaded);
+        }
+        mAdapter.notifyDataSetChanged();
+    }
+
+    private void showContextMenu(final int position) {
+        final TermuxButtonModel model = mButtonList.get(position);
+        String[] items = new String[]{
+            getString(R.string.menu_execute),
+            getString(R.string.menu_edit),
+            getString(R.string.menu_delete),
+            getString(R.string.menu_cancel)
+        };
+        new AlertDialog.Builder(this)
+            .setTitle(model.getButtonName())
+            .setItems(items, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    if (which == 0) {
+                        TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this,
+                            model.getExeCommand(), model.getWorkDir());
+                    } else if (which == 1) {
+                        showButtonDialog(position, model);
+                    } else if (which == 2) {
+                        showDeleteConfirmDialog(position);
+                    }
+                }
+            })
+            .show();
+    }
+
+    private void showDeleteConfirmDialog(final int position) {
+        new AlertDialog.Builder(this)
+            .setTitle(getString(R.string.dialog_delete_title))
+            .setMessage(getString(R.string.dialog_delete_message) + mButtonList.get(position).getButtonName())
+            .setPositiveButton(getString(R.string.dialog_confirm), new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    TermuxButtonManager.deleteButton(MyTermuxActivity.this, mButtonList, position);
+                    refreshList();
+                    Toast.makeText(MyTermuxActivity.this, R.string.toast_deleted, Toast.LENGTH_SHORT).show();
+                }
+            })
+            .setNegativeButton(getString(R.string.dialog_cancel), null)
+            .show();
+    }
+
+    private void showButtonDialog(final int index, final TermuxButtonModel model) {
+        final boolean isEdit = (model != null);
+
+        LinearLayout layout = new LinearLayout(this);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.setPadding(40, 20, 40, 20);
+
+        final EditText etName = new EditText(this);
+        etName.setHint(R.string.hint_button_name);
+        if (model != null) {
+            etName.setText(model.getButtonName());
+        }
+        layout.addView(etName);
+
+        final EditText etCommand = new EditText(this);
+        etCommand.setHint(R.string.hint_exe_command);
+        if (model != null) {
+            etCommand.setText(model.getExeCommand());
+        }
+        layout.addView(etCommand);
+
+        final EditText etWorkDir = new EditText(this);
+        etWorkDir.setHint(R.string.hint_work_dir);
+        if (model != null) {
+            etWorkDir.setText(model.getWorkDir());
+        }
+        layout.addView(etWorkDir);
+
+        int titleResId = isEdit ? R.string.dialog_edit_title : R.string.dialog_add_title;
+        new AlertDialog.Builder(this)
+            .setTitle(titleResId)
+            .setView(layout)
+            .setPositiveButton(getString(R.string.dialog_save), new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    String name = etName.getText().toString().trim();
+                    String command = etCommand.getText().toString().trim();
+                    String workDir = etWorkDir.getText().toString().trim();
+                    if (name.isEmpty() || command.isEmpty()) {
+                        Toast.makeText(MyTermuxActivity.this, R.string.toast_fields_required, Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+                    TermuxButtonModel newModel = new TermuxButtonModel();
+                    newModel.setButtonName(name);
+                    newModel.setExeCommand(command);
+                    newModel.setWorkDir(workDir);
+                    if (isEdit) {
+                        TermuxButtonManager.updateButton(MyTermuxActivity.this, mButtonList, index, newModel);
+                    } else {
+                        TermuxButtonManager.addButton(MyTermuxActivity.this, mButtonList, newModel);
+                    }
+                    refreshList();
+                }
+            })
+            .setNegativeButton(getString(R.string.dialog_cancel), null)
+            .show();
+    }
+
+    private class ButtonAdapter extends BaseAdapter {
+        @Override
+        public int getCount() {
+            return mButtonList.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mButtonList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            TextView tv;
+            if (convertView == null) {
+                tv = new TextView(MyTermuxActivity.this);
+                tv.setPadding(30, 20, 30, 20);
+                tv.setTextSize(16);
+                tv.setMinHeight(80);
+            } else {
+                tv = (TextView) convertView;
+            }
+
+            TermuxButtonModel model = mButtonList.get(position);
+            tv.setText(model.getButtonName() + "\n" + model.getExeCommand());
+            tv.setTextColor(getResources().getColor(android.R.color.white));
+            return tv;
+        }
     }
 }

winboll/src/main/java/cc/winboll/studio/winboll/models/TermuxButtonManager.java

@@ -0,0 +1,37 @@
+package cc.winboll.studio.winboll.models;
+
+import android.content.Context;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.util.ArrayList;
+
+public class TermuxButtonManager {
+
+    public static ArrayList<TermuxButtonModel> loadButtons(Context context) {
+        ArrayList<TermuxButtonModel> list = new ArrayList<TermuxButtonModel>();
+        BaseBean.loadBeanList(context, list, TermuxButtonModel.class);
+        return list;
+    }
+
+    public static boolean saveButtons(Context context, ArrayList<TermuxButtonModel> list) {
+        return BaseBean.saveBeanList(context, list, TermuxButtonModel.class);
+    }
+
+    public static void addButton(Context context, ArrayList<TermuxButtonModel> list, TermuxButtonModel button) {
+        list.add(button);
+        saveButtons(context, list);
+    }
+
+    public static void updateButton(Context context, ArrayList<TermuxButtonModel> list, int index, TermuxButtonModel button) {
+        if (index >= 0 && index < list.size()) {
+            list.set(index, button);
+            saveButtons(context, list);
+        }
+    }
+
+    public static void deleteButton(Context context, ArrayList<TermuxButtonModel> list, int index) {
+        if (index >= 0 && index < list.size()) {
+            list.remove(index);
+            saveButtons(context, list);
+        }
+    }
+}

winboll/src/main/java/cc/winboll/studio/winboll/theme/WinBoLLThemeBean.java

@@ -0,0 +1,49 @@
+package cc.winboll.studio.winboll.theme;
+
+import cc.winboll.studio.libaes.models.AESThemeBean;
+import cc.winboll.studio.winboll.R;
+
+public class WinBoLLThemeBean {
+
+    public static final String TAG = "WinBoLLThemeBean";
+
+    public static int getDefaultThemeStyleID() {
+        return R.style.MyAppTheme;
+    }
+
+    public static int getThemeStyleID(AESThemeBean.ThemeType themeType) {
+        int themeStyleID = getDefaultThemeStyleID();
+        if (AESThemeBean.ThemeType.DEPTH == themeType) {
+            themeStyleID = R.style.MyDepthAppTheme;
+        } else if (AESThemeBean.ThemeType.SKY == themeType) {
+            themeStyleID = R.style.MySkyAppTheme;
+        } else if (AESThemeBean.ThemeType.GOLDEN == themeType) {
+            themeStyleID = R.style.MyGoldenAppTheme;
+        } else if (AESThemeBean.ThemeType.BEARING == themeType) {
+            themeStyleID = R.style.MyBearingAppTheme;
+        } else if (AESThemeBean.ThemeType.MEMOR == themeType) {
+            themeStyleID = R.style.MyMemorAppTheme;
+        } else if (AESThemeBean.ThemeType.TAO == themeType) {
+            themeStyleID = R.style.MyTaoAppTheme;
+        }
+        return themeStyleID;
+    }
+
+    public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) {
+        AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.AES;
+        if (R.style.MyDepthAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.DEPTH;
+        } else if (R.style.MySkyAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.SKY;
+        } else if (R.style.MyGoldenAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.GOLDEN;
+        } else if (R.style.MyBearingAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.BEARING;
+        } else if (R.style.MyMemorAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.MEMOR;
+        } else if (R.style.MyTaoAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.TAO;
+        }
+        return themeStyle;
+    }
+}

winboll/src/main/java/cc/winboll/studio/winboll/theme/WinBoLLThemeUtil.java

@@ -0,0 +1,36 @@
+package cc.winboll.studio.winboll.theme;
+
+import android.content.Context;
+import cc.winboll.studio.libaes.models.AESThemeBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+
+public class WinBoLLThemeUtil {
+
+    public static final String TAG = "WinBoLLThemeUtil";
+
+    public static int getThemeTypeID(Context context) {
+        AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
+        int themeTypeID;
+        if (bean == null) {
+            themeTypeID = WinBoLLThemeBean.getDefaultThemeStyleID();
+        } else {
+            int aesStyleID = bean.getCurrentThemeTypeID();
+            AESThemeBean.ThemeType themeType = WinBoLLThemeBean.getThemeStyleType(aesStyleID);
+            themeTypeID = WinBoLLThemeBean.getThemeStyleID(themeType);
+        }
+        return themeTypeID;
+    }
+
+    public static void saveThemeStyleID(Context context, int nThemeTypeID) {
+        AESThemeBean bean = new AESThemeBean(nThemeTypeID);
+        AESThemeBean.saveBean(context, bean);
+    }
+
+    public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) {
+        return WinBoLLThemeBean.getThemeStyleType(nThemeStyleID);
+    }
+
+    public static int getThemeStyleID(AESThemeBean.ThemeType themeType) {
+        return WinBoLLThemeBean.getThemeStyleID(themeType);
+    }
+}

winboll/src/main/res/drawable/bg_shadow.xml

@@ -12,7 +12,11 @@
                 android:angle="270" 
                 android:endColor="#0F000000" 
                 android:startColor="#0F000000" /> 
-            <corners android:radius="?attr/borderCornerRadius" />
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
         </shape> 
     </item> 
     <!-- 背景部分 --> 
@@ -27,7 +31,11 @@
                 android:angle="270" 
                 android:endColor="@color/colorAccent" 
                 android:startColor="@color/colorAccent" /> 
-            <corners android:radius="?attr/borderCornerRadius" />
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
         </shape> 
     </item> 
 </layer-list>

winboll/src/main/res/layout/activity_about.xml

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
+	android:layout_height="match_parent">
 
 	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"

winboll/src/main/res/layout/activity_logon.xml

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
+	android:layout_height="match_parent">
 
     <LinearLayout
         android:orientation="horizontal"
@@ -13,23 +13,21 @@
         android:layout_gravity="right"
         android:gravity="right"
         android:padding="10dp"
-        android:id="@+id/ll_hostbar" android:background="@drawable/bg_container_border">
+        android:id="@+id/ll_hostbar">
 
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="10.8.0.250:456"
             android:id="@+id/rb_debughost"
-            android:onClick="onSwitchHost"
+            android:onClick="onSwitchHost"/>
-            android:textColor="?android:attr/textColorPrimary"/>
 
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="yun.winboll.cc"
             android:id="@+id/rb_yunhost"
-            android:onClick="onSwitchHost"
+            android:onClick="onSwitchHost"/>
-            android:textColor="?android:attr/textColorPrimary"/>
 
 	</LinearLayout>
     
@@ -37,7 +35,7 @@
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:gravity="right" android:background="@drawable/bg_container_border">
+		android:gravity="right">
 
 		<Button
 			android:layout_width="wrap_content"
@@ -57,7 +55,7 @@
 		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0" android:background="@drawable/bg_container_border">
+		android:layout_weight="1.0">
 
 		<cc.winboll.studio.libappbase.LogView
 			android:layout_width="match_parent"

winboll/src/main/res/layout/activity_main.xml

@@ -4,14 +4,14 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:orientation="vertical" android:background="@drawable/bg_container_border">
+	android:orientation="vertical">
 
 	<LinearLayout
 		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1.0"
-		android:gravity="center_vertical|center_horizontal" android:background="@drawable/bg_container_border">
+		android:gravity="center_vertical|center_horizontal">
 
 		<TextView
 			android:layout_width="wrap_content"
@@ -25,7 +25,7 @@
 		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0" android:background="@drawable/bg_container_border">
+		android:layout_weight="1.0">
 
 		<cc.winboll.studio.libappbase.LogView
 			android:layout_width="match_parent"

winboll/src/main/res/layout/activity_my_termux.xml

@@ -4,8 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="match_parent">
-	android:gravity="top" android:background="@drawable/bg_container_border">
 
 	<androidx.appcompat.widget.Toolbar
 		android:id="@+id/toolbar"
@@ -17,74 +16,20 @@
 		app:titleTextColor="@android:color/white"
 		app:subtitleTextColor="@android:color/white"/>
 
-	<ScrollView
+	<ListView
+		android:id="@+id/list_termux_buttons"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0" android:background="@drawable/bg_container_border">
+		android:layout_weight="1.0"
-
+		android:divider="@android:color/darker_gray"
-		<LinearLayout
+		android:dividerHeight="1dp"/>
-			android:orientation="vertical"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
-
-				<HorizontalScrollView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.0" android:background="@drawable/bg_container_border">
-
-					<LinearLayout
-						android:orientation="horizontal"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
-
-						<cc.winboll.studio.winboll.views.TermuxButton
-							android:id="@+id/btn_termux"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:text="Termux"
-							android:textSize="18sp"
-							android:padding="16dp"
-							android:backgroundTint="@android:color/holo_blue_dark"
-							app:exeCommand="cd ~"
-							app:workDir="~"
-							app:isCommitted="true"
-							app:commitTitle="打开 Termux"
-							app:commitInfo="打开 Termux 应用"/>
-
-						<cc.winboll.studio.winboll.views.TermuxButton
-							android:id="@+id/btn_termuxworkspaces"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:text="TermuxWorkSpaces"
-							android:textSize="18sp"
-							android:padding="16dp"
-							android:backgroundTint="@android:color/holo_blue_dark"
-							app:exeCommand="cd ~/TermuxWorkSpaces"
-							app:workDir="~"
-							app:isCommitted="false"
-							app:commitTitle="打开 TermuxWorkSpaces"
-							app:commitInfo="打开 Termux 应用，进入 TermuxWorkSpaces 目录。"/>
-
-					</LinearLayout>
-
-				</HorizontalScrollView>
 
 	<Button
-					android:layout_width="wrap_content"
+		android:id="@+id/btn_add_termux_button"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-					android:text="+"
+		android:text="@string/add_termux_button"
-					android:id="@+id/btn_addtermuxbutton"/>
+		android:textSize="16sp"
+		android:padding="12dp"/>
 
 </LinearLayout>
-
-		</LinearLayout>
-
-	</ScrollView>
-
-</LinearLayout>
-

winboll/src/main/res/layout/activity_new.xml

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
+	android:layout_height="match_parent">
 
     <androidx.appcompat.widget.Toolbar
         android:layout_width="match_parent"

winboll/src/main/res/layout/activity_new2.xml

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
+	android:layout_height="match_parent">
 
     <androidx.appcompat.widget.Toolbar
         android:layout_width="match_parent"

winboll/src/main/res/layout/activity_ollama_window.xml

@@ -7,7 +7,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical" android:background="@drawable/bg_container_border">
+        android:orientation="vertical">
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
@@ -19,13 +19,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="16dp" android:background="@drawable/bg_container_border">
+                android:padding="16dp">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="Ollama 模型对话"
-                    
+                    android:textColor="#FFFFFF"
                     android:textSize="18sp"
                     android:textStyle="bold" />
 
@@ -33,13 +33,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
-                    android:orientation="vertical" android:background="@drawable/bg_container_border">
+                    android:orientation="vertical">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="系统提示："
-                         />
+                        android:textColor="#B0B0B0" />
 
                     <EditText
                         android:id="@+id/etSystemPrompt"
@@ -47,7 +47,7 @@
                         android:layout_height="100dp"
                         android:background="#2D2D2D"
                         android:hint="请输入系统提示"
-                        
+                        android:textColor="#FFFFFF"
                         android:textColorHint="#666666"
                         android:gravity="top|start"
                         android:inputType="textMultiLine" />
@@ -59,7 +59,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:text="模型名称："
-                     />
+                    android:textColor="#B0B0B0" />
 
                 <EditText
                     android:id="@+id/etModelName"
@@ -68,7 +68,7 @@
                     android:background="#2D2D2D"
                     android:hint="llama3"
                     android:text="llama3"
-                    
+                    android:textColor="#FFFFFF"
                     android:textColorHint="#666666"
                     android:singleLine="true" />
 
@@ -77,13 +77,13 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:text="温度设置："
-                     />
+                    android:textColor="#B0B0B0" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:weightSum="2" android:background="@drawable/bg_container_border">
+                    android:weightSum="2">
 
                     <EditText
                         android:id="@+id/etTemperature"
@@ -92,7 +92,7 @@
                         android:layout_weight="1"
                         android:background="#2D2D2D"
                         android:hint="0.7"
-                        
+                        android:textColor="#FFFFFF"
                         android:textColorHint="#666666"
                         android:digits="0123456789.,-"
                         android:singleLine="true" />
@@ -104,7 +104,7 @@
                         android:layout_weight="1"
                         android:background="#2D2D2D"
                         android:hint="4096"
-                        
+                        android:textColor="#FFFFFF"
                         android:textColorHint="#666666"
                         android:digits="0123456789."
                         android:singleLine="true" />
@@ -116,19 +116,19 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:text="系统消息："
-                     />
+                    android:textColor="#B0B0B0" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical" android:background="@drawable/bg_container_border">
+                    android:orientation="vertical">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="8dp"
                         android:text="用户消息："
-                         />
+                        android:textColor="#B0B0B0" />
 
                     <EditText
                         android:id="@+id/etUserMessage"
@@ -147,11 +147,11 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:text="响应消息："
-                     />
+                    android:textColor="#B0B0B0" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
+                    android:layout_height="wrap_content">
 
                     <EditText
                         android:id="@+id/etAssistantMessage"
@@ -170,7 +170,7 @@
                         android:layout_weight="1"
                         android:layout_marginStart="8dp"
                         android:text="清空"
-                         />
+                        android:textColor="#FFFFFF" />
 
                 </LinearLayout>
 
@@ -182,7 +182,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="48dp"
-            android:gravity="center" android:background="@drawable/bg_container_border">
+            android:gravity="center">
 
             <Button
                 android:id="@+id/btnSend"

winboll/src/main/res/layout/activity_settings.xml

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
+	android:layout_height="match_parent">
 
 	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"

winboll/src/main/res/layout/activity_termux_env_test.xml

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
+	android:layout_height="match_parent">
 
 	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"
@@ -15,7 +15,7 @@
 		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:gravity="right" android:background="@drawable/bg_container_border">
+		android:gravity="right">
 
 		<Button
 			android:textAllCaps="false"
@@ -50,7 +50,7 @@
 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0" android:background="@drawable/bg_container_border">
+		android:layout_weight="1.0">
 
 		<TextView
 			android:layout_width="match_parent"

winboll/src/main/res/layout/activity_test_weworkspecsdk.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="20dp"
-    android:gravity="center_horizontal" android:background="@drawable/bg_container_border">
+    android:gravity="center_horizontal">
 
     <Button
         android:id="@+id/btn_init_sdk"

winboll/src/main/res/layout/activity_winbollunittest.xml

@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
+	android:layout_height="match_parent">
 
 	<android.widget.Toolbar
 		android:layout_width="match_parent"
@@ -13,21 +13,21 @@
 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0" android:background="@drawable/bg_container_border">
+		android:layout_weight="1.0">
 
 		<LinearLayout
 			xmlns:app="http://schemas.android.com/apk/res-auto"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
-			android:gravity="center" android:background="@drawable/bg_container_border">
+			android:gravity="center">
 
 			<LinearLayout
 				android:orientation="vertical"
 				android:layout_width="match_parent"
 				android:layout_height="0dp"
 				android:layout_weight="1.0"
-				android:gravity="center_horizontal" android:background="@drawable/bg_container_border">
+				android:gravity="center_horizontal">
 
 				<TextView
 					android:layout_width="wrap_content"
@@ -41,13 +41,13 @@
                     
 				<HorizontalScrollView
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
+					android:layout_height="wrap_content">
 
 					<LinearLayout
 						android:orientation="horizontal"
 						android:layout_height="wrap_content"
 						android:gravity="right|center_vertical"
-						android:layout_width="wrap_content" android:background="@drawable/bg_container_border">
+						android:layout_width="wrap_content">
 
 						<CheckBox
 							android:layout_width="wrap_content"
@@ -55,8 +55,7 @@
 							android:text="Debug Mode"
 							android:layout_weight="1.0"
 							android:onClick="onSwitchDebugMode"
-							android:id="@+id/activitymainCheckBox1"
+							android:id="@+id/activitymainCheckBox1"/>
-							android:textColor="?android:attr/textColorPrimary"/>
 
 						<Button
 							android:layout_width="wrap_content"
@@ -78,18 +77,18 @@
 
 				<ScrollView
 					android:layout_width="match_parent"
-					android:layout_height="400dp" android:background="@drawable/bg_container_border">
+					android:layout_height="400dp">
 
 					<LinearLayout
 						android:orientation="vertical"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:gravity="right" android:background="@drawable/bg_container_border">
+						android:gravity="right">
 
 						<LinearLayout
 							android:orientation="horizontal"
 							android:layout_width="wrap_content"
-							android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
+							android:layout_height="wrap_content">
 
 							<Button
 								android:layout_width="wrap_content"
@@ -109,12 +108,12 @@
 
 						<HorizontalScrollView
 							android:layout_width="match_parent"
-							android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
+							android:layout_height="wrap_content">
 
 							<LinearLayout
 								android:orientation="horizontal"
 								android:layout_width="wrap_content"
-								android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
+								android:layout_height="wrap_content">
 
 								<Button
 									android:layout_width="wrap_content"
@@ -143,12 +142,12 @@
 
 						<HorizontalScrollView
 							android:layout_width="match_parent"
-							android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
+							android:layout_height="wrap_content">
 
 							<LinearLayout
 								android:orientation="horizontal"
 								android:layout_width="wrap_content"
-								android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
+								android:layout_height="wrap_content">
 
 								<Button
 									android:layout_width="wrap_content"

winboll/src/main/res/layout/activity_wxpay.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:gravity="center_horizontal"
-    android:padding="20dp" android:background="@drawable/bg_container_border">
+    android:padding="20dp">
 
     <TextView
         android:layout_width="wrap_content"
@@ -30,7 +30,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="支付状态：未支付"
-        android:textSize="16sp"/>
+        android:textSize="16sp"
+        android:textColor="@android:color/black"/>
 
     <Button
         android:id="@+id/btn_create_order"

winboll/src/main/res/layout/activity_yun.xml

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
+	android:layout_height="match_parent">
 
 	<LinearLayout
 		android:orientation="horizontal"
@@ -13,23 +13,21 @@
 		android:layout_gravity="right"
 		android:gravity="right"
 		android:padding="10dp"
-		android:id="@+id/ll_hostbar" android:background="@drawable/bg_container_border">
+		android:id="@+id/ll_hostbar">
 
 		<RadioButton
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="10.8.0.250:456"
 			android:id="@+id/rb_debughost"
-			android:onClick="onSwitchHost"
+			android:onClick="onSwitchHost"/>
-			android:textColor="?android:attr/textColorPrimary"/>
 
 		<RadioButton
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="yun.winboll.cc"
 			android:id="@+id/rb_yunhost"
-			android:onClick="onSwitchHost"
+			android:onClick="onSwitchHost"/>
-			android:textColor="?android:attr/textColorPrimary"/>
 
 	</LinearLayout>
 
@@ -38,7 +36,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_gravity="right"
-		android:gravity="right" android:background="@drawable/bg_container_border">
+		android:gravity="right">
 
 		<Button
 			android:layout_width="wrap_content"
@@ -52,7 +50,7 @@
 		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0" android:background="@drawable/bg_container_border">
+		android:layout_weight="1.0">
 
 		<cc.winboll.studio.libappbase.LogView
 			android:layout_width="match_parent"

winboll/src/main/res/layout/dialog_ollama_config.xml

@@ -10,13 +10,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="24dp" android:background="@drawable/bg_container_border">
+        android:padding="24dp">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Ollama 配置"
-            
+            android:textColor="#FFFFFF"
             android:textSize="20sp"
             android:textStyle="bold"
             android:layout_gravity="center_horizontal"
@@ -25,13 +25,13 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" android:background="@drawable/bg_container_border">
+            android:orientation="vertical">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="API 地址"
-                
+                android:textColor="#B0B0B0"
                 android:textSize="14sp"
                 android:layout_marginBottom="4dp" />
 
@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:hint="http://localhost:11434"
                 android:text="http://localhost:11434"
-                
+                android:textColor="#FFFFFF"
                 android:textColorHint="#666666"
                 android:inputType="textUri"
                 android:singleLine="true"
@@ -54,7 +54,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="模型名称"
-                
+                android:textColor="#B0B0B0"
                 android:textSize="14sp"
                 android:layout_marginBottom="4dp" />
 
@@ -64,7 +64,7 @@
                 android:layout_height="wrap_content"
                 android:hint="模型名称 (如：llama3)"
                 android:text="llama3"
-                
+                android:textColor="#FFFFFF"
                 android:textColorHint="#666666"
                 android:inputType="textCapCharacters"
                 android:singleLine="true"
@@ -77,7 +77,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="温度设置"
-                
+                android:textColor="#B0B0B0"
                 android:textSize="14sp"
                 android:layout_marginBottom="4dp" />
 
@@ -87,7 +87,7 @@
                 android:layout_height="wrap_content"
                 android:hint="0.7"
                 android:text="0.7"
-                
+                android:textColor="#FFFFFF"
                 android:textColorHint="#666666"
                 android:inputType="text"
                 android:singleLine="true"
@@ -101,7 +101,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="最大 token 数"
-                
+                android:textColor="#B0B0B0"
                 android:textSize="14sp"
                 android:layout_marginBottom="4dp" />
 
@@ -111,7 +111,7 @@
                 android:layout_height="wrap_content"
                 android:hint="4096"
                 android:text="4096"
-                
+                android:textColor="#FFFFFF"
                 android:textColorHint="#666666"
                 android:inputType="text"
                 android:singleLine="true"
@@ -124,7 +124,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="系统提示"
-                
+                android:textColor="#B0B0B0"
                 android:textSize="14sp"
                 android:layout_marginBottom="4dp" />
 
@@ -134,7 +134,7 @@
                 android:layout_height="wrap_content"
                 android:hint="你是 WinBoLL Ollama API 客户端..."
                 android:text="你是 WinBoLL Ollama API 客户端。用户将向你提问，请给予有用的、详细的回答。"
-                
+                android:textColor="#FFFFFF"
                 android:textColorHint="#666666"
                 android:inputType="textMultiLine"
                 android:gravity="top|start"
@@ -148,7 +148,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="API 版本"
-                
+                android:textColor="#B0B0B0"
                 android:textSize="14sp"
                 android:layout_marginBottom="4dp" />
 
@@ -158,7 +158,7 @@
                 android:layout_height="wrap_content"
                 android:hint="v1"
                 android:text="v1"
-                
+                android:textColor="#FFFFFF"
                 android:textColorHint="#666666"
                 android:inputType="textCapCharacters"
                 android:singleLine="true"
@@ -171,7 +171,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="调试模式"
-                
+                android:textColor="#B0B0B0"
                 android:textSize="14sp"
                 android:layout_marginBottom="4dp" />
 
@@ -181,7 +181,7 @@
                 android:layout_height="wrap_content"
                 android:hint="false"
                 android:text="false"
-                
+                android:textColor="#FFFFFF"
                 android:textColorHint="#666666"
                 android:inputType="text"
                 android:singleLine="true"
@@ -195,7 +195,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:gravity="center"
-                android:orientation="horizontal" android:background="@drawable/bg_container_border">
+                android:orientation="horizontal">
 
                 <Space
                     android:layout_width="0dp"
@@ -207,7 +207,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="保存配置"
-                    
+                    android:textColor="#FFFFFF"
                     android:textSize="14sp"
                     android:paddingStart="40dp"
                     android:paddingEnd="40dp"
@@ -219,7 +219,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="加载配置"
-                    
+                    android:textColor="#4A90E2"
                     android:textSize="14sp"
                     android:paddingStart="40dp"
                     android:paddingEnd="40dp"
@@ -231,7 +231,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="重置"
-                    
+                    android:textColor="#B0B0B0"
                     android:textSize="14sp"
                     android:paddingStart="40dp"
                     android:paddingEnd="40dp"
@@ -249,7 +249,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=""
-                
+                android:textColor="#00CC00"
                 android:textSize="12sp"
                 android:layout_gravity="center"
                 android:layout_marginTop="8dp" />
@@ -258,7 +258,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="保存后，配置将对所有会话生效"
-                
+                android:textColor="#666666"
                 android:textSize="12sp"
                 android:layout_marginTop="8dp" />
 

winboll/src/main/res/layout/fragment_browser.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" android:background="@drawable/bg_container_border">
+    android:orientation="vertical">
 
     <!-- 顶部地址栏区域（水平布局：输入框+功能按钮） -->
     <LinearLayout
@@ -33,7 +33,7 @@
             android:layout_height="match_parent"
             android:orientation="horizontal"
             android:gravity="center_vertical"
-            android:paddingHorizontal="4dp" android:background="@drawable/bg_container_border">
+            android:paddingHorizontal="4dp">
 
             <Button
                 android:id="@+id/btn_load"

winboll/src/main/res/layout/fragment_main.xml

@@ -4,20 +4,19 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
+	android:layout_height="match_parent">
 
 	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
+		android:layout_height="wrap_content">
 
 		<Switch
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:text="Position Service"
 			android:padding="10dp"
-			android:id="@+id/fragmentmainSwitch1"
+			android:id="@+id/fragmentmainSwitch1"/>
-			android:textColor="?android:attr/textColorPrimary"/>
 
 	</LinearLayout>
 

winboll/src/main/res/layout/view_toolbar.xml

@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" android:background="@drawable/bg_container_border">
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/toolbar_icon"
@@ -19,7 +19,7 @@
         android:id="@+id/toolbar_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        
+        android:textColor="#ffffff"
         android:textSize="18sp"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/toolbar_icon"

winboll/src/main/res/layout/widget_news.xml

@@ -11,7 +11,7 @@
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:gravity="right|center_vertical" android:background="@drawable/bg_container_border">
+		android:gravity="right|center_vertical">
 
 		<TextView
 			android:layout_width="0dp"

winboll/src/main/res/layout/widget_status.xml

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="40dp"
-	android:layout_height="40dp" android:background="@drawable/bg_container_border">
+	android:layout_height="40dp">
 
 	<ImageView
 		android:layout_width="40dp"

winboll/src/main/res/menu/toolbar_test.xml

@@ -7,6 +7,9 @@
 			<item
 				android:id="@+id/item_termux_env_test"
 				android:title="TermuxEnvTestActivity"/>
+			<item
+				android:id="@+id/item_library_activity"
+				android:title="WinBoLLLibraryActivity"/>
         </menu>
     </item>
 </menu>

winboll/src/main/res/values/attrs.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="borderCornerRadius" format="dimension" />
     <declare-styleable name="CustomToolbar">
         <attr name="toolbarTitle" format="string" />
         <attr name="toolbarTitleColor" format="color" />

winboll/src/main/res/values/colors.xml

@@ -4,4 +4,10 @@
     <color name="colorPrimaryDark">#00796B</color>
     <color name="colorAccent">#FF9800</color>
     <color name="pattern_lock_black">#000000</color>
+
+    <color name="mainWindowBackgroundColor">#FFF5F5F5</color>
+    <color name="mainWindowTextColor">#FF000000</color>
+    <color name="toolbarTextColor">#FF000000</color>
+    <color name="toolbarBackgroundColor">#FF00B322</color>
+    <color name="debugTextColor">#FF808080</color>
 </resources>

winboll/src/main/res/values/strings.xml

@@ -13,4 +13,21 @@
     <string name="toolbar_icon_description">WinBoLL APP</string>
     <string name="my_termux_activity">MyTermuxActivity</string>
     <string name="pattern_lock_title">图案密码设置</string>
+    <string name="add_termux_button">+ 添加Termux按钮</string>
+    <string name="menu_execute">执行</string>
+    <string name="menu_edit">编辑</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_cancel">取消</string>
+    <string name="dialog_delete_title">确认删除</string>
+    <string name="dialog_delete_message">确定要删除</string>
+    <string name="dialog_add_title">添加Termux按钮</string>
+    <string name="dialog_edit_title">编辑Termux按钮</string>
+    <string name="dialog_save">保存</string>
+    <string name="dialog_confirm">确定</string>
+    <string name="dialog_cancel">取消</string>
+    <string name="hint_button_name">按钮名称</string>
+    <string name="hint_exe_command">执行命令</string>
+    <string name="hint_work_dir">工作目录（默认 ~）</string>
+    <string name="toast_deleted">已删除</string>
+    <string name="toast_fields_required">按钮名称和执行命令不能为空</string>
 </resources>

winboll/src/main/res/values/styles.xml

@@ -1,5 +1,57 @@
 <resources>
     <style name="MyAppTheme" parent="AESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
     </style>
 
+    <style name="MyDepthAppTheme" parent="DepthAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MySkyAppTheme" parent="SkyAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyGoldenAppTheme" parent="GoldenAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyBearingAppTheme" parent="BearingAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyMemorAppTheme" parent="MemorAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyTaoAppTheme" parent="TaoAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyAESAToolbar" parent="AESAToolbar" />
+
+    <style name="MyAESASupportToolbar" parent="AESASupportToolbar" />
+
+    <style name="MyDebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">@color/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">@color/debugTextColor</item>
+        <item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+    </style>
 </resources>