From a66be9cd371b54870e7d1af79def3ff1d7140f78 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Thu, 27 Mar 2025 19:39:54 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0WinBoll=20Ollama=20?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E9=A1=B9=E7=9B=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ollama/.gitignore                             |   1 +
 ollama/app_update_description.txt             |   0
 ollama/build.gradle                           |  71 ++++
 ollama/build.properties                       |   8 +
 ollama/proguard-rules.pro                     |  21 ++
 ollama/src/beta/AndroidManifest.xml           |  12 +
 ollama/src/beta/res/values/strings.xml        |   7 +
 ollama/src/main/AndroidManifest.xml           |  39 ++
 .../java/cc/winboll/studio/ollama/App.java    | 334 ++++++++++++++++++
 .../winboll/studio/ollama/MainActivity.java   |  25 ++
 ollama/src/main/res/drawable/ic_launcher.png  | Bin 0 -> 9250 bytes
 ollama/src/main/res/layout/activity_main.xml  |  37 ++
 ollama/src/main/res/values-v21/styles.xml     |   9 +
 ollama/src/main/res/values/colors.xml         |   6 +
 ollama/src/main/res/values/strings.xml        |   4 +
 ollama/src/main/res/values/styles.xml         |   5 +
 ollama/src/stage/AndroidManifest.xml          |  12 +
 ollama/src/stage/res/values/strings.xml       |   6 +
 settings.gradle-demo                          |   4 +
 19 files changed, 601 insertions(+)
 create mode 100644 ollama/.gitignore
 create mode 100644 ollama/app_update_description.txt
 create mode 100644 ollama/build.gradle
 create mode 100644 ollama/build.properties
 create mode 100644 ollama/proguard-rules.pro
 create mode 100644 ollama/src/beta/AndroidManifest.xml
 create mode 100644 ollama/src/beta/res/values/strings.xml
 create mode 100644 ollama/src/main/AndroidManifest.xml
 create mode 100644 ollama/src/main/java/cc/winboll/studio/ollama/App.java
 create mode 100644 ollama/src/main/java/cc/winboll/studio/ollama/MainActivity.java
 create mode 100644 ollama/src/main/res/drawable/ic_launcher.png
 create mode 100644 ollama/src/main/res/layout/activity_main.xml
 create mode 100644 ollama/src/main/res/values-v21/styles.xml
 create mode 100644 ollama/src/main/res/values/colors.xml
 create mode 100644 ollama/src/main/res/values/strings.xml
 create mode 100644 ollama/src/main/res/values/styles.xml
 create mode 100644 ollama/src/stage/AndroidManifest.xml
 create mode 100644 ollama/src/stage/res/values/strings.xml

diff --git a/ollama/.gitignore b/ollama/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/ollama/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/ollama/app_update_description.txt b/ollama/app_update_description.txt
new file mode 100644
index 0000000..e69de29
diff --git a/ollama/build.gradle b/ollama/build.gradle
new file mode 100644
index 0000000..c5272da
--- /dev/null
+++ b/ollama/build.gradle
@@ -0,0 +1,71 @@
+apply plugin: 'com.android.application'
+apply from: '../.winboll/winboll_app_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+def genVersionName(def versionName){
+    // 检查编译标志位配置
+    assert (winbollBuildProps['stageCount'] != null)
+    assert (winbollBuildProps['baseVersion'] != null)
+    // 保存基础版本号
+    winbollBuildProps.setProperty("baseVersion", "${versionName}");
+    //保存编译标志配置
+    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
+    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
+    fos.close();
+    
+    // 返回编译版本号
+    return "${versionName}." + winbollBuildProps['stageCount']
+}
+
+android {
+    compileSdkVersion 32
+    buildToolsVersion "32.0.0"
+
+    defaultConfig {
+        applicationId "cc.winboll.studio.ollama"
+        minSdkVersion 26
+        targetSdkVersion 29
+        versionCode 1
+        // versionName 更新后需要手动设置 
+        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
+        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
+        versionName "15.0"
+        if(true) {
+            versionName = genVersionName("${versionName}")
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    
+    // 吐司类库
+    api 'com.github.getActivity:ToastUtils:10.5'
+
+    // Android 类库
+    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
+    // https://mvnrepository.com/artifact/com.android.support/support-compat
+    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
+    // https://mvnrepository.com/artifact/com.android.support/support-v4
+    api 'com.android.support:support-v4:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-media-compat
+    api 'com.android.support:support-media-compat:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-core-utils
+    api 'com.android.support:support-core-utils:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-core-ui
+    api 'com.android.support:support-core-ui:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-fragment
+    api 'com.android.support:support-fragment:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
+    api 'com.android.support:recyclerview-v7:28.0.0'
+    
+    api 'cc.winboll.studio:libappbase:15.0.9'
+    api 'cc.winboll.studio:libapputils:15.0.11'
+}
diff --git a/ollama/build.properties b/ollama/build.properties
new file mode 100644
index 0000000..24852bd
--- /dev/null
+++ b/ollama/build.properties
@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Thu Mar 27 11:38:18 GMT 2025
+stageCount=0
+libraryProject=
+baseVersion=15.0
+publishVersion=15.0.0
+buildCount=12
+baseBetaVersion=15.0.1
diff --git a/ollama/proguard-rules.pro b/ollama/proguard-rules.pro
new file mode 100644
index 0000000..64b4a05
--- /dev/null
+++ b/ollama/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/ollama/src/beta/AndroidManifest.xml b/ollama/src/beta/AndroidManifest.xml
new file mode 100644
index 0000000..ee78d9f
--- /dev/null
+++ b/ollama/src/beta/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <application>
+
+        <!-- Put flavor specific code here -->
+
+    </application>
+
+</manifest>
+
diff --git a/ollama/src/beta/res/values/strings.xml b/ollama/src/beta/res/values/strings.xml
new file mode 100644
index 0000000..55b19c4
--- /dev/null
+++ b/ollama/src/beta/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+
+    <string name="app_name">Ollama +</string>
+
+</resources>
diff --git a/ollama/src/main/AndroidManifest.xml b/ollama/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..491eadb
--- /dev/null
+++ b/ollama/src/main/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="cc.winboll.studio.ollama">
+
+    <application
+        tools:replace="android:appComponentFactory"
+        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme"
+        android:resizeableActivity="true"
+        android:name=".App">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <meta-data
+            android:name="android.max_aspect"
+            android:value="4.0"/>
+
+        <activity android:name=".GlobalApplication$CrashActivity"/>
+
+    </application>
+
+</manifest>
diff --git a/ollama/src/main/java/cc/winboll/studio/ollama/App.java b/ollama/src/main/java/cc/winboll/studio/ollama/App.java
new file mode 100644
index 0000000..645b180
--- /dev/null
+++ b/ollama/src/main/java/cc/winboll/studio/ollama/App.java
@@ -0,0 +1,334 @@
+package cc.winboll.studio.ollama;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.res.Resources;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class App extends GlobalApplication {
+
+    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        //CrashHandler.getInstance().registerGlobal(this);
+        //CrashHandler.getInstance().registerPart(this);
+    }
+
+    public static void write(InputStream input, OutputStream output) throws IOException {
+        byte[] buf = new byte[1024 * 8];
+        int len;
+        while ((len = input.read(buf)) != -1) {
+            output.write(buf, 0, len);
+        }
+    }
+
+    public static void write(File file, byte[] data) throws IOException {
+        File parent = file.getParentFile();
+        if (parent != null && !parent.exists()) parent.mkdirs();
+
+        ByteArrayInputStream input = new ByteArrayInputStream(data);
+        FileOutputStream output = new FileOutputStream(file);
+        try {
+            write(input, output);
+        } finally {
+            closeIO(input, output);
+        }
+    }
+
+    public static String toString(InputStream input) throws IOException {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        write(input, output);
+        try {
+            return output.toString("UTF-8");
+        } finally {
+            closeIO(input, output);
+        }
+    }
+
+    public static void closeIO(Closeable... closeables) {
+        for (Closeable closeable : closeables) {
+            try {
+                if (closeable != null) closeable.close();
+            } catch (IOException ignored) {}
+        }
+    }
+
+    public static class CrashHandler {
+
+        public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
+
+        private static CrashHandler sInstance;
+
+        private PartCrashHandler mPartCrashHandler;
+
+        public static CrashHandler getInstance() {
+            if (sInstance == null) {
+                sInstance = new CrashHandler();
+            }
+            return sInstance;
+        }
+
+        public void registerGlobal(Context context) {
+            registerGlobal(context, null);
+        }
+
+        public void registerGlobal(Context context, String crashDir) {
+            Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandlerImpl(context.getApplicationContext(), crashDir));
+        }
+
+        public void unregister() {
+            Thread.setDefaultUncaughtExceptionHandler(DEFAULT_UNCAUGHT_EXCEPTION_HANDLER);
+        }
+
+        public void registerPart(Context context) {
+            unregisterPart(context);
+            mPartCrashHandler = new PartCrashHandler(context.getApplicationContext());
+            MAIN_HANDLER.postAtFrontOfQueue(mPartCrashHandler);
+        }
+
+        public void unregisterPart(Context context) {
+            if (mPartCrashHandler != null) {
+                mPartCrashHandler.isRunning.set(false);
+                mPartCrashHandler = null;
+            }
+        }
+
+        private static class PartCrashHandler implements Runnable {
+
+            private final Context mContext;
+
+            public AtomicBoolean isRunning = new AtomicBoolean(true);
+
+            public PartCrashHandler(Context context) {
+                this.mContext = context;
+            }
+
+            @Override
+            public void run() {
+                while (isRunning.get()) {
+                    try {
+                        Looper.loop();
+                    } catch (final Throwable e) {
+                        e.printStackTrace();
+                        if (isRunning.get()) {
+                            MAIN_HANDLER.post(new Runnable(){
+
+                                    @Override
+                                    public void run() {
+                                        Toast.makeText(mContext, e.toString(), Toast.LENGTH_LONG).show();
+                                    }
+                                });
+                        } else {
+                            if (e instanceof RuntimeException) {
+                                throw (RuntimeException)e;
+                            } else {
+                                throw new RuntimeException(e);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private static class UncaughtExceptionHandlerImpl implements UncaughtExceptionHandler {
+
+            private static DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss");
+
+            private final Context mContext;
+
+            private final File mCrashDir;
+
+            public UncaughtExceptionHandlerImpl(Context context, String crashDir) {
+                this.mContext = context;
+                this.mCrashDir = TextUtils.isEmpty(crashDir) ? new File(mContext.getExternalCacheDir(), "crash") : new File(crashDir);
+            }
+
+            @Override
+            public void uncaughtException(Thread thread, Throwable throwable) {
+                try {
+
+                    String log = buildLog(throwable);
+                    writeLog(log);
+
+                    try {
+                        Intent intent = new Intent(mContext, CrashActivity.class);
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        intent.putExtra(Intent.EXTRA_TEXT, log);
+                        mContext.startActivity(intent);
+                    } catch (Throwable e) {
+                        e.printStackTrace();
+                        writeLog(e.toString());
+                    }
+
+                    throwable.printStackTrace();
+                    android.os.Process.killProcess(android.os.Process.myPid());
+                    System.exit(0);
+
+                } catch (Throwable e) {
+                    if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
+                }
+            }
+
+            private String buildLog(Throwable throwable) {
+                String time = DATE_FORMAT.format(new Date());
+
+                String versionName = "unknown";
+                long versionCode = 0;
+                try {
+                    PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0);
+                    versionName = packageInfo.versionName;
+                    versionCode = Build.VERSION.SDK_INT >= 28 ? packageInfo.getLongVersionCode() : packageInfo.versionCode;
+                } catch (Throwable ignored) {}
+
+                LinkedHashMap<String, String> head = new LinkedHashMap<String, String>();
+                head.put("Time Of Crash", time);
+                head.put("Device", String.format("%s, %s", Build.MANUFACTURER, Build.MODEL));
+                head.put("Android Version", String.format("%s (%d)", Build.VERSION.RELEASE, Build.VERSION.SDK_INT));
+                head.put("App Version", String.format("%s (%d)", versionName, versionCode));
+                head.put("Kernel", getKernel());
+                head.put("Support Abis", Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_ABIS != null ? Arrays.toString(Build.SUPPORTED_ABIS): "unknown");
+                head.put("Fingerprint", Build.FINGERPRINT);
+
+                StringBuilder builder = new StringBuilder();
+
+                for (String key : head.keySet()) {
+                    if (builder.length() != 0) builder.append("\n");
+                    builder.append(key);
+                    builder.append(" :    ");
+                    builder.append(head.get(key));
+                }
+
+                builder.append("\n\n");
+                builder.append(Log.getStackTraceString(throwable));
+
+                return builder.toString(); 
+            }
+
+            private void writeLog(String log) {
+                String time = DATE_FORMAT.format(new Date());
+                File file = new File(mCrashDir, "crash_" + time + ".txt");
+                try {
+                    write(file, log.getBytes("UTF-8"));
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                } 
+            }
+
+            private static String getKernel() {
+                try {
+                    return App.toString(new FileInputStream("/proc/version")).trim();
+                } catch (Throwable e) {
+                    return e.getMessage();
+                }
+            }
+        }
+    }
+
+    public static final class CrashActivity extends Activity {
+
+        private String mLog;
+
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+
+            setTheme(android.R.style.Theme_DeviceDefault);
+            setTitle("App Crash");
+
+            mLog = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+
+            ScrollView contentView = new ScrollView(this);
+            contentView.setFillViewport(true);
+
+            HorizontalScrollView horizontalScrollView = new HorizontalScrollView(this);
+
+            TextView textView = new TextView(this);
+            int padding = dp2px(16);
+            textView.setPadding(padding, padding, padding, padding);
+            textView.setText(mLog);
+            textView.setTextIsSelectable(true);
+            textView.setTypeface(Typeface.DEFAULT);
+            textView.setLinksClickable(true);
+
+            horizontalScrollView.addView(textView);
+            contentView.addView(horizontalScrollView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+
+            setContentView(contentView);
+        }
+
+        private void restart() {
+            Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
+            if (intent != null) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            }
+            finish();
+            android.os.Process.killProcess(android.os.Process.myPid());
+            System.exit(0);
+        }
+
+        private static int dp2px(float dpValue) {
+            final float scale = Resources.getSystem().getDisplayMetrics().density;
+            return (int) (dpValue * scale + 0.5f);
+        }
+
+        @Override
+        public boolean onCreateOptionsMenu(Menu menu) {
+            menu.add(0, android.R.id.copy, 0, android.R.string.copy)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            return super.onCreateOptionsMenu(menu);
+        }
+
+        @Override
+        public boolean onOptionsItemSelected(MenuItem item) {
+            switch (item.getItemId()) {
+                case android.R.id.copy:
+                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
+                    return true;
+            }
+            return super.onOptionsItemSelected(item);
+        }
+
+        @Override
+        public void onBackPressed() {
+            restart();
+        }
+    }
+}
diff --git a/ollama/src/main/java/cc/winboll/studio/ollama/MainActivity.java b/ollama/src/main/java/cc/winboll/studio/ollama/MainActivity.java
new file mode 100644
index 0000000..3876559
--- /dev/null
+++ b/ollama/src/main/java/cc/winboll/studio/ollama/MainActivity.java
@@ -0,0 +1,25 @@
+package cc.winboll.studio.ollama;
+
+import android.app.Activity;
+import android.os.Bundle;
+import cc.winboll.studio.libappbase.LogView;
+
+public class MainActivity extends Activity {
+
+    LogView mLogView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        mLogView = findViewById(R.id.logview);
+        mLogView.start();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+}
diff --git a/ollama/src/main/res/drawable/ic_launcher.png b/ollama/src/main/res/drawable/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..b824ebdd48db917eea2e67a82260a100371f8a24
GIT binary patch
literal 9250
zcmb`NWmwct^yp`U?k)*IT4_)~WNGO}0fCiVBo&ktmXr`sL8L_*Bn6~lMMAozq!gAe
z>AvglfA9NypXa{#=A1b*&&-_9nK?6&dOB)k#LUD105bLa$_BV6=HEq#kGmWEawY(P
zYgJuY!N_}RGo8TO$oTXsB$&89>#C*cCdYLmNX~ke#Hv9KA93kET{$`$PbI2&f<=QO
zbYEuG&fq#8;U|Hp%+iMX($XltD84sh%`HcA9=yrw*x5Rd?dw|aj_wW|b=kga#C;uk
zY)LO?99@%_7kX6dzR(&*!tnq4;>`zco!?9(Az&zTo|L_j^WL&gF7wJuI**)H&y&sO
z9l;NhRvPV@eM$C25(Y1oLfTY%Qu06J{1!LY%l6`?e{u8i<fO74Xi{uT&8Ezj)NnVZ
z&bI8{h*A+f%k8`$J*gcjt!J%8-F}Tn8jJdzJ1vs1k(AvOq0Yu3JbIuu0v<1QlY}Nv
zGuGJMN1S7;Ax~3#pf<My!>n|(1@!4MJk2$1+uIsPqnf+k()k8h#rg7tMJHVtWaqYT
zq|_R>T}xsUyk)<9e2b1o1pB7<I0~UI8X|(7NL!4envA3iIyO_)iV_!?HW2Mdx$%4b
zn5F*EfmS%-?d>02Pc9ve?7kQpF2}x}2=dBPVaUdm7-ZjF+bUL0vak))KQ<oNULV@&
z^``PDmQ*+E{kB@ci4FZl>nKW)qx!vgbJE?)QXqi+7Po!iYjGEI9xeX+3}trhX=ZOA
z6m<4$ajUa5?TbuamQOsfYFx!_%v5Pca-z3$eHCN9QVeZN0(`DY*CwYcn=Z{IwS{|W
zMVA?tHKL`t<(1kV)n+5idi^{`iXLpvnO=;Rx{T4}wriDGR@79T*3GDl#qU(VPNH?_
z+WNh=<fq};nU)mq{Mjd_+5NEl*ttiZnH{cEQyjoQ<mC6T6`_x}7RMH8{w<>8;jQwV
zM#imv9eB3r+LQaLX%UgUmS$Q-V|+Ygp>ovUbJ{jiX~_q+go2a38CD$M(o|A(oS*f(
zh?L!-@KukR?4c%)OIZBg${L2g5L6Pa=XF(yBP@&9b|agsWh)uYDy{MN@*W9zbE^QG
zPZ8wOAg?zDskn|*wf&j@!i7Pbw6fw_Jr}n|+l>O-_8a2*TEQA7y+XU@NUD_gnXUKG
z2}$1=_w*$M6~;^rw4#*yT22U!%e#`&t(A(xyf|-T(y3T1sVLvn_}AGKzdo!w)-*Uq
z)`#%}qn<l;q=-Ez1_F6G8&vU01hr}I6<_l!hVN8o(@mJ+*IQ=eETDJ22ac11p=lW#
z>a5)jZjh2p>&4DK;ogEbdo#F?UZ%H>ljUbLLNV;50EQ$-zmX5OZ~Oiu>6ZIQR6g&!
zPTyC(E=$qrR?zuYogtRne89+%HynZlT2P=QPE)k~RavpYct9<_leX;S(cUYWmJ%5i
zw<#|0L;Epc1diZ!djsOtxXCrexN0iPy+W$%xrf_3!-ktsYsF?BfO_-+rz;1%p|X0Z
z`xS4h<)pP{yf5Y2%`K?M%L1lRyQRhGg2R@R1BO$0TUeSMPUR$cJ)j;QyWQ-2SYJ1?
z%~^ILTzh8y5rPT)29-&Qo@%PiVei|f)aGz{7xO>5>77{OmMi}>lo?rwpOta_aN2a}
zZ_L3$CVhl%C4|)F%yc_!V?s)E@;~94fP)o1CTwgW@3F@BcS<{+x8_h1m|gj-8eT8~
z{P{;v_nE3QwfJ#=Vz7jq`qgMV1n|+2J0HNKgTY17#cGz07^gpi;87-UU+o*XC;A3g
zg??@@etFPbu_%d$CSm+feh%;vd<P<6xtU1fVD{-^wUgTG+R+C9wE*Vx9Oy}{0V5h8
z%!}cn>6_sgJ6ydmIB8OZ2ObCNBuk-&Tg}J-dX|>uJe}kmEmBH)Q7uAac~6f=i$joy
zJK0c6<IV@Vc<K#)o@9hc?^{!%o#9K1owiuT6nYMBY(y{oVRJrh2ESnN<K$=7!<?{$
z`Z{ObNbg%*SiMoDlhv=Q-Z8$#e%WgS;@d}Zz;~b;Hn`os6vBheHR_*r4f{ZzFqya^
zL|^@hw5hR$)LLHd=4%c?Y<H8aa_?>OM9t_Ef1k*Ry3>%RVQV4P_zwS5s^T+u`MbCH
zd6?wSSFRIE`|C9((s}H4ZYxc^RT{P)UbYCc^d<kq%=ERns3$EMiZ;(bnP<fWc4aBN
zjOP?ki{#e&;yhZF$rDYg-=~Ysx4UcGo)%hT93^ezmspjQy<4g#x=fEFiMr%|^x2En
zU{*Z$2fk?uNuIo)Qc_4&B};JRc=h_q->0IW&aSPI<Nz6v;=*jnRS)|mvKg=ib7x1N
zf&bIY|GTySzdW?r(B?E>TSpqAIQF6g6&D^@VVnrOzTa^&s3buD4Zh79z^>7JLQH+-
zqYS8QcLF8+03Y|4eD30R)L9O+_7gv<jC#5$xyud7g>yxH&uXehWGsGF8ox(YPKFj0
zeO}1^(}~=Cb++)WmDI6QeKp!MtupG%f{wZ<L2f%Hswr2b<%aGCMu-cGcwM);qi}p#
zV<@>Cy1$n!&RIBjUrS~HF0dp*p%w3uW|XYcuU?@&lSpJS-nf;@|F$`Umi_6zQo)P*
zAN?|yXKv+GF@wL}{Z@+e2fPCrPyKWP%8JnsD4{x0N4};B4)_O}kwrPV3fK?Wi2^1>
z9|==dt|saLUjuoB-9|amKlwXh1UO#${B=k&OyF9&!@HCh^(P1Z!t`T$%9BxBE^)o#
zrb+Lsi5i*!ebE*rcxuhl)knhZ#ON)wO$oi@$3X1Yo6{S=udP&GmK4bkq;<apZqxNX
zS0^>tb{^J~U4q82PKlFy7~0oQfA>1ZE&nMwI&x>vEc6U6l>WUM9Dh&x=`RU*Gbxx!
zkNtRQF<zG$_Ja}414RgH)}pX0bvvHCnblq?%z$Fi0VBGxy&_FecXjeXgbg+r8m_=Q
zPjtRr*0Lgo`SfS*dwFlD2RXv)uKdjNG_FdZ=W^LsXeAfm%FM@icIZ?qC;je~LhA33
z@~)HB`fWHt;4!(XJvTExI^4uDtkDz|VSM&NVZ(tvI_3HD)ukXfI}+xFzq#T2a^=-_
z`@pm2a|Y!=--n(z9JK=A9V_Xyu8e5M=`Ztwtn=|FM=!7B858JxC|Xng#v|9@0lU%n
z2+6OVnIt{beN@!7-K8G>;b=RUB91-eD(xJv`D~Lmt+aUbpk*|itL0+z!SP00+|E6y
z`uA#y)}Obo8;y%<&n3om?p6xzZJ%th-0j>wzfmi#6_%M|?B;=zSIm6DyAoM_apC>I
zXM6D8M09ojEP0;(Tm6=+iv(2Opx(Oj#^^AOYqkBr2bn&rSZqFl_g%UyrartZl7oXX
z-sf{fs&@{EPIHwb9qDY_<^%-#3s<X^DZWHCUsAL2cZD>oQ%QDuSy?jsU+(Fip2|+_
zGrN|zd<PPLyWBlL1<1TK`=Eah!}Fubr*H>*<~MKX{Lbhj???lU_IhSOdz4)6#L*Ah
zm&9^`M`a&%BRsm}7gG3v#DiB;WAYz|2o$)P`>;wKw>@5~1<D9z5binaWsu+c*>xl#
znaLk1Gsg9W+FM2frk6^A_#Vca3W3`Oq!4wV08%sw2(tG4QPdzk%6LE|<#%m44u|qJ
zyU?M#nQ?*VpSqw3iYXL4`rl88NPi0HtH8TIb5i9co;}~0@H+On_0OFWps8>3b*XNL
zROE5^A`ad4h3;CKVSt1Kz|T<$S=!5XFZ%6Vi5u+l>6fg(<<A~6CPGl*z%zE5lP4`X
z`SZwxibu@PKu=I_?GXWa0}yB2(fH4`2}@|tPO-U@gzywrekBQ_*MD93xd)w#XA|8k
zvVA<5&mPdEhwxTdfAX+CY&=vaex;_lx3Dcs(mqPcG~RUk$s?02muCtxo&iT=MNZQE
zv*$Xy3u^MtiG6I6Lv@)Rt+MT@jWAF1%ihc&N745*&kT?Y{r)U{R{3p|Oj*-wYf66Y
z<Qw+CDG|;AUNr0dQ8O!jY33<{DxxSABC`(Fj_3Jy?${5D6WB!THy4(<!nMKLcfY^;
z7g31Zk<;-~)bbc*Xh}mWtiGeRzHuN}Kp~>F3On}Towx%MlobtMeV$xN86aA@wyIsb
zpySR3MZYr<`22Zdh0P(}B+{cDNL&Y~SPHU}if;!Las3k+eLw;apzg$Cn=31tX!;`8
zY=|5HvpA^g-d!i?nH<DFn3_$eq{R&>Gr%`~;Flh)u-a91db%jAcig`GW_KWahiTTh
z{}^LvD}yhSsCAb|MoLE2G})=@*?##ViZEif4M<3V`i@tM!^>(*Rgr=M9E%|@2gR-B
zJV|}j_)t9!JI+t<`3J6z`iNgqpaz#UNv`wl%dOP<RO^-fAS-8*t!UBI_^ErkZ?h6C
zdVs)yV@gnUGom=wZR4%dU?gc?(wwO-{Zi}d-r%>ql&jUOM&>{9=QR^_l&7V4>`hsJ
z^G|jS@;l#xw>et_W*DeS$UNv7$Yq?LHspOA%H3LWvgs9kgq*9fx_t)_w4AYf&erE;
zoUk${(?)h)eonZuyEw`pl=f#;ELYvr!4*#ks>oM})C*(SuXf}-zfb9s0fYSo3g&C*
zV=nfhl#iZHZ8A?c#4g7pM_Rrg?|bjeon~Ou(U2Voz^zl1+IZQ!G&%DZFh62aK+ek-
zIo}{Z&X;+Mut%Mj>T@fUL(+){SDfT6!du|ddt5){zl^BJmNK30o-LWDrxIFSRRt+6
z!mYbqyWs;|mm8gb++|aKrJtx9R=#Vi=s69%I$3gH4DJ(vBFLcl7y^(vnPL2np<Li%
zjiiypxxnFae((r+@l8%o-}t#@-c4u!Kw-FH$s+>vJ^j?o{T3??tCz0EKI&uu8tndn
zkP*E{3i=Q?WeHe^H6*-O16$ApV$=)$Nqz3J%o|%deE091F8ElmB!tV*#0J2#<Fglp
zMXwLa3(@A;nueYT4nPv@=KS##CYb0!=;Rntix;jB(;NV*I;4I&pqn;V_j0{0&VBz_
z^o~!5*O#u9hq2aHOLM#dGWq-&o~~+nZKFvoLU2-y5B_}JO#5)E{LOLu!AjY$V=x4Q
zvVvSj@UyEpSSA8;4GLd+`M0A7W}pb-s7Dl)H4eAkz>d^I^`4ktA5yK?Q)z|RG`a?V
z6vH1jHr#*xxAsihWpi)FEq@|s`QcppDIGpfxROKBu0<7Fy{apE5|3#IrOxK5OZfiT
zjAMJ0KGV~$kv@fkjt4!>L}(9#^U%fwjj7Soc36XR)nDkQ3%8O)y;4K2VSi!6N4Mh@
zw62zp(^}TOjuhC^j`!miC0|X$=v@bbB+t5$f4<4>B;>4L-dJnDu>0!J6a6@}jJN&h
z5e^#-V!s9Wub&ovQDiBRQH|Uc+sDm4EBsD^hoLp{bH0m|`La@aQ;Ug8XOExRXK|8f
z^?z9pD!y^tS<2~MSIn4a7XMfypgzG#m*nQ%dM@^@iK_bUx$*elFco$VW}e6F=)=J*
z3o<(tO11GJCk*0owwI(!QK`Ukf9T;Pd{7*GdM=q|Klu8W#Ibn*K754KV1q`FWw!Tu
zep>9~)rzk~X|!cCM0wh46KQ1GO>+TU8SrsBIj*FPcmY7D$cXZ;q6s*Vh)z%o(t;vn
zx!K|qj$8j0+q9$yyXv#dz}`dy+B*;=H54B~0IEX%s9R#o6}<AVWl&qNgCY1c7~mgf
zgp;Dl0ZQeIAzkB|l9EvF9U@tb5XkJ3ghYtoLtvROFg3R>K@lXi@`Zn-ymH++KpSwT
zEpq>t59b$ORT?+07%Qzh8*}&0C2m>=7z55<KS&4}0V^0R-E3Sl|E|*>P?UqIjx=Nd
z5_RT#G>kXWDMf$`cv#^@V6=CmHr$UfeA!pUv;qQtHbiC6i2y8Q<!!lfZ&-fa=`70G
zfcECC?pOS)M3z@2DdD`K(MjT8;xhv`=xZxuSDG%LZqXJMDG)s_FV3OFE;(S(-si<z
z37NU&zRb2nuiD#B%H11`8@E0(nq)&17nq~aY@*k<AU`yffY=NupKZE}vyqi_GUjT1
zTP4S(t)F8qZ&?;9et9y6<Nw8OS9uD4jb`uBRIBB*NW3|uf%M7|Eh_YwVD`Q#PqU>N
z_e#fn4t6ytGgXu;d7vVGdnkco*$$)h)0U9bYF(y!vQMeBp4HNebA$vCuS3f%VZdk<
zA0N@-iIRCci*VNggbxTXO(${yjlZp>R|r93&dmU$WQz=7>t!z_gTUtPbjoj2-X{Rs
zrTA$5Jtrt~@cao#5|vM$p+l3M_HC0Ykiw9@7935K_wf*-^|GKh$%+opV7&;?rh9&P
zh@9}XUqp-`JNnPs3e9~OrZBIJ1eel)hsimyfZSIAKa-_e!~q3^y@G=z;FN<65|y#S
zIBWtzFv3n-*Aa|5F3Z9=zMs!RG6&8j!J;3)knD|vHy=yM(L#G}?m=jXNQ08rzG{Q?
z03L8v^?3q`cxQdd42Z9RVo{e%Ga$C`=^7nqlxSf^lZhCTfwJB*!vD&M6QLv2g3NcE
zlLNNSl;_UR5*{d}Kf!uIIF!i1cJDS7fMI##KSPmi=TR$DWZKb=cLBWJrF7#XGuhG7
zjcL@fyIHYDII3IRrCBTavFc^BM=uYdvN&GWBrcfogytsZ#m<jV_YX&M0!9{1JHf)r
zm9e^!^y`NtF5D$UCQ0@6`dSiWu;j==CI|_!he7R2wg5R5R5bO(GJ|a-Z%x&uyq(7w
zpMere<7kS|BK!6?=kpB--3ZGOKgA(7Whdf7zB@c{)trvw7Y65K8V3Gz3?E3D<KvB_
zOGIc)Hl`n+;Q}-`vNhA*nlmI`P^0+v<uCPjQ7pp}=9-g0Z@&h;FVtzRdMS73*I`=9
zk;MCw66uMI0NPaf^`nhYhA5J@qZhgL40gIpIfa7br9O-v-<!p}?H*9Qc;qw}$T(M4
zM*4ioA;RpVGBzK6SaZ06_Q5+m!qTG(-Xs|7?hS5`%YB(4{(SV|+f>NX@9K+}pNp_=
z<CG=Bq2tk2o?dS^yVAo%Bs^V=2h$v1fV>k9AV-B>m?U~{NIbky_m^|J@%P=#HgBe^
zDfz`6g|`gOJpKE@q~4TH!vrHVNVb%n^e@&ALm85qj|xaBT5I90Ycp`;(u*rwGoyp?
zo42?p->1XHi@SD&m=D5+6}|bUFWFw^Ue~(Ns1WQdWg=ux{zyH+AM<uLHSu$vQN!P~
z_xL005h?Ozk9%tlH(SS<L|9wKje=6do=CvT`V3|FTu3zb9s}<7vm2maeOH5K#nKsi
z@Fg^I>91|XPZ%d*fiP0agmU%;tlV*!A{7y5(|3pSIw`dLqLknHv_PQBq$*|@+K4(r
z(nO>@f;?%pkIO4xr70*Nk#eL*y7<W}s`h0dyoir-o(pB!Q;eP4252BD+Wwdr=g7KH
zx&%1j*?2h6rzAeP6!MM@DR*2n*%#M#c{Wr&ikd!7!>x+_=)8hsToX389#3w1KYRW>
z*jT1<tK+00yKW<W9;Ji>0YzQG%=Q$~Vd?jE*NFJ3Q_1xC`bl#coS5x4+(w)Pk{J+G
z!)n>NlV4dtbN2@K)QdPtA{jC87jPU@hGv_JS3`DM&#QrL5o|v9pZ!u|C7l8Y!06X}
zo>&23nPdehmmoN^p|A!0tiUTr`CHa7lrfP~sQnxYB!UG1e(yGzf9ed??k|R+753Jl
z7|p%-Z;}uZWB`691Y{;<mpkfjO9w&r;=7C?BB%gau)YREww~L%GY=c#VbCWySrkq-
z2-M2T4jnvBR@lQ?C@%fb7bHov@BsY2GGa8*o;V;QLjP@hsFk_beO}s^_FrlZj<sW}
z^#Axof>z%fht0EQ5I=Q=xM!$55sB}?14LLaJP!Sh9=o6Ct`HH&OJAVuCgBpm0G_>L
zLgPblVMON9`^+|EfPcuK*NO!3l?TlBFPGtQ7{6XmmBfL}Lk{{Mr*gyq842232l)y!
z&EGfE9#VdjQO(a$U8DtYD6#;quA5M_q9pjqqG3-3XgR=iH5haYfFOE#7*m*WlW+;p
z?*(<slkke$2k4-ae^~BY`~rK!ohJ$RjmMPY0cH~x9HeyD@kPNh4N&Wxz=Lk`_oV<v
zEqi?!MvIy2xxqRN`RhDAfuDR0c)JDQV;F#Y5N6LG=OwjlpVh%I&g5<{L2t4Z3$VdD
z0DnB7OL>QB<`&=?VN8b*zDdAXk|0u&ChUKnuK~u}^00YLP@tffpKM40h@>0qAv>J$
zJrJO6LoW6nQ;Lt_8TqG$3|&uIySi8pIQWB_=t1;Ew5BRl7J?W_#P#Q!jsiS1)t)R&
zBm=TT1+G!Pc}xbIpGmNXV5B}zM2aE|pbfY#^zg<53DRF@)}T12BMzF0(fIJ0A+3Z)
zF(FCSsFO`ljPqMasO-{OJsw6GD$89qiidf9!om$onI10;i?xPp_7Zxa02^=nHJfV2
zo}1Yu%99UK)~|dQR05$flJ_LP@??KD=@6^q3rd&zl=sq`D155z=wL0%C|=Gl`rS`{
zw-3XN{PCKN>`Mx4Uux^yLNOaIrkrs#Bqr1f%w1cG$Fdo;T7H<^$r|;|#mdi$cevZ*
zdUc9(`eHt8@K+4=->Qr*HrT(({2Uj)Bl+GPr7ru{us3&!JKUzXmE_(`3UuU4d?;JL
zc1X3KSL^U^==r@m)sd2}-$!fwYMO<Lm4Am-pt3HC+GjgaM;?alQRJ>+)%E6|CLIK_
z##nHbe&&rMSDpx}2%+?FJ^shJ8yjE97(vftaucYh>*)KEqRD9|NrLKH=hV$e9A!~^
z4bADay5RL!GXeJ2_zHiwLYIYD#U!gVUX?0lWn6r52N(6LN{Xi9iK=_HO>X!U%Sq@l
zh^!p)kHb1d(Ot9To5A<k@$+>fPe}~eD)OZ0MoXW((BIk$hb?gir611I2@D$KJ^VOg
zT4fSfiCU#LYYL*CDCFNS4@bFDJa-<mqsvP9*xRxd(zJ75U#R!{_SpN+MJN3N{q0Vc
z)_%{%rD~menA!0#ef5Y@_?q@Q^s%8r_%-d!PZRKWbRNi*CL#&?RD`|F^NwkGNljlt
z?Mx!aiqiF?+TuUixu;I&o*oiGJLF148?%yr8`>HD&yA+x-IPQdMe7%+($&f?mC=n)
z%&EO|+G#XLeHlo%(5I?7ol`ugo-_s0FL0#nkfTIT>6E9z50T3{?rk#sL>rRnNM~|9
zbq!>`l)R){K{#)v-}J)R27GTgA_f4XfzXn2${0y<*>7Svs39Rgf5ulzf}LmgT3Eqn
z8G!%JRL1Gwj7k#Zh=Le=U`Dd4zH#;|o}L#6L-c(Lz<A&O6VGcL6UFO{{y_}_gkz_V
zaSWs>=^Dm0-V6?8-?W5q)|w-V8|R@XK0f;$q`<NqY%rd_N*!1*#tnYvY;&N6-T4W_
zO{kdA9pvagkriDMsx=^~ccFv;9SVQJ09GnfCFEg)v_LNilgi(B0N%X8Y(deuu%ZJ9
zj)7ttl%*8F8e)FaA4j?y+~w;8h^qv9SupwgapHB5(k4~-^tv%Ang!4j$}mm5(E;e{
zwZ)Aaw*h0%A}2tx2AIX(y>9@OmGmQp4JO_0Zgzau^3zjqT)q;CKx|;eNzuf>j1twm
zQVhYEF@QgguW{CYFS%U=FfSW|H*CE2A+vuEH66-Q#2iU|Hp8DbO&^njfDi(!U@PIK
z7gKGe-eQ+t4rUUtOnfvN87~ND%ab5b!x8Kexv=DeQHV%lmmMLXSRR33<R;FYuDZY2
zT)9o82VMu~r;!@tyr33SruiY75R8spF07M_0XCr5yYN(~MQqBD9qbWp;P|F%v(F4z
zmksX{^+(jiXh(+}3evNy#Le(EVz&b;b~1Fq{PH+8#mX~i=AZD}*~&D0yvdNA{WEw_
zY@HlA*gArv8M<z6K}0@$U#9~y1NkuYTT%1*4wX3Dces6@>V1Aty75xeT&9+VL0)Pz
zHpe~F;-a3{`62`|2n#wq#ktiRT;Lh?1diJGf-G(W%QRhQ=!Jr8$ZYk3OReu(4&Gvg
zpl?-6>j!|kPL7>&DkSoxD|)&8W{jZ2fm<;ybWp=h-n|lrVTDs2KpsZq8Q@_M%r>_G
z6KCrGAXxq8UNzXk`cExGjmaZsNdrw!&Z+iI)D|i}mo;laGQ-M%`}Lv&JJzx${Fd2`
zs~^QJGpsDcGk=sm8SeA2z~=GbR9j%8fE@kpnk59Gk8>W2JHBvC&t8y~%f9?sa~*MT
zzP9Q8+4`#QlH>2jX$MYd!H45&7r$Jq^`E!@tm|Bu+=?c(yux?!x_X7iET(66!RFDJ
zzB?@ffQNcw6D-yOq*Rav4dB9dVs+0RBr5E*p3whI*rE4%-H25JcTOP^)Sh)#sZzJ+
z$IbOD+<aX1O<vVJh>T^K=`N6CDCpfKHwv%aj}rTaikoks1a4O*+M}j{W)R#K&nzKm
zPg7psVmbDEy1VO-r#xCjVwX&}+zKNECBJ!Q<Mufu>guJUSSN_kOkv4T&}pz(^z6}X
zGCV=1#|a(xlOI`HtWV8dgfuF4s$*LghD`Amxfcq5mblTfRr+m0tzen&#b|xUxLu~H
zK~RBt!`&v4%R?`#kjuBJ$opo+D?{Uaa{a2hC;Ka(&ON7#V0K>#_J%#LVtBRt)u}`s
z=<U^`rG*6b+tRGw*|6A4=sc-%xo;5a6472t)usQHt|8hv&ZXxoS?*C7XLVR$b}kkF
zkkr)wc3_S)#KsE){DM94|LrE^Uz?@+?J<AmC_44={ar-S0Ul`tanQZ83s^9l-yJ5o
z(e%a~?=^vTn-c$A*rOJv#bvc@g>j4Xe0jY2@p+RHv*#26?%g93kteo0Q@0;`x2ZCw
zUn4`&W-e{5P}Q($ccv`W$#ILg_$6+&?B*0cJk#%;d`QzBB`qy)(UxZZ&Ov}Yokd3N
zj~ERapEhGwAMEX1`=zw)*qz1io2i_F)DBjWB|*PHvd4MRPX+%d*|}3CF{@tXNmMe6
zAljfg2r$`|z9qsViLaWuOHk$mb2UHh%?~=#HPf2CPQh<kud|ytAQ|{;2JcdSji)7A
zh*<G?HbwB7-$71=rmMfR&bPj32LD;tNpbnvziWS^4&90iwszK{1a#{UHjRzHOEnvg
zZI&1t|2sAiJm;_9wsF$mGi;6DTw&0*QF%I6WUkd|ZaL;UHe3`de5<71X>;AUrYWW~
zvTV9=)lS#UB-`B5)Kb!Ylg0RA){o3e`19Jl&hb@~zS>>vrFR-^youk^@6><O%E~f^
zt-!g)dN*z{l7%hV*!!SORC7qMhG;L_EA-V5%@?{SwwqQ*LI~ZJ%NuMDk!3U6zoTJh
z7Ek%#YEkYhA3T}-V%PFjuHo18i{tqg3u({!yK?mbqw_wjYH=xEeLLUw_Ag_2^>0S`
zToim7wzkY|Yt*;aGUy!o{yxd8=*L;orYQC!H#=|pjn&hO>o9B$tJu8TBHmxPPsm-)
zM#T(;Z9<C4rhVRa^LwUe4fklu=kkQgf-nOE?CM*=>_uvy1xq;yeeWQV6|}+=O;1%)
zGZyI<lFjz4O1+D6g;VDs7`*2knXx1>q}2>crU3z2ri)(ut%F~+%S>FR4^<C_vZWrZ
zp2@k5rrCUzc_4bwxv9;D5S~btT_kHzn-a{ZD~df4-gyqz6x}P5>Xw()Y-+~&Xp*Ns
z$?%1aydpzNIz2aN98}oth>3boYSifQ)J81Of>6k)!`WQWrB;xxXccBzrWe5V*>oMh
zon)MEw$@-*!>L`CK}u@x^9-4gfvepI0b8q5QYVXr96{4Q#s2ZelHXxHv~G{GymRer
zqyj7m)3yn3z5i4koiIJ!-u=p6QeL|BN+pWd>}TOFOVi01q839$NZ&I_quqb(n~9Wk
id-{KKnnu*>l46e`&P3zgUlQEeAE2(Hqg<+p4E|raIYd(c

literal 0
HcmV?d00001

diff --git a/ollama/src/main/res/layout/activity_main.xml b/ollama/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..0f63aeb
--- /dev/null
+++ b/ollama/src/main/res/layout/activity_main.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	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:orientation="vertical">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:gravity="center_vertical|center_horizontal"
+		android:layout_weight="1.0">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Ollama"
+			android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<cc.winboll.studio.libappbase.LogView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="Text"
+			android:id="@+id/logview"/>
+
+	</LinearLayout>
+
+</LinearLayout>
+
diff --git a/ollama/src/main/res/values-v21/styles.xml b/ollama/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000..0aed032
--- /dev/null
+++ b/ollama/src/main/res/values-v21/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
+        <item name="android:colorPrimary">@color/colorPrimary</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
+        <item name="android:navigationBarColor">?android:colorPrimary</item>
+	</style>
+</resources>
\ No newline at end of file
diff --git a/ollama/src/main/res/values/colors.xml b/ollama/src/main/res/values/colors.xml
new file mode 100644
index 0000000..294809a
--- /dev/null
+++ b/ollama/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#009688</color>
+    <color name="colorPrimaryDark">#00796B</color>
+    <color name="colorAccent">#FF9800</color>
+</resources>
\ No newline at end of file
diff --git a/ollama/src/main/res/values/strings.xml b/ollama/src/main/res/values/strings.xml
new file mode 100644
index 0000000..ab3b5bc
--- /dev/null
+++ b/ollama/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Ollama</string>
+</resources>
diff --git a/ollama/src/main/res/values/styles.xml b/ollama/src/main/res/values/styles.xml
new file mode 100644
index 0000000..6799c28
--- /dev/null
+++ b/ollama/src/main/res/values/styles.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
+	</style>
+</resources>
\ No newline at end of file
diff --git a/ollama/src/stage/AndroidManifest.xml b/ollama/src/stage/AndroidManifest.xml
new file mode 100644
index 0000000..ee78d9f
--- /dev/null
+++ b/ollama/src/stage/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <application>
+
+        <!-- Put flavor specific code here -->
+
+    </application>
+
+</manifest>
+
diff --git a/ollama/src/stage/res/values/strings.xml b/ollama/src/stage/res/values/strings.xml
new file mode 100644
index 0000000..ace0c41
--- /dev/null
+++ b/ollama/src/stage/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Put flavor specific strings here -->
+
+</resources>
diff --git a/settings.gradle-demo b/settings.gradle-demo
index 351aef6..d505096 100644
--- a/settings.gradle-demo
+++ b/settings.gradle-demo
@@ -57,3 +57,7 @@
 // AndroidXDemo 项目编译设置
 //include ':androidxdemo'
 //rootProject.name = "androidxdemo"
+
+// Ollama 项目编译设置
+//include ':ollama'
+//rootProject.name = "ollama"

From 803745d12eb606a4bdbaf019c835d1ba6500908c Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Thu, 27 Mar 2025 20:45:57 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AE=80=E5=8D=95http?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ollama/build.gradle                           |   2 +
 ollama/build.properties                       |   4 +-
 ollama/src/main/AndroidManifest.xml           |   5 +-
 .../winboll/studio/ollama/MainActivity.java   |  17 +++
 .../winboll/studio/ollama/OllamaClient.java   | 108 ++++++++++++++++++
 ollama/src/main/res/layout/activity_main.xml  |  42 ++++++-
 6 files changed, 170 insertions(+), 8 deletions(-)
 create mode 100644 ollama/src/main/java/cc/winboll/studio/ollama/OllamaClient.java

diff --git a/ollama/build.gradle b/ollama/build.gradle
index c5272da..4a162b5 100644
--- a/ollama/build.gradle
+++ b/ollama/build.gradle
@@ -46,6 +46,8 @@ android {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    
     // 吐司类库
     api 'com.github.getActivity:ToastUtils:10.5'
 
diff --git a/ollama/build.properties b/ollama/build.properties
index 24852bd..ae139c3 100644
--- a/ollama/build.properties
+++ b/ollama/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 11:38:18 GMT 2025
+#Thu Mar 27 12:33:37 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=12
+buildCount=17
 baseBetaVersion=15.0.1
diff --git a/ollama/src/main/AndroidManifest.xml b/ollama/src/main/AndroidManifest.xml
index 491eadb..f9dfa9c 100644
--- a/ollama/src/main/AndroidManifest.xml
+++ b/ollama/src/main/AndroidManifest.xml
@@ -4,6 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="cc.winboll.studio.ollama">
 
+    <!-- 拥有完全的网络访问权限 -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application
         tools:replace="android:appComponentFactory"
         android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
@@ -36,4 +39,4 @@
 
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/ollama/src/main/java/cc/winboll/studio/ollama/MainActivity.java b/ollama/src/main/java/cc/winboll/studio/ollama/MainActivity.java
index 3876559..29a23b5 100644
--- a/ollama/src/main/java/cc/winboll/studio/ollama/MainActivity.java
+++ b/ollama/src/main/java/cc/winboll/studio/ollama/MainActivity.java
@@ -2,11 +2,18 @@ package cc.winboll.studio.ollama;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
 import cc.winboll.studio.libappbase.LogView;
 
 public class MainActivity extends Activity {
 
     LogView mLogView;
+    TextView mtvMeaasge;
+    EditText metAsk;
+    Button mbtSend;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -15,6 +22,10 @@ public class MainActivity extends Activity {
 
         mLogView = findViewById(R.id.logview);
         mLogView.start();
+        
+        mtvMeaasge = findViewById(R.id.message_tv);
+        metAsk = findViewById(R.id.ask_et);
+        mbtSend = findViewById(R.id.send_bt);
     }
 
     @Override
@@ -22,4 +33,10 @@ public class MainActivity extends Activity {
         super.onResume();
         mLogView.start();
     }
+    
+    public void onSend(View view) {
+        OllamaClient.SyncAskThread thread = new OllamaClient.SyncAskThread(mtvMeaasge.getText().toString());
+        thread.start();
+        mtvMeaasge.setText("");
+    }
 }
diff --git a/ollama/src/main/java/cc/winboll/studio/ollama/OllamaClient.java b/ollama/src/main/java/cc/winboll/studio/ollama/OllamaClient.java
new file mode 100644
index 0000000..f31a602
--- /dev/null
+++ b/ollama/src/main/java/cc/winboll/studio/ollama/OllamaClient.java
@@ -0,0 +1,108 @@
+package cc.winboll.studio.ollama;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/27 19:55:28
+ * @Describe 简单Http协议访问客户端
+ */
+import java.io.IOException;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.json.JSONException;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class OllamaClient {
+
+    public static final String TAG = "OllamaClient";
+
+    //private static final String API_BASE_URL = "http://localhost:11434";
+    private static final String API_BASE_URL = "https://ollama.winboll.cc";
+    private static final OkHttpClient client = new OkHttpClient();
+
+    // 1. 生成文本示例
+    static void generateText(String prompt, String model) {
+        String url = API_BASE_URL + "/api/generate";
+        try {
+            JSONObject payload = new JSONObject()
+                .put("model", model)
+                .put("prompt", prompt)
+                .put("temperature", 0.7)
+                .put("max_tokens", 200);
+
+            Request request = new Request.Builder()
+                .url(url)
+                .post(RequestBody.create(payload.toString(), MediaType.get("application/json")))
+                .build();
+
+            Response response = client.newCall(request).execute();
+            if (response.isSuccessful()) {
+                String result = response.body().string();
+                JSONObject json = new JSONObject(result);
+                LogUtils.d(TAG, "生成结果: " + json.getString("response"));
+                //System.out.println("生成结果: " + json.getString("response"));
+            } else {
+                LogUtils.d(TAG, "请求失败: " + response.code());
+                //System.out.println("请求失败: " + response.code() + " " + response.message());
+            }
+        } catch (JSONException|IOException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    // 2. 获取模型列表示例
+    static void getModelList() {
+        String url = API_BASE_URL + "/api/models";
+        LogUtils.d(TAG, "url : " + url);
+        Request request = new Request.Builder().url(url).build();
+
+        try {
+            Response response = client.newCall(request).execute();
+            if (response.isSuccessful()) {
+                JSONArray models = new JSONArray(response.body().string());
+                //System.out.println("可用模型列表:");
+                LogUtils.d(TAG, "可用模型列表:");
+                for (int i = 0; i < models.length(); i++) {
+                    JSONObject model = models.getJSONObject(i);
+                    LogUtils.d(TAG, "- " + model.getString("name") + " (" + model.getString("size") + ")");
+                    //System.out.println("- " + model.getString("name") + " (" + model.getString("size") + ")");
+                }
+            } else {
+                LogUtils.d(TAG, "获取模型列表失败: " + response.code());
+                //System.out.println("获取模型列表失败: " + response.code());
+            }
+        } catch (JSONException | IOException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    static void unittest(String ask) {
+        // 获取模型列表
+        getModelList();
+
+        // 生成文本
+        generateText(ask, "llama2");
+    }
+    
+    public static class SyncAskThread extends Thread {
+        String ask;
+        public SyncAskThread(String ask) {
+            this.ask = ask;
+        }
+
+        @Override
+        public void run() {
+            super.run();
+            LogUtils.d(TAG, "run() start.");
+            unittest(this.ask);
+            LogUtils.d(TAG, "run() end.");
+        }
+        
+    }
+}
+    
+
diff --git a/ollama/src/main/res/layout/activity_main.xml b/ollama/src/main/res/layout/activity_main.xml
index 0f63aeb..39dd559 100644
--- a/ollama/src/main/res/layout/activity_main.xml
+++ b/ollama/src/main/res/layout/activity_main.xml
@@ -10,13 +10,45 @@
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:gravity="center_vertical|center_horizontal"
-		android:layout_weight="1.0">
+		android:layout_weight="1.0"
+		android:orientation="vertical">
 
-		<TextView
-			android:layout_width="wrap_content"
+		<ScrollView
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_weight="1.0">
+
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:text="Ollama"
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:id="@+id/message_tv"/>
+
+		</ScrollView>
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:text="Ollama"
-			android:textAppearance="?android:attr/textAppearanceLarge"/>
+			android:gravity="center_vertical">
+
+			<EditText
+				android:layout_width="0dp"
+				android:ems="10"
+				android:layout_height="wrap_content"
+				android:id="@+id/ask_et"
+				android:layout_weight="1.0"
+				android:text="Hello, World!"/>
+
+			<Button
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="Send"
+				android:id="@+id/send_bt"
+				android:onClick="onSend"/>
+
+		</LinearLayout>
 
 	</LinearLayout>
 

From 1c27d0ccdcf7d52a3f5211753064e02a313c9686 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Fri, 28 Mar 2025 05:04:15 +0800
Subject: [PATCH 3/5] =?UTF-8?q?Ollama=20=E9=97=AE=E7=AD=94=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=AE=8C=E6=88=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ollama/build.properties                       |   4 +-
 ollama/src/main/AndroidManifest.xml           |   9 +-
 .../winboll/studio/ollama/MainActivity.java   |  92 ++++++---
 .../winboll/studio/ollama/OllamaClient.java   | 189 ++++++++++++++----
 .../ollama/OllamaResponseFormatter.java       |  72 +++++++
 ollama/src/main/res/layout/activity_main.xml  |   8 +-
 ollama/src/main/res/values/styles.xml         |  10 +-
 .../main/res/xml/network_security_config.xml  |   6 +
 8 files changed, 314 insertions(+), 76 deletions(-)
 create mode 100644 ollama/src/main/java/cc/winboll/studio/ollama/OllamaResponseFormatter.java
 create mode 100644 ollama/src/main/res/xml/network_security_config.xml

diff --git a/ollama/build.properties b/ollama/build.properties
index ae139c3..ce776d9 100644
--- a/ollama/build.properties
+++ b/ollama/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 12:33:37 GMT 2025
+#Thu Mar 27 21:02:48 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=17
+buildCount=59
 baseBetaVersion=15.0.1
diff --git a/ollama/src/main/AndroidManifest.xml b/ollama/src/main/AndroidManifest.xml
index f9dfa9c..3d38280 100644
--- a/ollama/src/main/AndroidManifest.xml
+++ b/ollama/src/main/AndroidManifest.xml
@@ -8,13 +8,12 @@
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        tools:replace="android:appComponentFactory"
-        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/MyAppTheme"
         android:resizeableActivity="true"
-        android:name=".App">
+        android:name=".App"
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
             android:name=".MainActivity"
@@ -39,4 +38,4 @@
 
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/ollama/src/main/java/cc/winboll/studio/ollama/MainActivity.java b/ollama/src/main/java/cc/winboll/studio/ollama/MainActivity.java
index 29a23b5..54ce2bd 100644
--- a/ollama/src/main/java/cc/winboll/studio/ollama/MainActivity.java
+++ b/ollama/src/main/java/cc/winboll/studio/ollama/MainActivity.java
@@ -1,42 +1,88 @@
 package cc.winboll.studio.ollama;
 
-import android.app.Activity;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ScrollView;
 import android.widget.TextView;
-import cc.winboll.studio.libappbase.LogView;
 
-public class MainActivity extends Activity {
+public class MainActivity extends AppCompatActivity {
 
-    LogView mLogView;
-    TextView mtvMeaasge;
-    EditText metAsk;
-    Button mbtSend;
+    public final static int MSG_APPEND = 0;
+
+    private Handler _Handler = new Handler(Looper.getMainLooper());
+    private TextView mtvMessage;
+    private EditText metAsk;
+    private Button mbtSend;
+    private ScrollView msvMessage;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        mLogView = findViewById(R.id.logview);
-        mLogView.start();
-        
-        mtvMeaasge = findViewById(R.id.message_tv);
-        metAsk = findViewById(R.id.ask_et);
-        mbtSend = findViewById(R.id.send_bt);
+        mtvMessage = (TextView) findViewById(R.id.message_tv);
+        metAsk = (EditText) findViewById(R.id.ask_et);
+        mbtSend = (Button) findViewById(R.id.send_bt);
+        msvMessage = findViewById(R.id.message_sv);
+
+        mbtSend.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    sendQuestion();
+                }
+            });
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-    
-    public void onSend(View view) {
-        OllamaClient.SyncAskThread thread = new OllamaClient.SyncAskThread(mtvMeaasge.getText().toString());
-        thread.start();
-        mtvMeaasge.setText("");
+
+    //
+    // 设置输入框获得焦点的类
+    //
+//    static class MyHandler extends Handler {
+//        WeakReference<MainActivity> mActivity;  
+//        MyHandler(MainActivity activity) {  
+//            mActivity = new WeakReference<MainActivity>(activity);  
+//        }
+//        public void handleMessage(Message msg) {
+//            MainActivity theActivity = mActivity.get();
+//            switch (msg.what) {
+//                case MSG_APPEND:
+//                    theActivity.mtvMessage.append((String)msg.obj);
+//                    break;
+//                default:
+//                    break;
+//            }
+//            super.handleMessage(msg);
+//        }
+//	}
+
+    private void sendQuestion() {
+        final String question = metAsk.getText().toString().trim();
+        if (!question.equals("")) {
+            mtvMessage.append("\n\nI ：" + metAsk.getText().toString() + "\nOllama : ");
+            metAsk.setText("");
+            new OllamaClient.SyncAskThread(question, new OllamaClient.OnAnswerCallback() {
+                    @Override
+                    public void onAnswer(final String answer) {
+                        _Handler.post(new Runnable() {
+                                @Override
+                                public void run() {
+                                    mtvMessage.append(answer);
+                                    msvMessage.post(new Runnable(){
+                                            @Override
+                                            public void run() {
+                                                msvMessage.fullScroll(View.FOCUS_DOWN);
+                                            }
+                                        });
+                                }
+                            });
+                    }
+                }).start();
+        }
     }
 }
+
diff --git a/ollama/src/main/java/cc/winboll/studio/ollama/OllamaClient.java b/ollama/src/main/java/cc/winboll/studio/ollama/OllamaClient.java
index f31a602..2d2f00c 100644
--- a/ollama/src/main/java/cc/winboll/studio/ollama/OllamaClient.java
+++ b/ollama/src/main/java/cc/winboll/studio/ollama/OllamaClient.java
@@ -5,103 +5,218 @@ package cc.winboll.studio.ollama;
  * @Date 2025/03/27 19:55:28
  * @Describe 简单Http协议访问客户端
  */
+import cc.winboll.studio.libappbase.LogUtils;
 import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import okhttp3.Call;
+import okhttp3.Callback;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.Source;
 import org.json.JSONException;
-import cc.winboll.studio.libappbase.LogUtils;
+import org.json.JSONObject;
 
 public class OllamaClient {
 
     public static final String TAG = "OllamaClient";
 
-    //private static final String API_BASE_URL = "http://localhost:11434";
-    private static final String API_BASE_URL = "https://ollama.winboll.cc";
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final String API_BASE_URL = "https://ollama-api.winboll.cc";
+    //private static final String API_BASE_URL = "http://10.8.0.10:11434";
+    //private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = new OkHttpClient.Builder()
+    .connectTimeout(60, TimeUnit.SECONDS)
+    .readTimeout(60, TimeUnit.SECONDS)
+    .writeTimeout(60, TimeUnit.SECONDS)
+    .build();
 
     // 1. 生成文本示例
-    static void generateText(String prompt, String model) {
+//    static void generateText(String prompt, String model) {
+//        String url = API_BASE_URL + "/api/generate";
+//        try {
+//            JSONObject payload = new JSONObject()
+//                .put("model", model)
+//                .put("prompt", prompt)
+//                .put("temperature", 0.7)
+//                .put("max_tokens", 200);
+//
+//            Request request = new Request.Builder()
+//                .url(url)
+//                .post(RequestBody.create(payload.toString(), MediaType.get("application/json")))
+//                .build();
+//
+//            Response response = client.newCall(request).execute();
+//            if (response.isSuccessful()) {
+//                String result = response.body().string();
+//                String formattedStream = OllamaResponseFormatter.formatStreamingResponse(result);
+//                
+//                // 输出示例：
+//// [2025-03-27T19:34:29.274955439Z] [llama3.1:8b] It looks like you might have miss
+//// [2025-03-27T19:34:30.482553089Z] [llama3.1:8b] pelled the word "Ollama" or perhaps said something that is not a standard word in the English language. However, I'm here to provide information and assistance on various topics, so please let me know what you meant by "Ollama." Was it related to a name, place, movie, game, or something else?
+//                
+//                LogUtils.d(TAG, formattedStream);
+////                JSONObject json = new JSONObject(result);
+////                LogUtils.d(TAG, "生成结果: " + json.getString("response"));
+//                //System.out.println("生成结果: " + json.getString("response"));
+//            } else {
+//                LogUtils.d(TAG, "请求失败: " + response.code());
+//                //System.out.println("请求失败: " + response.code() + " " + response.message());
+//            }
+//        } catch (JSONException|IOException e) {
+//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+//        }
+//    }
+
+    // 实时输出流式响应的函数
+    static void generateTextStream(String prompt, String model, final OnAnswerCallback callback) {
         String url = API_BASE_URL + "/api/generate";
         try {
             JSONObject payload = new JSONObject()
                 .put("model", model)
                 .put("prompt", prompt)
                 .put("temperature", 0.7)
-                .put("max_tokens", 200);
+                .put("max_tokens", 200)
+                .put("stream", true); // 启用流式响应
 
             Request request = new Request.Builder()
                 .url(url)
                 .post(RequestBody.create(payload.toString(), MediaType.get("application/json")))
                 .build();
 
-            Response response = client.newCall(request).execute();
-            if (response.isSuccessful()) {
-                String result = response.body().string();
-                JSONObject json = new JSONObject(result);
-                LogUtils.d(TAG, "生成结果: " + json.getString("response"));
-                //System.out.println("生成结果: " + json.getString("response"));
-            } else {
-                LogUtils.d(TAG, "请求失败: " + response.code());
-                //System.out.println("请求失败: " + response.code() + " " + response.message());
-            }
-        } catch (JSONException|IOException e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            LogUtils.d(TAG, "Request request");
+            client.newCall(request).enqueue(new Callback() {
+                    @Override
+                    public void onFailure(Call call, IOException e) {
+                        LogUtils.d(TAG, "请求失败: " + e.getMessage());
+                    }
+
+                    @Override
+                    public void onResponse(Call call, Response response) throws IOException {
+                        if (!response.isSuccessful()) {
+                            LogUtils.d(TAG, "请求失败: " + response.code());
+                            return;
+                        }
+
+                        try (ResponseBody body = response.body()) {
+                            if (body == null) return;
+
+                            // 实时流式解析
+                            LogUtils.d(TAG, "实时流式解析");
+                            Source source = body.source();
+                            Buffer buffer = new Buffer();
+                            StringBuilder fullResponse = new StringBuilder();
+                            boolean isDone = false;
+
+                            while (!isDone && source.read(buffer, 1024) != -1) {
+                                //LogUtils.d(TAG, "!isDone");
+                                String chunk = buffer.readUtf8();
+                                String[] lines = chunk.split("\n");
+
+                                for (String line : lines) {
+                                    LogUtils.d(TAG, line);
+                                    if (line.trim().startsWith("{\"model\":")) {
+                                        LogUtils.d(TAG, line);
+                                        String jsonStr = line;
+                                        if (jsonStr.equals("[DONE]")) {
+                                            isDone = true;
+                                            LogUtils.d(TAG, "流式生成完成");
+                                            break;
+                                        }
+
+                                        try {
+                                            //LogUtils.d(TAG, jsonStr);
+                                            JSONObject json = new JSONObject(jsonStr);
+                                            //LogUtils.d(TAG, json.toString());
+                                            String responseText = json.getString("response");
+                                            //LogUtils.d(TAG, responseText);
+                                            fullResponse.append(responseText);
+
+                                            // 实时输出
+                                            callback.onAnswer(responseText);
+                                            LogUtils.d(TAG, "实时响应: " + responseText);
+
+                                            // 处理完成状态
+                                            if (json.getBoolean("done")) {
+                                                isDone = true;
+                                                String doneReason = json.optString("done_reason", "unknown");
+                                                LogUtils.d(TAG, "生成完成 (原因: " + doneReason + ")");
+                                                LogUtils.d(TAG, "完整回答: " + fullResponse.toString());
+                                            }
+                                        } catch (JSONException e) {
+                                            LogUtils.d(TAG, "JSON解析错误: " + e.getMessage());
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                });
+        } catch (JSONException e) {
+            LogUtils.d(TAG, "JSON格式错误: " + e.getMessage());
         }
     }
 
+
+
     // 2. 获取模型列表示例
     static void getModelList() {
-        String url = API_BASE_URL + "/api/models";
+        String url = API_BASE_URL + "/v1/models";
         LogUtils.d(TAG, "url : " + url);
         Request request = new Request.Builder().url(url).build();
 
         try {
             Response response = client.newCall(request).execute();
             if (response.isSuccessful()) {
-                JSONArray models = new JSONArray(response.body().string());
-                //System.out.println("可用模型列表:");
-                LogUtils.d(TAG, "可用模型列表:");
-                for (int i = 0; i < models.length(); i++) {
-                    JSONObject model = models.getJSONObject(i);
-                    LogUtils.d(TAG, "- " + model.getString("name") + " (" + model.getString("size") + ")");
-                    //System.out.println("- " + model.getString("name") + " (" + model.getString("size") + ")");
-                }
+                LogUtils.d(TAG, response.body().string());
+//                JSONArray models = new JSONArray(response.body().string());
+//                //System.out.println("可用模型列表:");
+//                LogUtils.d(TAG, "可用模型列表:");
+//                for (int i = 0; i < models.length(); i++) {
+//                    JSONObject model = models.getJSONObject(i);
+//                    LogUtils.d(TAG, "- " + model.getString("name") + " (" + model.getString("size") + ")");
+//                    //System.out.println("- " + model.getString("name") + " (" + model.getString("size") + ")");
+//                }
             } else {
                 LogUtils.d(TAG, "获取模型列表失败: " + response.code());
                 //System.out.println("获取模型列表失败: " + response.code());
             }
-        } catch (JSONException | IOException e) {
+        } catch (IOException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
     }
 
-    static void unittest(String ask) {
+    static void unittest(String ask, OnAnswerCallback callback) {
         // 获取模型列表
         getModelList();
 
         // 生成文本
-        generateText(ask, "llama2");
+        generateTextStream(ask, "llama3.1:8b", callback);
     }
-    
+
     public static class SyncAskThread extends Thread {
-        String ask;
-        public SyncAskThread(String ask) {
+        private String ask;
+        private OnAnswerCallback callback;
+
+        public SyncAskThread(String ask, OnAnswerCallback callback) {
             this.ask = ask;
+            this.callback = callback;
         }
 
         @Override
         public void run() {
             super.run();
             LogUtils.d(TAG, "run() start.");
-            unittest(this.ask);
+            unittest(ask, callback);
             LogUtils.d(TAG, "run() end.");
         }
-        
+    }
+
+    public interface OnAnswerCallback {
+        void onAnswer(String answer);
     }
 }
     
diff --git a/ollama/src/main/java/cc/winboll/studio/ollama/OllamaResponseFormatter.java b/ollama/src/main/java/cc/winboll/studio/ollama/OllamaResponseFormatter.java
new file mode 100644
index 0000000..baeda4f
--- /dev/null
+++ b/ollama/src/main/java/cc/winboll/studio/ollama/OllamaResponseFormatter.java
@@ -0,0 +1,72 @@
+package cc.winboll.studio.ollama;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 03:38:50
+ */
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+public class OllamaResponseFormatter {
+    public static final String TAG = "OllamaResponseFormatter";
+
+    // 处理模型列表响应
+    public static String formatModelList(String jsonResponse) {
+        try {
+            JSONObject json = new JSONObject(jsonResponse);
+            JSONArray models = json.getJSONArray("data");
+            StringBuilder sb = new StringBuilder();
+            sb.append("可用模型列表：\n");
+
+            for (int i = 0; i < models.length(); i++) {
+                JSONObject model = models.getJSONObject(i);
+                String modelId = model.getString("id");
+                sb.append(String.format("-%d. %s\n", i + 1, modelId));
+            }
+            return sb.toString();
+        } catch (Exception e) {
+            return "格式解析错误: " + e.getMessage();
+        }
+    }
+
+    // 处理流式生成文本响应
+    public static String formatStreamingResponse(String jsonResponse) {
+        try {
+            JSONObject json = new JSONObject(jsonResponse);
+            StringBuilder sb = new StringBuilder();
+            String responseText = json.getString("response");
+            boolean isDone = json.getBoolean("done");
+
+            // 添加时间戳和模型标识
+            String timestamp = json.getString("created_at");
+            String modelName = json.getString("model");
+            sb.append(String.format("[%s] [%s] ", timestamp, modelName));
+
+            // 处理响应内容
+            if (responseText.isEmpty() && isDone) {
+                sb.append("生成完成\n");
+            } else {
+                sb.append(responseText);
+                if (isDone) {
+                    String doneReason = json.optString("done_reason", "unknown");
+                    sb.append(String.format(" (完成原因: %s)\n", doneReason));
+                }
+            }
+            return sb.toString();
+        } catch (Exception e) {
+            return "格式解析错误: " + e.getMessage();
+        }
+    }
+
+    // 使用示例
+    public static void main(String[] args) {
+        // 模型列表测试
+        String modelListJson = "{\"object\":\"list\",\"data\":[{...}]}";
+        System.out.println(formatModelList(modelListJson));
+
+        // 流式响应测试
+        String streamingJson = "{\"model\":\"llama3.1:8b\",\"created_at\":\"2025-03-27T19:34:29.274955439Z\",\"response\":\"It\",\"done\":false}";
+        System.out.println(formatStreamingResponse(streamingJson));
+    }
+}
+
diff --git a/ollama/src/main/res/layout/activity_main.xml b/ollama/src/main/res/layout/activity_main.xml
index 39dd559..acd82ae 100644
--- a/ollama/src/main/res/layout/activity_main.xml
+++ b/ollama/src/main/res/layout/activity_main.xml
@@ -16,12 +16,13 @@
 		<ScrollView
 			android:layout_width="match_parent"
 			android:layout_height="0dp"
-			android:layout_weight="1.0">
+			android:layout_weight="1.0"
+			android:id="@+id/message_sv">
 
 			<TextView
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
-				android:text="Ollama"
+				android:text="Asking Ollama ..."
 				android:textAppearance="?android:attr/textAppearanceLarge"
 				android:id="@+id/message_tv"/>
 
@@ -45,8 +46,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="Send"
-				android:id="@+id/send_bt"
-				android:onClick="onSend"/>
+				android:id="@+id/send_bt"/>
 
 		</LinearLayout>
 
diff --git a/ollama/src/main/res/values/styles.xml b/ollama/src/main/res/values/styles.xml
index 6799c28..fe7702a 100644
--- a/ollama/src/main/res/values/styles.xml
+++ b/ollama/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
-	</style>
-</resources>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+	</style>
+</resources>
diff --git a/ollama/src/main/res/xml/network_security_config.xml b/ollama/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..47f934c
--- /dev/null
+++ b/ollama/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="false">10.8.0.10</domain>
+    </domain-config>
+</network-security-config>

From f02dc215ca20e3d84a30d581123668a406606c51 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Fri, 28 Mar 2025 05:09:21 +0800
Subject: [PATCH 4/5] <ollama>APK 15.0.0 release Publish.

---
 ollama/build.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ollama/build.properties b/ollama/build.properties
index ce776d9..199c57d 100644
--- a/ollama/build.properties
+++ b/ollama/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 21:02:48 GMT 2025
-stageCount=0
+#Fri Mar 28 05:09:21 HKT 2025
+stageCount=1
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=59
+buildCount=0
 baseBetaVersion=15.0.1

From b61c63c426cd3fda431db4f4fbeb3352cc513565 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Fri, 28 Mar 2025 05:09:23 +0800
Subject: [PATCH 5/5] <ollama>Start New Stage Version.

---
 ollama/app_update_description.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ollama/app_update_description.txt b/ollama/app_update_description.txt
index e69de29..8b13789 100644
--- a/ollama/app_update_description.txt
+++ b/ollama/app_update_description.txt
@@ -0,0 +1 @@
+