Merge pull request #94 from mylxsw/develop

Develop
mylxsw · Feb 13, 2024 · 714ef64 · 714ef64
2 parents 58cbc62 + 0939354
commit 714ef64
Show file tree

Hide file tree

Showing 22 changed files with 1,024 additions and 282 deletions.
diff --git a/docker-build.sh b/docker-build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION=1.0.11
+VERSION=1.0.12
 
 rm -fr build/web
 

diff --git a/lib/bloc/free_count_bloc.dart b/lib/bloc/free_count_bloc.dart
@@ -33,8 +33,11 @@ class FreeCountBloc extends Bloc<FreeCountEvent, FreeCountState> {
         return;
       }
 
-      final freeCount = await APIServer()
-          .userFreeStatisticsForModel(model: event.model.split(':').last);
+      final freeCount = await APIServer().userFreeStatisticsForModel(
+        model: event.model.startsWith('v2@')
+            ? event.model
+            : event.model.split(':').last,
+      );
       if (freeCount.maxCount > 0) {
         var matched = false;
         for (var i = 0; i < counts.length; i++) {

diff --git a/lib/bloc/room_bloc.dart b/lib/bloc/room_bloc.dart
@@ -58,7 +58,9 @@ class RoomBloc extends BlocExt<RoomEvent, RoomState> {
               lastActiveTime: room.lastActiveTime,
               systemPrompt: room.systemPrompt,
               priority: room.priority ?? 0,
-              model: '${room.vendor}:${room.model}',
+              model: room.model.startsWith('v2@')
+                  ? room.model
+                  : '${room.vendor}:${room.model}',
               initMessage: room.initMessage,
               maxContext: room.maxContext,
               avatarId: room.avatarId,
@@ -81,15 +83,21 @@ class RoomBloc extends BlocExt<RoomEvent, RoomState> {
               lastActiveTime: room.lastActiveTime,
               systemPrompt: room.systemPrompt,
               priority: room.priority ?? 0,
-              model: '${room.vendor}:${room.model}',
+              model: room.model.startsWith('v2@')
+                  ? room.model
+                  : '${room.vendor}:${room.model}',
               initMessage: room.initMessage,
               maxContext: room.maxContext,
               avatarId: room.avatarId,
               avatarUrl: room.avatarUrl,
               roomType: room.roomType,
             ),
             states,
-            examples: await APIServer().example('${room.vendor}:${room.model}'),
+            examples: await APIServer().example(
+              room.model.startsWith('v2@')
+                  ? room.model
+                  : '${room.vendor}:${room.model}',
+            ),
             cascading: event.cascading,
           ));
           return;
@@ -131,8 +139,12 @@ class RoomBloc extends BlocExt<RoomEvent, RoomState> {
         if (Ability().isUserLogon()) {
           await APIServer().createRoom(
             name: event.name,
-            vendor: event.model.split(':').first,
-            model: event.model.split(':').last,
+            vendor: event.model.startsWith('v2@')
+                ? ''
+                : event.model.split(':').first,
+            model: event.model.startsWith('v2@')
+                ? event.model
+                : event.model.split(':').last,
             systemPrompt: event.prompt,
             avatarId: event.avatarId,
             avatarUrl: event.avatarUrl,
@@ -184,8 +196,12 @@ class RoomBloc extends BlocExt<RoomEvent, RoomState> {
         final room = await APIServer().updateRoom(
           roomId: event.roomId,
           name: event.name!,
-          model: event.model!.split(':').last,
-          vendor: event.model!.split(':').first,
+          model: event.model!.startsWith('v2@')
+              ? event.model!
+              : event.model!.split(':').last,
+          vendor: event.model!.startsWith('v2@')
+              ? ''
+              : event.model!.split(':').first,
           systemPrompt: event.prompt!,
           avatarId: event.avatarId,
           avatarUrl: event.avatarUrl,
@@ -206,7 +222,9 @@ class RoomBloc extends BlocExt<RoomEvent, RoomState> {
               lastActiveTime: room.lastActiveTime,
               systemPrompt: room.systemPrompt,
               priority: room.priority ?? 0,
-              model: '${room.vendor}:${room.model}',
+              model: room.model.startsWith('v2@')
+                  ? room.model
+                  : '${room.vendor}:${room.model}',
               avatarId: room.avatarId,
               avatarUrl: room.avatarUrl,
               initMessage: room.initMessage,
@@ -325,7 +343,9 @@ class RoomBloc extends BlocExt<RoomEvent, RoomState> {
                     lastActiveTime: room.lastActiveTime,
                     systemPrompt: room.systemPrompt,
                     priority: room.priority ?? 0,
-                    model: '${room.vendor}:${room.model}',
+                    model: room.model.startsWith('v2@')
+                        ? room.model
+                        : '${room.vendor}:${room.model}',
                     avatarId: room.avatarId,
                     avatarUrl: room.avatarUrl,
                     roomType: room.roomType,

diff --git a/lib/helper/ability.dart b/lib/helper/ability.dart
@@ -1,6 +1,7 @@
 import 'package:askaide/helper/constant.dart';
 import 'package:askaide/helper/platform.dart';
 import 'package:askaide/repo/api/info.dart';
+import 'package:askaide/repo/api/model.dart';
 import 'package:askaide/repo/settings_repo.dart';
 
 class Ability {
@@ -46,7 +47,7 @@ class Ability {
   }
 
   /// 首页支持的模型列表
-  List<HomeModel> get homeModels {
+  List<HomeModelV2> get homeModels {
     return capabilities.homeModels;
   }
 
@@ -96,6 +97,20 @@ class Ability {
     return capabilities.applePayEnabled;
   }
 
+  /// 是否显示 Apple 登录
+  bool get enableAppleSignin {
+    return enableApplePay &&
+        (PlatformTool.isIOS() ||
+            PlatformTool.isAndroid() ||
+            PlatformTool.isMacOS());
+  }
+
+  /// 是否支持微信登录
+  bool get enableWechatSignin {
+    return capabilities.wechatSigninEnabled &&
+        (PlatformTool.isIOS() || PlatformTool.isAndroid());
+  }
+
   /// 是否支持支付功能
   bool get enablePayment {
     if (!enableApplePay && !enableOtherPay) {

diff --git a/lib/helper/constant.dart b/lib/helper/constant.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 // 客户端应用版本号
-const clientVersion = '1.0.12';
+const clientVersion = '1.0.13';
 // 本地数据库版本号
 const databaseVersion = 26;
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -329,6 +329,7 @@ class MyApp extends StatefulWidget {
                     username: state.queryParameters['username']!,
                     isSignup: state.queryParameters['is_signup'] == 'true',
                     signInMethod: state.queryParameters['sign_in_method']!,
+                    wechatBindToken: state.queryParameters['wechat_bind_token'],
                   ),
                 ),
               ),

diff --git a/lib/page/auth/signin_or_signup.dart b/lib/page/auth/signin_or_signup.dart
@@ -24,13 +24,15 @@ class SigninOrSignupScreen extends StatefulWidget {
   final String username;
   final String signInMethod;
   final bool isSignup;
+  final String? wechatBindToken;
 
   const SigninOrSignupScreen({
     super.key,
     required this.settings,
     required this.username,
     required this.isSignup,
     required this.signInMethod,
+    this.wechatBindToken,
   });
 
   @override
@@ -159,7 +161,11 @@ class _SigninOrSignupScreenState extends State<SigninOrSignupScreen> {
               }
 
               APIServer()
-                  .signInWithPassword(widget.username, password)
+                  .signInWithPassword(
+                widget.username,
+                password,
+                wechatBindToken: widget.wechatBindToken,
+              )
                   .then((value) async {
                 await widget.settings.set(settingAPIServerToken, value.token);
                 await widget.settings.set(settingUserInfo, jsonEncode(value));
@@ -387,6 +393,7 @@ class _SigninOrSignupScreenState extends State<SigninOrSignupScreen> {
       inviteCode: inviteCode,
       verifyCodeId: verifyCodeId,
       verifyCode: verificationCode,
+      wechatBindToken: widget.wechatBindToken,
     )
         .then((value) async {
       await widget.settings.set(settingAPIServerToken, value.token);