From 06253feba8b305b068ea5aad16b1e17019061d30 Mon Sep 17 00:00:00 2001 From: LaizyBoy Date: Wed, 6 May 2026 11:08:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(ollama):=20=E6=B7=BB=E5=8A=A0=20Ollama=20?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=AF=B9=E8=AF=9D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 OllamaWindowActivity 用于模型对话交互 - 添加 Ollama 配置对话框(API地址、模型、温度、token等) - 在主菜单中增加 Ollama 窗口入口 - 包含发送、停止、清空等对话控制功能 - 更新 buildCount 至 15 --- winboll/build.properties | 4 +- .../activities/OllamaWindowActivity.java | 32 +++ .../res/layout/activity_ollama_window.xml | 140 +++++++++ .../src/beta/res/menu/menu_ollama_window.xml | 11 + .../res/layout/activity_ollama_window.xml | 206 ++++++++++++++ .../main/res/layout/dialog_ollama_config.xml | 269 ++++++++++++++++++ winboll/src/main/res/menu/menu_main.xml | 6 + 7 files changed, 666 insertions(+), 2 deletions(-) create mode 100644 winboll/src/beta/java/cc/winboll/studio/winboll/activities/OllamaWindowActivity.java create mode 100644 winboll/src/beta/res/layout/activity_ollama_window.xml create mode 100644 winboll/src/beta/res/menu/menu_ollama_window.xml create mode 100644 winboll/src/main/res/layout/activity_ollama_window.xml create mode 100644 winboll/src/main/res/layout/dialog_ollama_config.xml create mode 100644 winboll/src/main/res/menu/menu_main.xml diff --git a/winboll/build.properties b/winboll/build.properties index 224209f..6bc1870 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Apr 30 14:58:25 CST 2026 +#Thu Apr 30 18:43:22 CST 2026 stageCount=27 libraryProject= baseVersion=15.11 publishVersion=15.11.26 -buildCount=11 +buildCount=15 baseBetaVersion=15.11.27 diff --git a/winboll/src/beta/java/cc/winboll/studio/winboll/activities/OllamaWindowActivity.java b/winboll/src/beta/java/cc/winboll/studio/winboll/activities/OllamaWindowActivity.java new file mode 100644 index 0000000..07b804d --- /dev/null +++ b/winboll/src/beta/java/cc/winboll/studio/winboll/activities/OllamaWindowActivity.java @@ -0,0 +1,32 @@ +package cc.winboll.studio.winboll.activities; + +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + +import cc.winboll.studio.winboll.R; + +/** + * Ollama 模型对话窗口 + */ +public class OllamaWindowActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_ollama_window); + + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + getSupportActionBar().setTitle("Ollama 窗口"); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.menu_ollama_window, menu); + return true; + } +} diff --git a/winboll/src/beta/res/layout/activity_ollama_window.xml b/winboll/src/beta/res/layout/activity_ollama_window.xml new file mode 100644 index 0000000..86f97cd --- /dev/null +++ b/winboll/src/beta/res/layout/activity_ollama_window.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +