更新

Author: raywcm

android/app/build.gradle.kts

@@ -22,7 +22,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.example.testapp"
+        applicationId = "com.example.testapp.v200"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion

android/app/src/main/AndroidManifest.xml

@@ -1,8 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.INTERNET"/>
     <application
         android:label="testapp"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"

dog.zip

@@ -24,9 +24,15 @@ def __init__(self):
         # 配置跨域请求
         CORS(self.app)
 
+        # 使用绝对路径以避免 CWD (当前工作目录) 不同导致的问题
+        # .../DogApp2/dog
+        current_dir = os.path.dirname(os.path.abspath(__file__))
+        # .../DogApp2
+        root_dir = os.path.dirname(current_dir)
+
         # 服务器配置
-        self.UPLOAD_FOLDER = 'uploads'
-        self.ASSETS_FOLDER = os.path.join('dog', 'assets')
+        self.UPLOAD_FOLDER = os.path.join(root_dir, 'uploads')
+        self.ASSETS_FOLDER = os.path.join(current_dir, 'assets')
         self.ALLOWED_IMAGE_EXTENSIONS = {'png', 'jpg', 'jpeg', 'gif', 'bmp'}
         self.MAX_FILE_SIZE = 16 * 1024 * 1024  # 16MB
 
@@ -80,8 +86,8 @@ def __init__(self):
         self.notification_history_lock = Lock()
         self.notification_next_id = 1
 
-        # 简单账号存储（明文，保存在 uploads/users.json）
-        self.users_filename = 'users.json'
+        # 简单账号存储（明文，保存在 dog/users.json）
+        self.users_file_path = os.path.join(current_dir, 'users.json')
 
         # 日程提醒推送相关
         self.schedule_notifier_stop = threading.Event()
@@ -152,17 +158,28 @@ def save_assets_json(self, data, filename):
 
     # ========== 简易账号存储（明文，仅演示用途） ==========
     def load_users(self):
-        data = self.load_json_data(self.users_filename)
-        if not data:
-            return {'users': []}
-        if isinstance(data, list):
-            return {'users': data}
-        if isinstance(data, dict) and 'users' in data:
-            return {'users': data.get('users', [])}
+        try:
+            with self.file_lock:
+                if os.path.exists(self.users_file_path):
+                    with open(self.users_file_path, 'r', encoding='utf-8') as f:
+                        data = json.load(f)
+                        if isinstance(data, list):
+                            return {'users': data}
+                        if isinstance(data, dict) and 'users' in data:
+                            return {'users': data.get('users', [])}
+        except Exception as e:
+            logger.error(f"加载用户数据失败: {e}")
         return {'users': []}
 
     def save_users(self, users):
-        return self.save_json_data(users, self.users_filename)
+        try:
+            with self.file_lock:
+                with open(self.users_file_path, 'w', encoding='utf-8') as f:
+                    json.dump(users, f, ensure_ascii=False, indent=4)
+            return True
+        except Exception as e:
+            logger.error(f"保存用户数据失败: {e}")
+            return False
 
     def get_video_stream_generator(self, video_path):
         """生成视频流，循环播放"""
@@ -1732,21 +1749,21 @@ def internal_error(e):
 
 
 
-    def run_server(self):
+    def run_server(self, port=5000):
         """运行Flask服务器"""
         print("启动机器狗控制服务器...")
         print(f"上传目录: {os.path.abspath(self.app.config['UPLOAD_FOLDER'])}")
-        print("服务器地址: http://0.0.0.0:5000")
+        print(f"服务器地址: http://0.0.0.0:{port}")
 
         # 使用多线程模式运行
-        self.app.run(host='0.0.0.0', port=5000, debug=False, threaded=True)
+        self.app.run(host='0.0.0.0', port=port, debug=False, threaded=True)
 
-    def start(self):
+    def start(self, port=5000):
         """启动服务器线程"""
-        server_thread = threading.Thread(target=self.run_server)
+        server_thread = threading.Thread(target=self.run_server, kwargs={'port': port})
         server_thread.daemon = True
         server_thread.start()
-        print("机器狗API服务器已启动在端口5000")
+        print(f"机器狗API服务器已启动在端口{port}")
 
 # 集成到现有的机器狗主程序
 def main():

dog/assets/photo_detector/photo_00002.jpg

@@ -20,15 +20,17 @@ class AppLauncher:
     def __init__(self):
         self.dog_server = DogServer()
         self.webrtc_server = WebRTCServer()
+        self.api_port = 5000
 
     def start(self):
         def start_dog():
-            self.dog_server.start()
+            self.dog_server.start(port=self.api_port)
 
         # 启动 webrtc_server（内部已管理 asyncio 线程循环）
         def start_webrtc():
-            logger.info("启动 webrtc_server on 0.0.0.0:5001")
-            self.webrtc_server.run(host='0.0.0.0', port=5001, debug=False)
+            webrtc_port = self.api_port + 1
+            logger.info(f"启动 webrtc_server on 0.0.0.0:{webrtc_port}")
+            self.webrtc_server.run(host='0.0.0.0', port=webrtc_port, debug=False)
 
         start_dog()
         import threading