Skip to content

Commit 26a7edc

Browse files
committed
fix: remove placeholder images and update expo version
1 parent 7cee1a1 commit 26a7edc

7 files changed

Lines changed: 26 additions & 74 deletions

File tree

selfagent/app.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
"slug": "selfagent",
55
"version": "1.0.0",
66
"orientation": "portrait",
7-
"icon": "./assets/icon.png",
87
"userInterfaceStyle": "automatic",
98
"splash": {
10-
"image": "./assets/splash.png",
119
"resizeMode": "contain",
1210
"backgroundColor": "#667eea"
1311
},
@@ -18,7 +16,6 @@
1816
},
1917
"android": {
2018
"adaptiveIcon": {
21-
"foregroundImage": "./assets/adaptive-icon.png",
2219
"backgroundColor": "#667eea"
2320
},
2421
"package": "com.selfagent.app",
@@ -28,7 +25,6 @@
2825
[
2926
"expo-notifications",
3027
{
31-
"icon": "./assets/notification-icon.png",
3228
"color": "#667eea"
3329
}
3430
]

selfagent/assets/adaptive-icon.png

Lines changed: 0 additions & 1 deletion
This file was deleted.

selfagent/assets/icon.png

Lines changed: 0 additions & 1 deletion
This file was deleted.

selfagent/assets/notification-icon.png

Lines changed: 0 additions & 1 deletion
This file was deleted.

selfagent/assets/splash.png

Lines changed: 0 additions & 1 deletion
This file was deleted.

selfagent/build_colab.ipynb

Lines changed: 19 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,17 @@
1818
"source": [
1919
"# 🚀 SelfAgent - 在 Colab 构建 Android APK\n",
2020
"\n",
21-
"## 使用步骤:\n",
22-
"1. 点击菜单 **Runtime -> Run all**\n",
23-
"2. 等待约 10-15 分钟\n",
24-
"3. 下载生成的 APK 文件\n",
25-
"\n",
26-
"---"
21+
"点击 **Runtime -> Run all** 一键构建"
2722
]
2823
},
2924
{
3025
"cell_type": "code",
3126
"metadata": {},
3227
"source": [
33-
"# ========================================\n",
34-
"# 第 1 步:安装 Node.js 和依赖\n",
35-
"# ========================================\n",
28+
"# 1. 安装 Node.js\n",
3629
"!curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -\n",
3730
"!sudo apt-get install -y nodejs\n",
38-
"!node -v\n",
39-
"!npm -v"
31+
"print(f\"Node: {!node -v}\")"
4032
],
4133
"execution_count": null,
4234
"outputs": []
@@ -45,31 +37,24 @@
4537
"cell_type": "code",
4638
"metadata": {},
4739
"source": [
48-
"# ========================================\n",
49-
"# 第 2 步:安装 Java JDK 和 Android SDK\n",
50-
"# ========================================\n",
40+
"# 2. 安装 Java 和 Android SDK\n",
5141
"!sudo apt-get install -y openjdk-17-jdk wget unzip\n",
5242
"\n",
53-
"# 设置 JAVA_HOME\n",
5443
"import os\n",
5544
"os.environ['JAVA_HOME'] = '/usr/lib/jvm/java-17-openjdk-amd64'\n",
5645
"os.environ['PATH'] = os.environ['JAVA_HOME'] + '/bin:' + os.environ['PATH']\n",
5746
"\n",
58-
"# 下载 Android 命令行工具\n",
5947
"!mkdir -p ~/android-sdk/cmdline-tools\n",
6048
"!wget -q https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -O cmdline-tools.zip\n",
6149
"!unzip -q -o cmdline-tools.zip -d ~/android-sdk/cmdline-tools\n",
62-
"!mv ~/android-sdk/cmdline-tools/cmdline-tools ~/android-sdk/cmdline-tools/latest\n",
50+
"!mv ~/android-sdk/cmdline-tools/cmdline-tools ~/android-sdk/cmdline-tools/latest 2>/dev/null || true\n",
6351
"\n",
64-
"# 设置 Android SDK 环境变量\n",
6552
"os.environ['ANDROID_HOME'] = os.path.expanduser('~/android-sdk')\n",
6653
"os.environ['ANDROID_SDK_ROOT'] = os.environ['ANDROID_HOME']\n",
6754
"os.environ['PATH'] = os.environ['ANDROID_HOME'] + '/cmdline-tools/latest/bin:' + os.environ['ANDROID_HOME'] + '/platform-tools:' + os.environ['PATH']\n",
6855
"\n",
69-
"# 接受许可并安装必要组件\n",
7056
"!yes | ~/android-sdk/cmdline-tools/latest/bin/sdkmanager --licenses\n",
71-
"!~/android-sdk/cmdline-tools/latest/bin/sdkmanager \"platform-tools\" \"platforms;android-33\" \"build-tools;33.0.0\"\n",
72-
"\n",
57+
"!~/android-sdk/cmdline-tools/latest/bin/sdkmanager \"platform-tools\" \"platforms;android-34\" \"build-tools;34.0.0\"\n",
7358
"print(\"✅ Android SDK 安装完成\")"
7459
],
7560
"execution_count": null,
@@ -79,19 +64,10 @@
7964
"cell_type": "code",
8065
"metadata": {},
8166
"source": [
82-
"# ========================================\n",
83-
"# 第 3 步:克隆项目并安装依赖\n",
84-
"# ========================================\n",
85-
"# 替换成你的 GitHub 仓库地址\n",
67+
"# 3. 克隆项目\n",
8668
"!git clone https://github.com/Michael-YuQ/python-calculator-android.git\n",
8769
"%cd python-calculator-android/selfagent\n",
88-
"\n",
89-
"# 安装项目依赖\n",
9070
"!npm install\n",
91-
"\n",
92-
"# 安装 EAS CLI\n",
93-
"!npm install -g eas-cli expo-cli\n",
94-
"\n",
9571
"print(\"✅ 依赖安装完成\")"
9672
],
9773
"execution_count": null,
@@ -101,11 +77,10 @@
10177
"cell_type": "code",
10278
"metadata": {},
10379
"source": [
104-
"# ========================================\n",
105-
"# 第 4 步:生成原生 Android 项目\n",
106-
"# ========================================\n",
107-
"!npx expo prebuild --platform android --clean\n",
108-
"\n",
80+
"# 4. 生成 Android 项目\n",
81+
"import os\n",
82+
"os.environ['CI'] = '1'\n",
83+
"!npx expo prebuild --platform android --clean --non-interactive\n",
10984
"print(\"✅ Android 项目生成完成\")"
11085
],
11186
"execution_count": null,
@@ -115,17 +90,14 @@
11590
"cell_type": "code",
11691
"metadata": {},
11792
"source": [
118-
"# ========================================\n",
119-
"# 第 5 步:构建 APK\n",
120-
"# ========================================\n",
93+
"# 5. 构建 APK\n",
12194
"import os\n",
12295
"os.environ['ANDROID_HOME'] = os.path.expanduser('~/android-sdk')\n",
12396
"os.environ['ANDROID_SDK_ROOT'] = os.environ['ANDROID_HOME']\n",
12497
"\n",
12598
"%cd android\n",
12699
"!chmod +x gradlew\n",
127-
"!./gradlew assembleRelease --no-daemon\n",
128-
"\n",
100+
"!./gradlew assembleDebug --no-daemon\n",
129101
"print(\"✅ APK 构建完成\")"
130102
],
131103
"execution_count": null,
@@ -135,30 +107,18 @@
135107
"cell_type": "code",
136108
"metadata": {},
137109
"source": [
138-
"# ========================================\n",
139-
"# 第 6 步:下载 APK\n",
140-
"# ========================================\n",
110+
"# 6. 下载 APK\n",
141111
"from google.colab import files\n",
142-
"import os\n",
143-
"import shutil\n",
144-
"\n",
145-
"# 查找 APK 文件\n",
146-
"apk_path = 'app/build/outputs/apk/release/app-release.apk'\n",
147-
"debug_apk_path = 'app/build/outputs/apk/debug/app-debug.apk'\n",
112+
"import shutil, os\n",
148113
"\n",
114+
"apk_path = 'app/build/outputs/apk/debug/app-debug.apk'\n",
149115
"if os.path.exists(apk_path):\n",
150-
" # 重命名为更友好的名称\n",
151116
" shutil.copy(apk_path, 'SelfAgent.apk')\n",
152117
" files.download('SelfAgent.apk')\n",
153-
" print(\"✅ Release APK 已下载: SelfAgent.apk\")\n",
154-
"elif os.path.exists(debug_apk_path):\n",
155-
" shutil.copy(debug_apk_path, 'SelfAgent-debug.apk')\n",
156-
" files.download('SelfAgent-debug.apk')\n",
157-
" print(\"✅ Debug APK 已下载: SelfAgent-debug.apk\")\n",
118+
" print(\"✅ APK 已下载\")\n",
158119
"else:\n",
159-
" print(\"❌ 未找到 APK 文件\")\n",
160-
" print(\"查找可用的 APK...\")\n",
161-
" !find . -name \"*.apk\" -type f"
120+
" print(\"❌ 未找到 APK\")\n",
121+
" !find .. -name \"*.apk\" -type f 2>/dev/null"
162122
],
163123
"execution_count": null,
164124
"outputs": []

selfagent/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
"web": "expo start --web"
1010
},
1111
"dependencies": {
12-
"expo": "~50.0.0",
13-
"expo-notifications": "~0.27.0",
14-
"expo-status-bar": "~1.11.0",
12+
"expo": "~51.0.0",
13+
"expo-notifications": "~0.28.0",
14+
"expo-status-bar": "~1.12.0",
1515
"react": "18.2.0",
16-
"react-native": "0.73.0",
17-
"react-native-webview": "13.6.0",
18-
"@react-native-async-storage/async-storage": "1.21.0",
19-
"react-native-safe-area-context": "4.8.0",
16+
"react-native": "0.74.0",
17+
"react-native-webview": "13.8.0",
18+
"@react-native-async-storage/async-storage": "1.23.0",
19+
"react-native-safe-area-context": "4.10.0",
2020
"@expo/vector-icons": "^14.0.0"
2121
},
2222
"devDependencies": {

0 commit comments

Comments
 (0)