Commit e54b285c by Administrator

md

2 parents fe88459c b94ae0b4
Showing 62 changed files with 1071 additions and 736 deletions
...@@ -38,6 +38,11 @@ android { ...@@ -38,6 +38,11 @@ android {
targetSdk = flutter.targetSdkVersion targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode versionCode = flutter.versionCode
versionName = flutter.versionName versionName = flutter.versionName
manifestPlaceholders["VIVO_APPKEY"] = "f7e37b20f48234c425d9e7f82fdd16c0"
manifestPlaceholders["VIVO_APPID"] = "105993977"
// manifestPlaceholders["HONOR_APPID"] = "您应用分配的证书 APPID"
} }
// 添加签名配置 // 添加签名配置
...@@ -84,3 +89,23 @@ android { ...@@ -84,3 +89,23 @@ android {
flutter { flutter {
source = "../.." source = "../.."
} }
dependencies {
// implementation("com.tencent.timpush:timpush:8.7.7201")
// implementation("com.tencent.liteav.tuikit:tuicore:8.7.7201")
// 版本号 "VERSION" 请前往 更新日志 中获取配置。
// Huawei
//implementation("com.tencent.timpush:huawei:8.7.7201")
// XiaoMi
//implementation("com.tencent.timpush:xiaomi:8.7.7201")
// OPPO
//implementation("com.tencent.timpush:oppo:8.7.7201")
// vivo
implementation("com.tencent.timpush:vivo:8.7.7201")
// Honor
//implementation("com.tencent.timpush:honor:8.7.7201")
// Meizu
//implementation("com.tencent.timpush:meizu:8.7.7201")
// Google Firebase Cloud Messaging (Google FCM)
//implementation("com.tencent.timpush:fcm:8.7.7201")
}
\ No newline at end of file \ No newline at end of file
...@@ -16,5 +16,13 @@ ...@@ -16,5 +16,13 @@
*; *;
} }
# tencent push
-keep class com.tencent.qcloud.** {
*;
}
-keep class com.tencent.timpush.** {
*;
}
# 可选:如果遇到兼容性问题,可以忽略警告 # 可选:如果遇到兼容性问题,可以忽略警告
-dontwarn com.tencent.mm.** -dontwarn com.tencent.mm.**
\ No newline at end of file \ No newline at end of file
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
<application <application
android:label="班小二" android:label="班小二"
android:name="${applicationName}" android:name="cn.banxe.bxe.MyApplication"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/launcher_icon"
android:networkSecurityConfig="@xml/network_security_config"> android:networkSecurityConfig="@xml/network_security_config">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
......
package cn.banxe.bxe;
import com.tencent.chat.flutter.push.tencent_cloud_chat_push.application.TencentCloudChatPushApplication;
public class MyApplication extends TencentCloudChatPushApplication {
@Override
public void onCreate() {
super.onCreate();
}
}
\ No newline at end of file \ No newline at end of file
No preview for this file type
...@@ -13,16 +13,16 @@ ...@@ -13,16 +13,16 @@
<button onclick="startRecord()">开始录音</button> <button onclick="startRecord()">开始录音</button>
<button onclick="">暂停录音</button> <button onclick="pauseRecord()">暂停录音</button>
<button onclick="">唤醒录音</button> <button onclick="resumeRecord()">唤醒录音</button>
<button onclick="stopRecord()">停止录音</button> <button onclick="stopRecord()">停止录音</button>
<br> <br>
<br> <br>
<input type="hidden" id="url" value=""> <input type="hidden" id="url" value="">
<button onclick="startPlay()">开始播放</button> <button onclick="startPlay()">开始播放</button>
<button onclick="">暂停播放</button> <button onclick="pausePlay()">暂停播放</button>
<button onclick="">唤醒播放</button> <button onclick="resumePlay()">唤醒播放</button>
<button onclick="stopPlay()">停止播放</button> <button onclick="stopPlay()">停止播放</button>
<button onclick="openlink()">打开新链接</button> <button onclick="openlink()">打开新链接</button>
...@@ -36,16 +36,28 @@ ...@@ -36,16 +36,28 @@
<script> <script>
function xeJsBridgeCallback(message) { function xeJsBridgeCallback(message) {
let jsonData = JSON.parse(message); document.getElementById('resp').innerHTML = '<p><strong>响应:</strong> ' + message + '</p>';
document.getElementById('resp').innerHTML = '<p><strong>响应:</strong> ' + jsonData.data + '</p>';
// 设置id为url的input的值 // 设置id为url的input的值
document.getElementById('url').value = jsonData.data; let jsonData = JSON.parse(message);
if(jsonData.cmd=="audioRecorderStop"){
document.getElementById('url').value = jsonData.data.tempFilePath;
}
} }
function startRecord() { function startRecord() {
let message = '{ "timestamp": 1, "unique": "123", "cmd": "audioRecorderStart", "params": {} }'; let message = '{ "timestamp": 1, "unique": "123", "cmd": "audioRecorderStart", "params": {"duration":3} }';
xeJsBridge.postMessage(message);
}
function pauseRecord() {
let message = '{ "timestamp": 1, "unique": "123", "cmd": "audioRecorderPause", "params": {} }';
xeJsBridge.postMessage(message);
}
function resumeRecord() {
let message = '{ "timestamp": 1, "unique": "123", "cmd": "audioRecorderResume", "params": {} }';
xeJsBridge.postMessage(message); xeJsBridge.postMessage(message);
} }
...@@ -57,10 +69,21 @@ ...@@ -57,10 +69,21 @@
function startPlay() { function startPlay() {
let url = document.getElementById('url').value; let url = document.getElementById('url').value;
//let url = 'https://files-cos.banxiaoer.net/txbb/res/mp3/d2-d560e952-4029-11eb-928a-acde48001122/wd-db0b7502-4029-11eb-928a-acde48001122_h.mp3';
let message = '{ "timestamp": 1, "unique": "123", "cmd": "audioPlay", "params": {"url":"' + url + '"} }'; let message = '{ "timestamp": 1, "unique": "123", "cmd": "audioPlay", "params": {"url":"' + url + '"} }';
xeJsBridge.postMessage(message); xeJsBridge.postMessage(message);
} }
function pausePlay() {
let message = '{ "timestamp": 1, "unique": "123", "cmd": "audioPause", "params": {} }';
xeJsBridge.postMessage(message);
}
function resumePlay() {
let message = '{ "timestamp": 1, "unique": "123", "cmd": "audioResume", "params": {} }';
xeJsBridge.postMessage(message);
}
function stopPlay() { function stopPlay() {
let message = '{ "timestamp": 1, "unique": "123", "cmd": "audioStop", "params": {} }'; let message = '{ "timestamp": 1, "unique": "123", "cmd": "audioStop", "params": {} }';
xeJsBridge.postMessage(message); xeJsBridge.postMessage(message);
......
{"version":"1.0.1","cn.banxe.bxe":{"manifestPlaceholders":{"VIVO_APPKEY":"f7e37b20f48234c425d9e7f82fdd16c0","VIVO_APPID":"105993977","HONOR_APPID":""},"vivoPushBussinessId":"44580"}}
\ No newline at end of file \ No newline at end of file

295 Bytes | W: | H:

416 Bytes | W: | H:

ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
  • 2-up
  • Swipe
  • Onion skin

406 Bytes | W: | H:

869 Bytes | W: | H:

ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
  • 2-up
  • Swipe
  • Onion skin

282 Bytes | W: | H:

607 Bytes | W: | H:

ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
  • 2-up
  • Swipe
  • Onion skin

406 Bytes | W: | H:

869 Bytes | W: | H:

ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
  • 2-up
  • Swipe
  • Onion skin
import 'package:appframe/config/locator.dart';
import 'package:appframe/config/routes.dart';
import 'package:appframe/services/im_service.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:tencent_cloud_chat_sdk/enum/V2TimAdvancedMsgListener.dart';
import 'package:tencent_cloud_chat_sdk/enum/message_elem_type.dart';
import 'package:tencent_cloud_chat_sdk/models/v2_tim_message.dart';
class ImState extends Equatable {
final List<String> messages;
const ImState({this.messages = const []});
ImState copyWith({List<String>? messages}) {
return ImState(
messages: messages ?? this.messages,
);
}
@override
List<Object?> get props => [messages];
}
class ImCubit extends Cubit<ImState> {
late ImService imService;
late V2TimAdvancedMsgListener _msgListener;
ImCubit() : super(const ImState()) {
imService = getIt.get<ImService>();
_msgListener = V2TimAdvancedMsgListener(
onRecvNewMessage: _onMessageReceived,
);
init();
}
void init() async {
await imService.removeMsgListener(imService.msgListener);
await imService.addMsgListener(_msgListener);
}
void addMessage(String message) {
emit(state.copyWith(messages: [...state.messages, message]));
}
void goWeb() {
router.go('/web');
}
Future<void> _onMessageReceived(V2TimMessage message) async {
// 处理文本消息
if (message.elemType == MessageElemType.V2TIM_ELEM_TYPE_TEXT) {
print("page 收到IM消息-------- ${message.textElem?.text}");
// 处理接收到的消息
emit(state.copyWith(messages: [...state.messages, message.textElem?.text ?? '']));
} else {
print("page 忽略非文本消息-------- ${message.textElem?.text}");
}
}
@override
Future<void> close() async {
await imService.removeMsgListener(_msgListener);
await imService.addMsgListener(imService.msgListener);
super.close();
}
}
import 'package:appframe/config/constant.dart'; import 'package:appframe/config/constant.dart';
import 'package:appframe/config/locator.dart';
import 'package:appframe/config/routes.dart'; import 'package:appframe/config/routes.dart';
import 'package:appframe/data/repositories/wechat_auth_repository.dart'; import 'package:appframe/data/repositories/wechat_auth_repository.dart';
import 'package:appframe/services/im_service.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:fluwx/fluwx.dart'; import 'package:fluwx/fluwx.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import '../config/locator.dart';
class LoginMainState extends Equatable { class LoginMainState extends Equatable {
final bool agreed; final bool agreed;
...@@ -31,11 +32,13 @@ class LoginMainState extends Equatable { ...@@ -31,11 +32,13 @@ class LoginMainState extends Equatable {
class LoginMainCubit extends Cubit<LoginMainState> { class LoginMainCubit extends Cubit<LoginMainState> {
late final Fluwx _fluwx; late final Fluwx _fluwx;
late final WechatAuthRepository _wechatAuthRepository; late final WechatAuthRepository _wechatAuthRepository;
late final ImService _imService;
LoginMainCubit(super.initialState) { LoginMainCubit(super.initialState) {
_fluwx = getIt.get<Fluwx>(); _fluwx = getIt.get<Fluwx>();
_fluwx.addSubscriber(_responseListener); _fluwx.addSubscriber(_responseListener);
_wechatAuthRepository = getIt<WechatAuthRepository>(); _wechatAuthRepository = getIt<WechatAuthRepository>();
_imService = getIt.get<ImService>();
} }
void toggleAgreed(bool value) { void toggleAgreed(bool value) {
...@@ -95,6 +98,17 @@ class LoginMainCubit extends Cubit<LoginMainState> { ...@@ -95,6 +98,17 @@ class LoginMainCubit extends Cubit<LoginMainState> {
sharedPreferences.setString('auth_stuId', stuId ?? ''); sharedPreferences.setString('auth_stuId', stuId ?? '');
sharedPreferences.setString('auth_ip', Constant.h5Server); sharedPreferences.setString('auth_ip', Constant.h5Server);
if(Constant.needIM){
// IM登录, 正式使用时,需要从服务端获取用户签名
var loginResult = await _imService.login(userCode);
if (loginResult) {
print("微信登录处,IM 登录成功");
await _imService.registerPush();
} else {
print("微信登录处,IM 登录失败");
}
}
router.go( router.go(
'/web', '/web',
extra: { extra: {
...@@ -108,4 +122,10 @@ class LoginMainCubit extends Cubit<LoginMainState> { ...@@ -108,4 +122,10 @@ class LoginMainCubit extends Cubit<LoginMainState> {
); );
} }
} }
@override
Future<void> close() {
_fluwx.removeSubscriber(_responseListener);
return super.close();
}
} }
import 'package:appframe/config/db.dart';
import 'package:appframe/config/locator.dart';
import 'package:appframe/config/routes.dart';
import 'package:appframe/services/mqtt_service.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:mqtt_client/mqtt_client.dart';
class MqttState extends Equatable {
final List<String> messages;
const MqttState({this.messages = const []});
MqttState copyWith({List<String>? messages}) {
return MqttState(
messages: messages ?? this.messages,
);
}
@override
List<Object?> get props => [messages];
}
class MqttCubit extends Cubit<MqttState> with WidgetsBindingObserver {
late MqttService _mqttService;
MqttCubit() : super(MqttState()) {
_mqttService = getIt.get<MqttService>();
_mqttService.listen(_onMessageReceived);
WidgetsBinding.instance.addObserver(this);
}
void goWeb() {
router.go('/web');
}
@override
Future<void> didChangeAppLifecycleState(AppLifecycleState state) async {
super.didChangeAppLifecycleState(state);
// print('----------------------didChangeAppLifecycleState------------------------------');
if (state == AppLifecycleState.resumed) {
// print('----------------------resumed------------------------------');
if (!_mqttService.isConnected()) {
// print('----------------------reconnected------------------------------');
await _mqttService.initConn();
_mqttService.listen(_onMessageReceived);
}
}
}
Future<void> _onMessageReceived(List<MqttReceivedMessage<MqttMessage?>>? c) async {
final recMess = c![0].payload as MqttPublishMessage;
final pt = MqttPublishPayload.bytesToStringAsString(recMess.payload.message);
print('-------------------------> $pt');
// Map<String, dynamic> data = {"id": 1, "content": pt};
// bxeDb.insert('msg', data);
//
// var msgList = await bxeDb.query('msg');
// for (var msg in msgList) {
// print('-------------------------> $msg');
// }
// 处理接收到的消息
emit(state.copyWith(messages: [...state.messages, pt]));
}
@override
Future<void> close() {
// 关闭时移除观察者
WidgetsBinding.instance.removeObserver(this);
return super.close();
}
}
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_sound/public/flutter_sound_recorder.dart';
class RecorderState {
final bool recorderIsInit;
final String path;
RecorderState({this.recorderIsInit = false, this.path = ''});
}
class RecorderCubit extends Cubit<String> {
late FlutterSoundRecorder _recorder;
RecorderCubit(super.initialState, this._recorder) {
_recorder.openRecorder();
}
@override
Future<void> close() {
try {
_recorder.closeRecorder();
} catch (e) {
print(e);
}
return super.close();
}
}
class Constant { class Constant {
/// 应用内部 http 服务 /// 应用内部 http 服务
static const int localServerPort = 35982; static const int localServerPort = 35982;
static const String localServerHost = '127.0.0.1'; static const String localServerHost = '127.0.0.1';
// static const String localServerHost = 'appdev-xj.banxiaoer.net';
static const String localServerUrl = 'http://$localServerHost:$localServerPort'; static const String localServerUrl = 'http://$localServerHost:$localServerPort';
static const String localFileUrl = 'http://127.0.0.1:$localServerPort';
static const String localServerTemp = '/temp'; static const String localServerTemp = '/temp';
static const String localServerTempFileUrl = '$localServerUrl$localServerTemp'; static const String localServerTempFileUrl = '$localFileUrl$localServerTemp';
static const String localServerTest = '/test'; static const String localServerTest = '/test';
static const String localServerTestFileUrl = '$localServerUrl$localServerTest'; static const String localServerTestFileUrl = '$localFileUrl$localServerTest';
/// obs文件分片上传的分片大小:5M /// obs文件分片上传的分片大小:5M
static const int obsUploadChunkSize = 1024 * 1024 * 5; static const int obsUploadChunkSize = 1024 * 1024 * 5;
/// 版本号
static const String appVersion = '1.0.0';
static const String h5Version = '1.0.0';
/// IM SDK
static const int imSdkAppId = 1400310691;
static const String imClientSecure = 'kM4yqbehB3io9UiLvH6eHvM7xAhfYxoyyaO1tLoHgKltcaI7MZXkUbpFaWdeQIqe';
/// 测试阶段使用的 h5 服务地址 /// 测试阶段使用的 h5 服务地址
// static const String h5Server = 'appdev-xj.banxiaoer.net'; static const String h5Server = 'appdev-xj.banxiaoer.net';
static const String h5Server = 'appdev-th.banxiaoer.net';
// static const String h5Server = 'appdev-th.banxiaoer.net';
// static const String h5Server = '192.168.1.136'; // static const String h5Server = '192.168.1.136';
/// 测试阶段使用
static const bool needIM = true;
} }
import 'package:path/path.dart';
import 'package:sqflite/sqflite.dart';
late final Database bxeDb;
Future<void> initDatabase() async {
// 获取数据库存储的默认路径
String databasesPath = await getDatabasesPath();
String path = join(databasesPath, 'bxe_database.db');
// 打开数据库,如果不存在则创建
Database database = await openDatabase(
path,
version: 1, // 数据库版本
onCreate: (Database db, int version) async {
// 创建表
await db.execute(
// 'CREATE TABLE msg(id INTEGER PRIMARY KEY, content TEXT)',
'CREATE TABLE msg(id INTEGER, content TEXT)',
);
},
);
bxeDb = database;
}
import 'dart:io' show Platform;
import 'package:appframe/data/repositories/message/app_info_handler.dart'; import 'package:appframe/data/repositories/message/app_info_handler.dart';
import 'package:appframe/data/repositories/message/audio_player_handler.dart'; import 'package:appframe/data/repositories/message/audio_player_handler.dart';
import 'package:appframe/data/repositories/message/audio_recorder_handler.dart'; import 'package:appframe/data/repositories/message/audio_recorder_handler.dart';
...@@ -20,10 +22,9 @@ import 'package:appframe/data/repositories/message/orientation_handler.dart'; ...@@ -20,10 +22,9 @@ import 'package:appframe/data/repositories/message/orientation_handler.dart';
import 'package:appframe/data/repositories/message/save_file_to_disk_handler.dart'; import 'package:appframe/data/repositories/message/save_file_to_disk_handler.dart';
import 'package:appframe/data/repositories/message/save_to_album_handler.dart'; import 'package:appframe/data/repositories/message/save_to_album_handler.dart';
import 'package:appframe/data/repositories/message/scan_code_handler.dart'; import 'package:appframe/data/repositories/message/scan_code_handler.dart';
import 'package:appframe/data/repositories/message/set_title_handler.dart';
import 'package:appframe/data/repositories/message/storage_handler.dart'; import 'package:appframe/data/repositories/message/storage_handler.dart';
import 'package:appframe/data/repositories/message/title_bar_handler.dart';
import 'package:appframe/data/repositories/message/upload_file.dart'; import 'package:appframe/data/repositories/message/upload_file.dart';
import 'package:appframe/data/repositories/message/upload_file2.dart';
import 'package:appframe/data/repositories/message/vibrate_short_handler.dart'; import 'package:appframe/data/repositories/message/vibrate_short_handler.dart';
import 'package:appframe/data/repositories/message/video_info_handler.dart'; import 'package:appframe/data/repositories/message/video_info_handler.dart';
import 'package:appframe/data/repositories/message/wifi_info_handler.dart'; import 'package:appframe/data/repositories/message/wifi_info_handler.dart';
...@@ -31,10 +32,13 @@ import 'package:appframe/data/repositories/message/window_info_handler.dart'; ...@@ -31,10 +32,13 @@ import 'package:appframe/data/repositories/message/window_info_handler.dart';
import 'package:appframe/data/repositories/wechat_auth_repository.dart'; import 'package:appframe/data/repositories/wechat_auth_repository.dart';
import 'package:appframe/services/api_service.dart'; import 'package:appframe/services/api_service.dart';
import 'package:appframe/services/dispatcher.dart'; import 'package:appframe/services/dispatcher.dart';
import 'package:appframe/services/im_service.dart';
import 'package:appframe/services/local_server_service.dart';
import 'package:appframe/services/player_service.dart';
import 'package:appframe/services/recorder_service.dart';
import 'package:fluwx/fluwx.dart'; import 'package:fluwx/fluwx.dart';
import 'package:get_it/get_it.dart'; import 'package:get_it/get_it.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'dart:io' show Platform;
final getIt = GetIt.instance; final getIt = GetIt.instance;
...@@ -44,7 +48,10 @@ Future<void> setupLocator() async { ...@@ -44,7 +48,10 @@ Future<void> setupLocator() async {
await (() async { await (() async {
Fluwx fluwx = Fluwx(); Fluwx fluwx = Fluwx();
if (Platform.isAndroid || Platform.isIOS) { if (Platform.isAndroid || Platform.isIOS) {
await fluwx.registerApi(appId: "wx8c32ea248f0c7765", universalLink: "https://dev.banxiaoer.net/path/to/wechat/"); await fluwx.registerApi(
appId: "wx8c32ea248f0c7765",
universalLink: "https://dev.banxiaoer.net/path/to/wechat/",
);
} }
return fluwx; return fluwx;
})(), })(),
...@@ -156,14 +163,14 @@ Future<void> setupLocator() async { ...@@ -156,14 +163,14 @@ Future<void> setupLocator() async {
getIt.registerLazySingleton<MessageHandler>(() => ScanCodeHandler(), instanceName: 'scanCode'); getIt.registerLazySingleton<MessageHandler>(() => ScanCodeHandler(), instanceName: 'scanCode');
/// 上传文件 /// 上传文件
// getIt.registerLazySingleton<MessageHandler>(() => UploadFileHandler(), instanceName: 'uploadFile'); getIt.registerLazySingleton<MessageHandler>(() => UploadFileHandler(), instanceName: 'uploadFile');
getIt.registerLazySingleton<MessageHandler>(() => UploadFile2Handler(), instanceName: 'uploadFile');
/// 下载文件 /// 下载文件
getIt.registerLazySingleton<MessageHandler>(() => DownloadFileHandler(), instanceName: 'downloadFile'); getIt.registerLazySingleton<MessageHandler>(() => DownloadFileHandler(), instanceName: 'downloadFile');
/// 设置标题和返回按钮 /// 设置标题和返回按钮
getIt.registerLazySingleton<MessageHandler>(() => SetTitleHandler(), instanceName: 'setTitle'); // getIt.registerLazySingleton<MessageHandler>(() => SetTitleHandler(), instanceName: 'setTitle');
getIt.registerLazySingleton<MessageHandler>(() => TitleBarHandler(), instanceName: 'setTitlebar');
/// 新路由打开链接 /// 新路由打开链接
getIt.registerLazySingleton<MessageHandler>(() => OpenLinkHandler(), instanceName: 'openlink'); getIt.registerLazySingleton<MessageHandler>(() => OpenLinkHandler(), instanceName: 'openlink');
...@@ -172,8 +179,28 @@ Future<void> setupLocator() async { ...@@ -172,8 +179,28 @@ Future<void> setupLocator() async {
getIt.registerLazySingleton<MessageHandler>(() => GoLoginHandler(), instanceName: 'goLogin'); getIt.registerLazySingleton<MessageHandler>(() => GoLoginHandler(), instanceName: 'goLogin');
/// service /// service
getIt.registerLazySingleton<ApiService>(() => ApiService(baseUrl: 'https://dev.banxiaoer.net')); ///
/// local server
getIt.registerSingleton<LocalServerService>(LocalServerService());
/// apiService
getIt.registerLazySingleton<ApiService>(
() => ApiService(baseUrl: 'https://dev.banxiaoer.net'),
instanceName: "bxeApiService",
);
getIt.registerLazySingleton<ApiService>(
() => ApiService(baseUrl: 'https://iotapp-dev.banxiaoer.com/iotapp'),
instanceName: "appApiService",
);
/// imService
getIt.registerSingleton<ImService>(ImService());
/// 播放
getIt.registerSingleton<PlayerService>(PlayerService());
/// 录音
getIt.registerSingleton<RecorderService>(RecorderService());
/// repository /// repository
getIt.registerLazySingleton<WechatAuthRepository>(() => WechatAuthRepository()); getIt.registerLazySingleton<WechatAuthRepository>(() => WechatAuthRepository());
......
import 'package:appframe/config/locator.dart'; import 'package:appframe/config/locator.dart';
import 'package:appframe/services/mqtt_service.dart';
/// 此处暂时测试 /// 此处暂时测试
/// 正常需要在登录状态下,查询host和jwt /// 正常需要在登录状态下,查询host和jwt
Future<void> registerMqtt() async { Future<void> registerMqtt() async {
String mqttHost = '58.87.99.45'; // String mqttHost = '58.87.99.45';
int mqttPort = 1883; // int mqttPort = 1883;
String mqttClientId = 'asdfasdf'; // // 获取 mac 地址
int keepAlive = 60; // String mqttMac = '';
String mqttUsername = 'user'; // String mqttClientId = 'tanghuan_phone';
String mqttPassword = // int keepAlive = 60;
'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NjIzOTY5MDQsInJzIjoib2sifQ.tsouW-uHTe6ndiEqSE4wcR_oSScuoS0qVvqWtNSaXgWkX2yEja9ImnMYr6jNKxJY8_qox9UdXRuCept5cTM4-8ZaA0BBlYXwr3LbC3yPmniFhs-tAMFbZqG2-3r0sc5NMbE3M1fXMi3dmvQc2AlyazheL98EmRNILFsz6pZ-x5rR1gFulZ53PXa7fX60XRlXg8jc3-89gdUJcS0MOMU7yyU0Sv3QBBplLr3CmWCoYX99a_3QHvq3o7aUTJ_Ed5Ms9_3k4QHgawsfdTWjZkyBouAvLMgVkt4D0PJbhgsjzAaA01Q7jEJ_SokNojOFfQYuHNScczmlOLXocJCCD4189A'; // String mqttUsername = 'user';
// String mqttPassword =
// 'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NjI2NTgzOTEsInJzIjoib2sifQ.AoU0MfSKflC1VB0abi7BVr3g4MDah1uLlg01ZTFQgTxfolu28IfZ4BaGhRF9qy7yAQH2Efmdf2cs2iwKrdcHRSHzJhwTC44beX6viRhCCiCxe51AB8NVv72l2TmsNxIvACfXOhDLjKH6QE38EaKC486aS_L-QpakvDOQP_IPjq5ZvH68JwwhOwhLTgaCgOR3xde2H-NgRDK2BQ-FyDTXi1RX8hDGvKMw8pi6WiVBjR1ENTO5A7yvMioJS9qwdjs_7_5c6n5GXSjCHTtdQ7746hlId2uwP_41G5Ug3DYWiZ5aWIuvGRH6ZxKmbC32wN62ys_XkLGzhBw8wsQ-KhETvQ ';
//
// /// 初始化MQTT客户端
// var mqttService = MqttService(mqttHost, mqttPort, mqttClientId, keepAlive, mqttUsername, mqttPassword);
// await mqttService.initConn();
//
// /// 设置到getIt,用于获取使用
// getIt.registerSingleton(mqttService);
/// 初始化MQTT客户端 // MqttIsolateManager mqttIsolateManager = MqttIsolateManager();
var mqttService = MqttService(mqttHost, mqttPort, mqttClientId, keepAlive, mqttUsername, mqttPassword); // mqttIsolateManager.start();
await mqttService.initConn(); // await mqttIsolateManager.connect('server', 'clientId');
// // 暂停3秒
/// 设置到getIt,用于获取使用 // // await Future.delayed(Duration(seconds: 2));
getIt.registerSingleton(mqttService); // mqttIsolateManager.subscribe('bxe/abc');
//
// getIt.registerSingleton(mqttIsolateManager);
} }
import 'package:appframe/ui/pages/adv_page.dart'; import 'package:appframe/ui/pages/adv_page.dart';
import 'package:appframe/ui/pages/im_page.dart';
import 'package:appframe/ui/pages/link_page.dart'; import 'package:appframe/ui/pages/link_page.dart';
import 'package:appframe/ui/pages/login_main_page.dart'; import 'package:appframe/ui/pages/login_main_page.dart';
import 'package:appframe/ui/pages/login_phone_page.dart'; import 'package:appframe/ui/pages/login_phone_page.dart';
import 'package:appframe/ui/pages/mqtt_page.dart';
import 'package:appframe/ui/pages/scan_code_page.dart'; import 'package:appframe/ui/pages/scan_code_page.dart';
import 'package:appframe/ui/pages/web_page.dart'; import 'package:appframe/ui/pages/web_page.dart';
import 'package:appframe/ui/pages/wechat_auth_page.dart'; import 'package:appframe/ui/pages/wechat_auth_page.dart';
...@@ -10,7 +10,7 @@ import 'package:flutter/material.dart'; ...@@ -10,7 +10,7 @@ import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
final GoRouter router = GoRouter( final GoRouter router = GoRouter(
initialLocation: '/adv', initialLocation: '/web',
routes: <RouteBase>[ routes: <RouteBase>[
GoRoute( GoRoute(
path: '/web', path: '/web',
...@@ -55,9 +55,9 @@ final GoRouter router = GoRouter( ...@@ -55,9 +55,9 @@ final GoRouter router = GoRouter(
}, },
), ),
GoRoute( GoRoute(
path: '/mqtt', path: '/im',
builder: (BuildContext context, GoRouterState state) { builder: (BuildContext context, GoRouterState state) {
return const MqttPage(); return const ImPage();
}, },
), ),
], ],
......
import 'package:appframe/bloc/web_cubit.dart'; import 'package:appframe/config/locator.dart';
import 'package:appframe/services/dispatcher.dart'; import 'package:appframe/services/dispatcher.dart';
import 'package:appframe/services/player_service.dart';
import 'package:uuid/uuid.dart';
class AudioPlayHandler extends MessageHandler { class AudioPlayHandler extends MessageHandler {
late WebCubit? _webCubit;
@override
void setCubit(WebCubit cubit) {
this._webCubit = cubit;
}
void _unfollowCubit() {
this._webCubit = null;
}
@override @override
Future<dynamic> handleMessage(dynamic params) async { Future<dynamic> handleMessage(dynamic params) async {
try {
if (params is! Map<String, dynamic>) { if (params is! Map<String, dynamic>) {
throw Exception('参数错误'); throw Exception('参数错误');
} }
final url = params['url'] as String; final url = params['url'] as String;
final seek = params['seek'] as int? ?? 0;
bool result = await _webCubit!.playAudio(url); // 暂时忽略
return result; // final isBg = params['isBg'] as bool ?? false;
} finally { var playId = params['playId'] as String? ?? '';
_unfollowCubit(); if (playId.isEmpty) {
} playId = Uuid().v4();
} }
}
class AudioPauseHandler extends MessageHandler { var playerService = getIt.get<PlayerService>();
late WebCubit? _webCubit; var result = await playerService.playAudio(url, seek, playId);
@override if (!result) {
void setCubit(WebCubit cubit) { throw Exception('播放错误');
this._webCubit = cubit;
} }
return {'playId': playId};
void _unfollowCubit() {
this._webCubit = null;
} }
}
class AudioPauseHandler extends MessageHandler {
@override @override
Future<dynamic> handleMessage(dynamic params) async { Future<dynamic> handleMessage(dynamic params) async {
bool result = await _webCubit!.pauseAudio(); return await getIt.get<PlayerService>().pauseAudio();
return result;
} }
} }
class AudioResumeHandler extends MessageHandler { class AudioResumeHandler extends MessageHandler {
late WebCubit? _webCubit;
@override
void setCubit(WebCubit cubit) {
this._webCubit = cubit;
}
void _unfollowCubit() {
this._webCubit = null;
}
@override @override
Future<dynamic> handleMessage(dynamic params) async { Future<dynamic> handleMessage(dynamic params) async {
bool result = await _webCubit!.resumeAudio(); return await getIt.get<PlayerService>().resumeAudio();
return result;
} }
} }
class AudioSeekHandler extends MessageHandler { class AudioSeekHandler extends MessageHandler {
late WebCubit? _webCubit;
@override
void setCubit(WebCubit cubit) {
this._webCubit = cubit;
}
void _unfollowCubit() {
this._webCubit = null;
}
@override @override
Future<dynamic> handleMessage(dynamic params) async { Future<dynamic> handleMessage(dynamic params) async {
if (params is! Map<String, dynamic>) { if (params is! Map<String, dynamic>) {
...@@ -87,45 +51,21 @@ class AudioSeekHandler extends MessageHandler { ...@@ -87,45 +51,21 @@ class AudioSeekHandler extends MessageHandler {
} }
final seek = params['seek'] as int; final seek = params['seek'] as int;
bool result = await _webCubit!.seekAudio(seek); return await getIt.get<PlayerService>().seekAudio(seek);
return result;
} }
} }
class AudioStopHandler extends MessageHandler { class AudioStopHandler extends MessageHandler {
late WebCubit? _webCubit;
@override
void setCubit(WebCubit cubit) {
this._webCubit = cubit;
}
void _unfollowCubit() {
this._webCubit = null;
}
@override @override
Future<dynamic> handleMessage(dynamic params) async { Future<dynamic> handleMessage(dynamic params) async {
bool result = await _webCubit!.stopAudio(); return await getIt.get<PlayerService>().stopAudio();
return result;
} }
} }
class AudioClearHandler extends MessageHandler { class AudioClearHandler extends MessageHandler {
late WebCubit? _webCubit;
@override
void setCubit(WebCubit cubit) {
this._webCubit = cubit;
}
void _unfollowCubit() {
this._webCubit = null;
}
@override @override
Future<dynamic> handleMessage(dynamic params) async { Future<dynamic> handleMessage(dynamic params) async {
await _webCubit!.clearAudio(); await getIt.get<PlayerService>().clearAudio();
return true; return true;
} }
} }
import 'package:appframe/bloc/web_cubit.dart'; import 'package:appframe/config/locator.dart';
import 'package:appframe/services/dispatcher.dart'; import 'package:appframe/services/dispatcher.dart';
import 'package:appframe/services/recorder_service.dart';
class AudioRecorderStartHandler extends MessageHandler { class AudioRecorderStartHandler extends MessageHandler {
late WebCubit? _webCubit;
@override
void setCubit(WebCubit cubit) {
this._webCubit = cubit;
}
void _unfollowCubit() {
this._webCubit = null;
}
@override @override
Future<dynamic> handleMessage(dynamic params) async { Future<dynamic> handleMessage(dynamic params) async {
try { // 0代表不限制时长
bool result = await _webCubit!.startRecording(); final duration = params['duration'] as int? ?? 0;
return result;
} finally { return await getIt.get<RecorderService>().startRecording(duration);
_unfollowCubit();
}
} }
} }
class AudioRecorderPauseHandler extends MessageHandler { class AudioRecorderPauseHandler extends MessageHandler {
late WebCubit? _webCubit;
@override
void setCubit(WebCubit cubit) {
this._webCubit = cubit;
}
void _unfollowCubit() {
this._webCubit = null;
}
@override @override
Future<dynamic> handleMessage(dynamic params) async { Future<dynamic> handleMessage(dynamic params) async {
try { return await getIt.get<RecorderService>().pauseRecording();
bool result = await _webCubit!.pauseRecording();
return result;
} finally {
_unfollowCubit();
}
} }
} }
class AudioRecorderResumeHandler extends MessageHandler { class AudioRecorderResumeHandler extends MessageHandler {
late WebCubit? _webCubit;
@override
void setCubit(WebCubit cubit) {
this._webCubit = cubit;
}
void _unfollowCubit() {
this._webCubit = null;
}
@override @override
Future<dynamic> handleMessage(dynamic params) async { Future<dynamic> handleMessage(dynamic params) async {
try { return await getIt.get<RecorderService>().resumeRecording();
bool result = await _webCubit!.resumeRecording();
return result;
} finally {
_unfollowCubit();
}
} }
} }
class AudioRecorderStopHandler extends MessageHandler { class AudioRecorderStopHandler extends MessageHandler {
late WebCubit? _webCubit;
@override
void setCubit(WebCubit cubit) {
this._webCubit = cubit;
}
void _unfollowCubit() {
this._webCubit = null;
}
@override @override
Future<dynamic> handleMessage(dynamic params) async { Future<dynamic> handleMessage(dynamic params) async {
try { return await getIt.get<RecorderService>().stopRecording();
return await _webCubit!.stopRecording();
} finally {
_unfollowCubit();
}
} }
} }
class AudioRecorderClearHandler extends MessageHandler { class AudioRecorderClearHandler extends MessageHandler {
late WebCubit? _webCubit;
@override
void setCubit(WebCubit cubit) {
this._webCubit = cubit;
}
void _unfollowCubit() {
this._webCubit = null;
}
@override @override
Future<dynamic> handleMessage(dynamic params) async { Future<dynamic> handleMessage(dynamic params) async {
try { return await getIt.get<RecorderService>().clearRecording();
return await _webCubit!.clearRecording();
} finally {
_unfollowCubit();
}
} }
} }
import 'dart:io'; import 'dart:io';
import 'package:appframe/services/dispatcher.dart'; import 'package:appframe/services/dispatcher.dart';
import 'package:appframe/utils/video_util.dart';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:flutter_image_compress/flutter_image_compress.dart'; import 'package:flutter_image_compress/flutter_image_compress.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import 'package:video_compress/video_compress.dart'; import 'package:uuid/uuid.dart';
///
/// 压缩图片 /// 压缩图片
/// ///
class CompressImageHandler extends MessageHandler { class CompressImageHandler extends MessageHandler {
...@@ -84,6 +86,7 @@ class CompressImageHandler extends MessageHandler { ...@@ -84,6 +86,7 @@ class CompressImageHandler extends MessageHandler {
} }
} }
///
/// 压缩视频 /// 压缩视频
/// ///
class CompressVideoHandler extends MessageHandler { class CompressVideoHandler extends MessageHandler {
...@@ -105,11 +108,11 @@ class CompressVideoHandler extends MessageHandler { ...@@ -105,11 +108,11 @@ class CompressVideoHandler extends MessageHandler {
throw Exception('参数错误'); throw Exception('参数错误');
} }
Directory tempDir = await getTemporaryDirectory();
String srcPath; String srcPath;
if (url.startsWith('http')) { if (url.startsWith('http')) {
String ext = path.extension(url); String ext = path.extension(url);
final Directory tempDir = await getTemporaryDirectory(); srcPath = '${tempDir.path}/${Uuid().v4()}$ext';
srcPath = path.join(tempDir.path, '${DateTime.now().millisecondsSinceEpoch}$ext');
// Dio 下载文件 // Dio 下载文件
final resp = await Dio().download(url, srcPath); final resp = await Dio().download(url, srcPath);
if (resp.statusCode != 200) { if (resp.statusCode != 200) {
...@@ -119,28 +122,49 @@ class CompressVideoHandler extends MessageHandler { ...@@ -119,28 +122,49 @@ class CompressVideoHandler extends MessageHandler {
srcPath = url; srcPath = url;
} }
VideoQuality videoQuality; var originFile = File(srcPath);
switch (quality) { if (!originFile.existsSync()) {
case 'low': throw Exception('文件不存在');
videoQuality = VideoQuality.LowQuality;
break;
case 'middle':
videoQuality = VideoQuality.MediumQuality;
break;
case 'high':
videoQuality = VideoQuality.HighestQuality;
break;
default:
throw Exception('参数错误');
} }
print('原视频大小:${originFile.lengthSync()}');
final mediaInfo = await VideoCompress.compressVideo(
srcPath, final outputPath = '${tempDir.path}/${Uuid().v4()}.mp4';
quality: videoQuality, var result = await VideoUtil.compressVideo(srcPath, outputPath, quality);
deleteOrigin: false, if (!result) {
includeAudio: true, throw Exception('视频压缩失败');
); }
print('压缩后视频大小:${File(outputPath).lengthSync()}');
return {"tempFilePath": "/temp${mediaInfo!.path}", "size": mediaInfo.filesize};
return {
"tempFilePath": '/temp$outputPath',
"size": File(outputPath).lengthSync(),
};
// VideoQuality videoQuality;
// switch (quality) {
// case 'low':
// videoQuality = VideoQuality.LowQuality;
// break;
// case 'middle':
// videoQuality = VideoQuality.MediumQuality;
// break;
// case 'high':
// videoQuality = VideoQuality.HighestQuality;
// break;
// default:
// throw Exception('参数错误');
// }
//
// final mediaInfo = await VideoCompress.compressVideo(
// srcPath,
// quality: videoQuality,
// deleteOrigin: false,
// includeAudio: true,
// );
//
// return {
// "tempFilePath": "/temp${mediaInfo!.path}",
// "size": mediaInfo.filesize,
// };
} }
} }
...@@ -37,8 +37,8 @@ class CropImageHandler extends MessageHandler { ...@@ -37,8 +37,8 @@ class CropImageHandler extends MessageHandler {
} }
Future<String> _cropImageByRatio(String url, String cropScale) async { Future<String> _cropImageByRatio(String url, String cropScale) async {
if (url.startsWith(Constant.localServerUrl)) { if (url.startsWith(Constant.localFileUrl)) {
url = url.replaceFirst(Constant.localServerUrl, ''); url = url.replaceFirst(Constant.localFileUrl, '');
} }
if (url.startsWith(Constant.localServerTemp)) { if (url.startsWith(Constant.localServerTemp)) {
......
...@@ -15,8 +15,8 @@ class OpenDocumentHandler extends MessageHandler { ...@@ -15,8 +15,8 @@ class OpenDocumentHandler extends MessageHandler {
throw Exception('参数错误'); throw Exception('参数错误');
} }
if (url.startsWith(Constant.localServerUrl)) { if (url.startsWith(Constant.localFileUrl)) {
url = url.replaceFirst(Constant.localServerUrl, ''); url = url.replaceFirst(Constant.localFileUrl, '');
} }
if (url.startsWith(Constant.localServerTemp)) { if (url.startsWith(Constant.localServerTemp)) {
......
...@@ -28,7 +28,11 @@ class OpenWeappHandler extends MessageHandler { ...@@ -28,7 +28,11 @@ class OpenWeappHandler extends MessageHandler {
try { try {
return await _fluwx.open( return await _fluwx.open(
target: MiniProgram(username: appid, path: path, miniProgramType: _getWXMiniProgramType(envVersion)), target: MiniProgram(
username: appid,
path: path,
miniProgramType: _getWXMiniProgramType(envVersion),
),
); );
} catch (e) { } catch (e) {
print(e); print(e);
......
import 'package:appframe/bloc/web_cubit.dart'; // import 'package:appframe/bloc/web_cubit.dart';
import 'package:appframe/services/dispatcher.dart'; // import 'package:appframe/services/dispatcher.dart';
//
class SetTitleHandler extends MessageHandler { // class SetTitleHandler extends MessageHandler {
late WebCubit? _webCubit; // late WebCubit? _webCubit;
//
@override // @override
void setCubit(WebCubit cubit) { // void setCubit(WebCubit cubit) {
this._webCubit = cubit; // this._webCubit = cubit;
} // }
//
void _unfollowCubit() { // void _unfollowCubit() {
this._webCubit = null; // this._webCubit = null;
} // }
//
@override // @override
Future<dynamic> handleMessage(params) async { // Future<dynamic> handleMessage(params) async {
try { // try {
if (params is! Map<String, dynamic>) { // if (params is! Map<String, dynamic>) {
throw Exception('参数错误'); // throw Exception('参数错误');
} // }
//
final String title = params['title'] as String; // final String title = params['title'] as String;
final bool showBack = params['showBack'] as bool; // final bool showBack = params['showBack'] as bool;
//
return _webCubit!.setTitle(title, showBack); // return _webCubit!.setTitle(title, showBack);
} finally { // } finally {
_unfollowCubit(); // _unfollowCubit();
} // }
} // }
} // }
import 'package:appframe/bloc/web_cubit.dart';
import 'package:appframe/services/dispatcher.dart';
class TitleBarHandler extends MessageHandler {
late WebCubit? _webCubit;
@override
void setCubit(WebCubit cubit) {
this._webCubit = cubit;
}
void _unfollowCubit() {
this._webCubit = null;
}
@override
Future<dynamic> handleMessage(params) async {
try {
if (params is! Map<String, dynamic>) {
throw Exception('参数错误');
}
final String title = params['title'] as String;
final String color = params['color'] as String;
final String bgColor = params['bgColor'] as String;
final String icon = params['icon'] as String;
return _webCubit!.setTitleBar(title, color, bgColor, icon);
} finally {
_unfollowCubit();
}
}
}
...@@ -6,13 +6,10 @@ import 'package:appframe/services/dispatcher.dart'; ...@@ -6,13 +6,10 @@ import 'package:appframe/services/dispatcher.dart';
import 'package:appframe/utils/file_type_util.dart'; import 'package:appframe/utils/file_type_util.dart';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
// import 'package:logger/logger.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
class UploadFile2Handler extends MessageHandler { class UploadFile2Handler extends MessageHandler {
// static final upLogger = Logger(level: Level.debug);
@override @override
Future handleMessage(params) async { Future handleMessage(params) async {
if (params is! Map<String, dynamic>) { if (params is! Map<String, dynamic>) {
...@@ -34,16 +31,13 @@ class UploadFile2Handler extends MessageHandler { ...@@ -34,16 +31,13 @@ class UploadFile2Handler extends MessageHandler {
} }
final startTime = DateTime.now(); final startTime = DateTime.now();
// upLogger.d('开始上传文件,$startTime');
print('====================>开始上传文件,$startTime'); print('====================>开始上传文件,$startTime');
// final result = await compute(_handleUpload, {'filePath': tempFilePath, 'busi': busi, 'subBusi': subBusi}); // final result = await compute(_handleUpload, {'filePath': tempFilePath, 'busi': busi, 'subBusi': subBusi});
final result = await _handleUpload(tempFilePath, busi, subBusi); final result = await _handleUpload(tempFilePath, busi, subBusi);
final endTime = DateTime.now(); final endTime = DateTime.now();
// upLogger.d('完成上传文件,$endTime');
print('====================>完成上传文件,$endTime'); print('====================>完成上传文件,$endTime');
// upLogger.d('上传完成,耗时:${endTime.millisecondsSinceEpoch - startTime.millisecondsSinceEpoch} 毫秒');
print('====================>上传完成,耗时:${endTime.millisecondsSinceEpoch - startTime.millisecondsSinceEpoch} 毫秒'); print('====================>上传完成,耗时:${endTime.millisecondsSinceEpoch - startTime.millisecondsSinceEpoch} 毫秒');
result['startTimestamp'] = startTime.toString(); result['startTimestamp'] = startTime.toString();
...@@ -63,8 +57,8 @@ class UploadFile2Handler extends MessageHandler { ...@@ -63,8 +57,8 @@ class UploadFile2Handler extends MessageHandler {
// String busi = fileParams['busi'] as String; // String busi = fileParams['busi'] as String;
// String subBusi = fileParams['subBusi'] as String; // String subBusi = fileParams['subBusi'] as String;
static Future<Map<String, dynamic>> _handleUpload(String filePath, String busi, String subBusi) async { static Future<Map<String, dynamic>> _handleUpload(String filePath, String busi, String subBusi) async {
if (filePath.startsWith(Constant.localServerUrl)) { if (filePath.startsWith(Constant.localFileUrl)) {
filePath = filePath.replaceFirst(Constant.localServerUrl, ''); filePath = filePath.replaceFirst(Constant.localFileUrl, '');
} }
if (filePath.startsWith(Constant.localServerTemp)) { if (filePath.startsWith(Constant.localServerTemp)) {
...@@ -80,13 +74,12 @@ class UploadFile2Handler extends MessageHandler { ...@@ -80,13 +74,12 @@ class UploadFile2Handler extends MessageHandler {
//并行上传分段 //并行上传分段
var startTime = DateTime.now(); var startTime = DateTime.now();
// upLogger.d("开始异步处理 $startTime");
print('====================>开始异步处理 $startTime'); print('====================>开始异步处理 $startTime');
final uploadResult = final uploadResult =
await _uploadInParallel(bxeApiService, obsApiService, logicPrefix, filePath, maxConcurrency: 30); await _uploadInParallel(bxeApiService, obsApiService, logicPrefix, filePath, maxConcurrency: 30);
var endTime = DateTime.now(); var endTime = DateTime.now();
// upLogger.d("完成异步处理 $endTime ,耗时 ${endTime.millisecondsSinceEpoch - startTime.millisecondsSinceEpoch} 毫秒"); print(
print('====================>完成异步处理 $endTime ,耗时 ${endTime.millisecondsSinceEpoch - startTime.millisecondsSinceEpoch} 毫秒'); '====================>完成异步处理 $endTime ,耗时 ${endTime.millisecondsSinceEpoch - startTime.millisecondsSinceEpoch} 毫秒');
// 上传结果 // 上传结果
String objectKey = uploadResult['objectKey'] as String; String objectKey = uploadResult['objectKey'] as String;
...@@ -96,12 +89,11 @@ class UploadFile2Handler extends MessageHandler { ...@@ -96,12 +89,11 @@ class UploadFile2Handler extends MessageHandler {
//请求合并文件 //请求合并文件
var startTime2 = DateTime.now(); var startTime2 = DateTime.now();
// upLogger.d("开始处理合并文件 $startTime2");
print('====================>开始处理合并文件 $startTime2'); print('====================>开始处理合并文件 $startTime2');
String location = await _merge(bxeApiService, objectKey, bucket, uploadId, tagsMap); String location = await _merge(bxeApiService, objectKey, bucket, uploadId, tagsMap);
var endTime2 = DateTime.now(); var endTime2 = DateTime.now();
// upLogger.d("合并文件完成 $endTime2 ,耗时 ${endTime2.millisecondsSinceEpoch - startTime2.millisecondsSinceEpoch} 毫秒 "); print(
print('====================>合并文件完成 $endTime2 ,耗时 ${endTime2.millisecondsSinceEpoch - startTime2.millisecondsSinceEpoch} 毫秒 '); '====================>合并文件完成 $endTime2 ,耗时 ${endTime2.millisecondsSinceEpoch - startTime2.millisecondsSinceEpoch} 毫秒 ');
//关闭Dio //关闭Dio
bxeApiService.close(); bxeApiService.close();
...@@ -129,17 +121,14 @@ class UploadFile2Handler extends MessageHandler { ...@@ -129,17 +121,14 @@ class UploadFile2Handler extends MessageHandler {
throw Exception('上传的文件过大'); throw Exception('上传的文件过大');
} }
// upLogger.d('文件大小:$fileSize');
print('====================>文件大小:$fileSize'); print('====================>文件大小:$fileSize');
//分段大小2M //分段大小2M
final chunkSize = Constant.obsUploadChunkSize; final chunkSize = Constant.obsUploadChunkSize;
// upLogger.d('分段大小:$chunkSize');
print('====================>分段大小:$chunkSize'); print('====================>分段大小:$chunkSize');
//分段总数 //分段总数
final totalChunks = (fileSize / chunkSize).ceil(); final totalChunks = (fileSize / chunkSize).ceil();
// upLogger.d('分段总数:$totalChunks');
print('====================>分段总数:$totalChunks'); print('====================>分段总数:$totalChunks');
final randomAccessFile = file.openSync(); final randomAccessFile = file.openSync();
...@@ -163,15 +152,12 @@ class UploadFile2Handler extends MessageHandler { ...@@ -163,15 +152,12 @@ class UploadFile2Handler extends MessageHandler {
final futures = <Future>[]; final futures = <Future>[];
for (int i = 0; i < totalChunks; i++) { for (int i = 0; i < totalChunks; i++) {
// upLogger.d('开始处理分段:$i');
print('====================>开始处理分段:$i'); print('====================>开始处理分段:$i');
// 控制并发数量 // 控制并发数量
if (futures.length >= maxConcurrency) { if (futures.length >= maxConcurrency) {
// upLogger.d('超过最大并发数量,等待');
print('====================>超过最大并发数量,等待'); print('====================>超过最大并发数量,等待');
var resultList = await Future.wait(futures); var resultList = await Future.wait(futures);
// upLogger.d('等待完成');
print('====================>等待完成'); print('====================>等待完成');
for (var result in resultList) { for (var result in resultList) {
...@@ -201,7 +187,6 @@ class UploadFile2Handler extends MessageHandler { ...@@ -201,7 +187,6 @@ class UploadFile2Handler extends MessageHandler {
chunkSignUrl = nextResult['signed_url'] as String; chunkSignUrl = nextResult['signed_url'] as String;
} }
final endTime = DateTime.now().millisecondsSinceEpoch; final endTime = DateTime.now().millisecondsSinceEpoch;
// upLogger.d('分段$i,签名耗时:${endTime - startTime} 毫秒');
print('====================>分段$i,签名耗时:${endTime - startTime} 毫秒'); print('====================>分段$i,签名耗时:${endTime - startTime} 毫秒');
// await _uploadChunkWithRetry(obsApiService, chunkSignUrl, i, chunk, tagsMap); // await _uploadChunkWithRetry(obsApiService, chunkSignUrl, i, chunk, tagsMap);
...@@ -222,7 +207,7 @@ class UploadFile2Handler extends MessageHandler { ...@@ -222,7 +207,7 @@ class UploadFile2Handler extends MessageHandler {
} }
} }
randomAccessFile.closeSync(); await randomAccessFile.close();
return {'objectKey': objectKey, 'bucket': bucket, 'uploadId': uploadId, 'tagsMap': tagsMap}; return {'objectKey': objectKey, 'bucket': bucket, 'uploadId': uploadId, 'tagsMap': tagsMap};
} }
...@@ -263,11 +248,9 @@ class UploadFile2Handler extends MessageHandler { ...@@ -263,11 +248,9 @@ class UploadFile2Handler extends MessageHandler {
var maxRetries = 30; var maxRetries = 30;
final start = DateTime.now(); final start = DateTime.now();
// upLogger.d('new Isolate--- 分段$chunkIndex,开始时间:$start');
print('====================>new Isolate--- 分段$chunkIndex,开始时间:$start'); print('====================>new Isolate--- 分段$chunkIndex,开始时间:$start');
for (int attempt = 0; attempt <= maxRetries; attempt++) { for (int attempt = 0; attempt <= maxRetries; attempt++) {
// upLogger.d('new Isolate--- 分段$chunkIndex,第 ${attempt + 1} 次,开始时间:${DateTime.now()}');
print('====================>new Isolate--- 分段$chunkIndex,第 ${attempt + 1} 次,开始时间:${DateTime.now()}'); print('====================>new Isolate--- 分段$chunkIndex,第 ${attempt + 1} 次,开始时间:${DateTime.now()}');
try { try {
final obsApiService = ApiService(defaultHeaders: {'Content-Type': '', 'Accept': ''}); final obsApiService = ApiService(defaultHeaders: {'Content-Type': '', 'Accept': ''});
...@@ -276,9 +259,9 @@ class UploadFile2Handler extends MessageHandler { ...@@ -276,9 +259,9 @@ class UploadFile2Handler extends MessageHandler {
final etags = resp.headers['etag'] as List<String>; final etags = resp.headers['etag'] as List<String>;
// tagsMap[chunkIndex + 1] = etags[0]; // tagsMap[chunkIndex + 1] = etags[0];
final end = DateTime.now(); final end = DateTime.now();
// upLogger.d( print(
// 'new Isolate--- 分段$chunkIndex,完成时间: $end,上传段耗时:${end.millisecondsSinceEpoch - start.millisecondsSinceEpoch}毫秒'); '====================>new Isolate--- 分段$chunkIndex,完成时间: $end,上传段耗时:${end.millisecondsSinceEpoch - start.millisecondsSinceEpoch}毫秒');
print('====================>new Isolate--- 分段$chunkIndex,完成时间: $end,上传段耗时:${end.millisecondsSinceEpoch - start.millisecondsSinceEpoch}毫秒'); obsApiService.close();
return Future.value({'idx': chunkIndex + 1, 'etag': etags[0]}); // 上传成功 return Future.value({'idx': chunkIndex + 1, 'etag': etags[0]}); // 上传成功
} else { } else {
throw Exception('Chunk $chunkIndex upload failed: ${resp.statusCode}'); throw Exception('Chunk $chunkIndex upload failed: ${resp.statusCode}');
...@@ -349,8 +332,8 @@ class UploadFile2Handler extends MessageHandler { ...@@ -349,8 +332,8 @@ class UploadFile2Handler extends MessageHandler {
return 'https://files-obs.banxiaoer.com${location.substring(10)}'; return 'https://files-obs.banxiaoer.com${location.substring(10)}';
} else if (location.startsWith('/bxe-pics')) { } else if (location.startsWith('/bxe-pics')) {
return 'https://pics-obs.banxiaoer.com${location.substring(9)}'; return 'https://pics-obs.banxiaoer.com${location.substring(9)}';
} else if (location.startsWith('/bxe-videos')) { } else if (location.startsWith('/bxe-video')) {
return 'https://videos-obs.banxiaoer.com${location.substring(11)}'; return 'https://video-obs.banxiaoer.com${location.substring(10)}';
} else { } else {
return location; return location;
} }
......
...@@ -6,14 +6,17 @@ class WechatAuthRepository { ...@@ -6,14 +6,17 @@ class WechatAuthRepository {
late final ApiService _apiService; late final ApiService _apiService;
WechatAuthRepository() { WechatAuthRepository() {
_apiService = getIt<ApiService>(); _apiService = getIt<ApiService>(instanceName: 'bxeApiService');
} }
Future<dynamic> codeToSk(String code) async { Future<dynamic> codeToSk(String code) async {
Response resp = await _apiService.post('/login/applet/wkbxe/codeToSkByApp?version=1.0.0', { Response resp = await _apiService.post(
'/login/applet/wkbxe/codeToSkByApp?version=1.0.0',
{
"appCode": "bxeapp", "appCode": "bxeapp",
"params": {"code": code}, "params": {"code": code},
}); },
);
print('登录结果: $resp'); print('登录结果: $resp');
......
import 'package:appframe/config/db.dart'; import 'package:appframe/config/constant.dart';
import 'package:appframe/config/locator.dart'; import 'package:appframe/config/locator.dart';
import 'package:appframe/config/mqtt.dart'; import 'package:appframe/services/im_service.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'app.dart'; import 'app.dart';
...@@ -8,8 +8,9 @@ import 'app.dart'; ...@@ -8,8 +8,9 @@ import 'app.dart';
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await setupLocator(); await setupLocator();
// await registerMqtt(); if (Constant.needIM) {
await initDatabase(); await getIt.get<ImService>().initSdk();
}
runApp(const App()); runApp(const App());
} }
...@@ -54,8 +54,7 @@ class MessageDispatcher { ...@@ -54,8 +54,7 @@ class MessageDispatcher {
h5Message.cmd == "chooseImage" || h5Message.cmd == "chooseImage" ||
h5Message.cmd == "chooseVideo" || h5Message.cmd == "chooseVideo" ||
h5Message.cmd == "goLogin" || h5Message.cmd == "goLogin" ||
h5Message.cmd.startsWith("audio") || h5Message.cmd.startsWith("setTitlebar")) {
h5Message.cmd.startsWith("setTitle")) {
handler.setCubit(webCubit!); handler.setCubit(webCubit!);
handler.setMessage(message); handler.setMessage(message);
} }
......
import 'dart:io'; import 'dart:io';
import 'package:appframe/config/constant.dart'; import 'package:appframe/config/constant.dart';
import 'package:archive/archive.dart'; import 'package:appframe/config/locator.dart';
import 'package:dio/dio.dart'; import 'package:appframe/services/upgrade_service.dart';
import 'package:appframe/utils/zip_util.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
class LocalServerService { class LocalServerService {
String? _httpDirectory; String? _httpDirectory;
// 启动本地HTTP服务器 // 启动本地HTTP服务器
Future<HttpServer> startLocalServer() async { Future<HttpServer> startLocalServer() async {
// 检测和升级
// await getIt.get<UpgradeService>().upgrade();
// 测试情况下, 每次启动服务,先解压dist文件 // 测试情况下, 每次启动服务,先解压dist文件
_extractDist(); _extractDist();
...@@ -77,7 +82,7 @@ class LocalServerService { ...@@ -77,7 +82,7 @@ class LocalServerService {
Future<void> _serveHttpFile(HttpRequest request, String requestPath) async { Future<void> _serveHttpFile(HttpRequest request, String requestPath) async {
try { try {
var httpDirectory = await getHttpDirectory(); var httpDirectory = await _getHttpDirectory();
final String filePath = '$httpDirectory$requestPath'; final String filePath = '$httpDirectory$requestPath';
// 检查文件是否存在 // 检查文件是否存在
...@@ -136,7 +141,7 @@ class LocalServerService { ...@@ -136,7 +141,7 @@ class LocalServerService {
return 'application/octet-stream'; return 'application/octet-stream';
} }
Future<String> getHttpDirectory() async { Future<String> _getHttpDirectory() async {
if (_httpDirectory == null) { if (_httpDirectory == null) {
await _initHttpDirectory(); await _initHttpDirectory();
} }
...@@ -144,17 +149,18 @@ class LocalServerService { ...@@ -144,17 +149,18 @@ class LocalServerService {
} }
Future<void> _initHttpDirectory() async { Future<void> _initHttpDirectory() async {
var version = getIt.get<SharedPreferences>().getString('h5_version') ?? Constant.h5Version;
if (Platform.isAndroid) { if (Platform.isAndroid) {
var direct = await getExternalStorageDirectory(); var direct = await getExternalStorageDirectory();
_httpDirectory = '${direct?.path}/http_dist_assets'; _httpDirectory = '${direct?.path}/http_dist_assets_/$version';
} else if (Platform.isIOS || Platform.isMacOS) { } else if (Platform.isIOS || Platform.isMacOS) {
var direct = await getApplicationSupportDirectory(); var direct = await getApplicationSupportDirectory();
_httpDirectory = '${direct.path}/http_dist_assets'; _httpDirectory = '${direct.path}/http_dist_assets_/$version';
} }
} }
Future<void> _extractDist() async { Future<void> _extractDist() async {
var outputDirectory = await getHttpDirectory(); var outputDirectory = await _getHttpDirectory();
// 判断目录存在则不需要再解压 // 判断目录存在则不需要再解压
// if (Directory(outputDirectory).existsSync()) { // if (Directory(outputDirectory).existsSync()) {
...@@ -162,48 +168,6 @@ class LocalServerService { ...@@ -162,48 +168,6 @@ class LocalServerService {
// } // }
var zipFilePath = "assets/dist.zip"; var zipFilePath = "assets/dist.zip";
final ByteData data = await rootBundle.load(zipFilePath); ZipUtil.extractZipFile(zipFilePath, outputDirectory);
final bytes = data.buffer.asUint8List();
// 解码 ZIP 文件
final archive = ZipDecoder().decodeBytes(bytes);
// 提取文件到指定目录
for (final file in archive) {
final filename = file.name;
if (file.isFile) {
final data = file.content as List<int>;
final outputFile = File('$outputDirectory/$filename');
outputFile.createSync(recursive: true);
outputFile.writeAsBytesSync(data);
} else {
// 创建目录
Directory('$outputDirectory/$filename').createSync(recursive: true);
}
}
}
Future<void> _clearDist() async {
var outputDirectory = await getHttpDirectory();
Directory(outputDirectory).deleteSync(recursive: true);
}
void _downloadDist() async {
var httpDirectory = await getHttpDirectory();
var distUrl = "https://github.com/xinxin-wu/flutter_web_dist/releases/download/v1.0.0/dist.zip";
// Dio进行下载
var dio = Dio();
dio.download(
distUrl,
'$httpDirectory/dist.zip',
onReceiveProgress: (received, total) {
if (total != -1) {
print((received / total * 100).toStringAsFixed(0) + "%");
}
},
).then((_) {
_extractDist();
});
dio.close();
} }
} }
import 'dart:async';
import 'dart:io';
import 'package:mqtt_client/mqtt_client.dart';
import 'package:mqtt_client/mqtt_server_client.dart';
class MqttService {
/// MQTT服务器信息
final String _host;
final int _port;
final String _clientId;
final int _keepAlive;
final String _username;
/// 重连的时候要重新获取一下 token
final String _password;
/// MQTT客户端
late MqttServerClient _client;
StreamSubscription? _subscription;
/// MQTT重连相关变量
int _reconnectAttempts = 0;
final int _maxReconnectAttempts = 5;
Timer? _reconnectTimer;
MqttService(this._host, this._port, this._clientId, this._keepAlive, this._username, this._password);
Future<void> initConn() async {
_client = MqttServerClient(_host, _clientId);
_client.logging(on: false);
_client.port = _port;
_client.keepAlivePeriod = _keepAlive;
_client.onDisconnected = onDisconnected;
_client.onConnected = onConnected;
_client.onSubscribed = onSubscribed;
_client.pongCallback = pong;
final connMess = MqttConnectMessage()
.withWillTopic('willtopic')
.withWillMessage('My Will message')
.startClean()
.withWillQos(MqttQos.atLeastOnce);
_client.connectionMessage = connMess;
try {
print('MQTT 开始连接......');
await _client.connect(_username, _password);
} on NoConnectionException catch (e) {
print('MQTT客户端连接失败: $e');
_client.disconnect();
} on SocketException catch (e) {
print('MQTT客户端连接失败: $e');
_client.disconnect();
}
// 订阅主题
subscribe("\$q/bxe/abc");
// 监听消息
listen(onMessageReceived);
}
void onConnected() {
print('MQTT客户端连接成功');
_reconnectAttempts = 0;
_reconnectTimer?.cancel();
}
void onDisconnected() {
print('MQTT客户端断开连接');
// if (_reconnectAttempts < _maxReconnectAttempts) {
// handleReconnect(_host, _port, _clientId, '');
// }
}
void onSubscribed(String topic) {
print('MQTT客户端订阅主题: $topic');
}
void onMessageReceived(List<MqttReceivedMessage<MqttMessage?>>? c) {
final recMess = c![0].payload as MqttPublishMessage;
final pt = MqttPublishPayload.bytesToStringAsString(recMess.payload.message);
print('MQTT消息接收: topic is ${c[0].topic}, payload is $pt');
// 处理接收到的消息
}
void subscribe(String topic) {
_client.subscribe(topic, MqttQos.atLeastOnce);
}
void listen(Function(List<MqttReceivedMessage<MqttMessage?>>? c) onMessageReceivedCallback) {
_subscription?.cancel();
_subscription = _client.updates?.listen(onMessageReceivedCallback);
}
void disconnect() {
_client.disconnect();
}
bool isConnected() {
return _client.connectionStatus?.state == MqttConnectionState.connected;
}
void pong() {
print('Ping response client callback invoked');
}
void onMqttMessageReceived(List<MqttReceivedMessage<MqttMessage?>>? c) {
final recMess = c![0].payload as MqttPublishMessage;
final pt = MqttPublishPayload.bytesToStringAsString(recMess.payload.message);
print('MQTT消息接收: topic is ${c[0].topic}, payload is $pt');
// 处理接收到的消息
}
void handleReconnect(String host, int port, String username, String password) {
if (_reconnectAttempts >= _maxReconnectAttempts) {
print('已达到最大重连次数,停止重连');
return;
}
_reconnectAttempts++;
print('第 $_reconnectAttempts 次重连尝试,${_maxReconnectAttempts - _reconnectAttempts} 次机会剩余');
// 取消之前的重连定时器(如果有)
_reconnectTimer?.cancel();
// 设置延迟重连,每次重连间隔递增
final delay = Duration(seconds: _reconnectAttempts * 5);
_reconnectTimer = Timer(delay, () async {
print('正在尝试重新连接...');
await initConn();
if (!isConnected()) {
disconnect();
}
});
}
}
import 'dart:async';
import 'package:flutter_sound/flutter_sound.dart';
class PlayerService {
/// 播放器
FlutterSoundPlayer? _player;
///
StreamSubscription? _playerSubscription;
/// 播放器是否初始化
bool? _playerIsInit;
/// 播放指令传递的 playId
String? _playId;
/// 当前播放文件的时长
int? _playDuration;
Function? _sendResponse;
set sendResponse(Function value) {
_sendResponse = value;
}
Future<bool> _initPlayer() async {
// 打开播放器
try {
final player = FlutterSoundPlayer();
_player = (await player.openPlayer())!;
_player!.setSpeed(1); // 播放速度,默认1
// 播放进度回调
_player!.setSubscriptionDuration(Duration(seconds: 1));
_playerSubscription = _player!.onProgress!.listen((event) {
_playDuration = event.duration.inSeconds;
var playPosition = event.position.inSeconds;
var h5Cmd = {
'unique': '',
'cmd': 'audioProgress',
'data': {'playId': _playId, 'duration': _playDuration, 'currentTime': playPosition},
'errMsg': '',
};
_sendResponse!(h5Cmd);
});
_playerIsInit = true;
return true;
} catch (e) {
throw Exception('打开播放器失败!');
}
}
Future<bool> playAudio(String url, int seek, String playId) async {
if (!(_playerIsInit ?? false)) {
final initResult = await _initPlayer();
if (!initResult) {
return false;
}
}
_playId = playId;
await _player!.startPlayer(
fromURI: url,
whenFinished: () async {
await _player!.stopPlayer();
// 补发一下全部进度
var h5Cmd = {
'unique': '',
'cmd': 'audioProgress',
'data': {'playId': _playId, 'duration': _playDuration, 'currentTime': _playDuration},
'errMsg': '',
};
_sendResponse!(h5Cmd);
// 播放结束后,发送消息给客户端
h5Cmd = {
'unique': '',
'cmd': 'audioEnd',
'data': {'playId': _playId},
'errMsg': '',
};
_sendResponse!(h5Cmd);
},
);
if (seek != 0) {
await seekAudio(seek);
}
return true;
}
Future<bool> pauseAudio() async {
if (!(_playerIsInit ?? false)) {
throw Exception("播放器未初始化");
}
if (!_player!.isPlaying) {
throw Exception("播放器状态错误");
}
await _player!.pausePlayer();
return true;
}
Future<bool> resumeAudio() async {
if (!(_playerIsInit ?? false)) {
throw Exception("播放器未初始化");
}
if (!_player!.isPaused) {
throw Exception("播放器状态错误");
}
await _player!.resumePlayer();
return true;
}
Future<bool> seekAudio(int seek) async {
if (!(_playerIsInit ?? false)) {
throw Exception("播放器未初始化");
}
await _player!.seekToPlayer(Duration(seconds: seek));
return true;
}
Future<bool> stopAudio() async {
if (!(_playerIsInit ?? false)) {
throw Exception("播放器未初始化");
}
if (!_player!.isPlaying && !_player!.isPaused) {
throw Exception("播放器状态错误");
}
await _player!.stopPlayer();
return true;
}
Future<bool> clearAudio() async {
try {
await _player?.closePlayer();
_player = null;
await _playerSubscription?.cancel();
_playerSubscription = null;
} catch (e) {
print(e);
}
_playerIsInit = false;
_playId = '';
_playDuration = null;
return true;
}
///
/// 清理
///
Future<void> close() async {
try {
await _player?.closePlayer();
_player = null;
await _playerSubscription?.cancel();
_playerSubscription = null;
} catch (e) {
print(e);
}
_playerIsInit = false;
_playId = '';
_playDuration = null;
}
}
import 'dart:async';
import 'package:appframe/config/constant.dart';
import 'package:appframe/utils/audio_util.dart';
import 'package:flutter_sound/flutter_sound.dart';
import 'package:path/path.dart' as path;
import 'package:path_provider/path_provider.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:uuid/uuid.dart';
class RecorderService {
FlutterSoundRecorder? _recorder;
StreamSubscription? _recorderSubscription;
bool? _recorderIsInit;
String? _recordPath;
Future<bool> _initRecorder(int maxDuration) async {
// 请求麦克风权限
var status = await Permission.microphone.request();
if (status != PermissionStatus.granted) {
throw RecordingPermissionException('no auth');
}
final directory = await getTemporaryDirectory();
String recordPath = '${directory.path}/${Uuid().v4()}_record.mp4';
// 打开录音器
try {
final recorder = FlutterSoundRecorder();
_recorder = (await recorder.openRecorder())!;
if (maxDuration > 0) {
// 设置进度回调间隔
await _recorder!.setSubscriptionDuration(Duration(seconds: 1));
// 监听录制进度
_recorderSubscription = _recorder!.onProgress!.listen((event) {
// event.duration 包含当前录制时长
// event.decibels 包含当前音量级别
print('录制进度: ${event.duration.inSeconds}秒, 音量: ${event.decibels}');
/*if (event.duration.inSeconds >= maxDuration) {
stopRecording();
}*/
});
}
_recorderIsInit = true;
_recordPath = recordPath;
return true;
} catch (e) {
throw Exception('打开录音器失败!');
}
}
Future<bool> startRecording(int maxDuration) async {
if (_recorderIsInit ?? false) {
return false;
}
if (_recorder != null && !_recorder!.isStopped) {
return false;
}
final initResult = await _initRecorder(maxDuration);
if (!initResult) {
return false;
}
await _recorder!.startRecorder(toFile: _recordPath, codec: Codec.aacMP4);
return true;
}
Future<bool> pauseRecording() async {
if (!(_recorderIsInit ?? false)) {
return false;
}
if (!_recorder!.isRecording) {
return false;
}
await _recorder!.pauseRecorder();
return true;
}
Future<bool> resumeRecording() async {
if (!(_recorderIsInit ?? false)) {
return false;
}
if (!_recorder!.isPaused) {
return false;
}
await _recorder!.resumeRecorder();
return true;
}
Future<Map<String, dynamic>> stopRecording() async {
if (!(_recorderIsInit ?? false)) {
throw Exception("录音器未初始化");
}
if (!_recorder!.isRecording && !_recorder!.isPaused) {
throw Exception("录音器状态错误");
}
var url = await _recorder!.stopRecorder();
await _recorder!.closeRecorder();
_recorder = null;
_recorderIsInit = false;
_recordPath = '';
if (url == null || url.isEmpty) {
throw Exception("录音失败");
}
var tempDir = await getTemporaryDirectory();
String fileName = path.basenameWithoutExtension(url);
String mp3Path = '${tempDir.path}/$fileName.mp3';
// var convertResult = await compute(AudioUtil.convertAacToMp3, {'accPath': url, 'mp3Path': mp3Path});
var convertResult = await AudioUtil.convertAacToMp3({'accPath': url, 'mp3Path': mp3Path});
if (!convertResult) {
throw Exception("录音转码失败");
}
// 时长
// var duration = await AudioUtil.getAudioDuration(mp3Path);
var duration = await AudioUtil.getAudioDuration(url);
return {
'tempFilePath': '${Constant.localServerTempFileUrl}$mp3Path',
'duration': duration.inSeconds,
};
}
Future<bool> clearRecording() async {
// await _recorder!.stopRecorder();
try {
await _recorder?.closeRecorder();
_recorder = null;
await _recorderSubscription?.cancel();
_recorderSubscription = null;
} catch (e) {
print(e);
}
_recorderIsInit = false;
_recordPath = '';
return true;
}
Future<void> close() async {
try {
await _recorder?.closeRecorder();
_recorder = null;
await _recorderSubscription?.cancel();
_recorderSubscription = null;
} catch (e) {
print(e);
}
_recorderIsInit = false;
_recordPath = '';
}
}
import 'dart:io';
import 'package:appframe/config/constant.dart';
import 'package:appframe/config/locator.dart';
import 'package:appframe/utils/zip_util.dart';
import 'package:dio/dio.dart';
import 'package:path_provider/path_provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:uuid/uuid.dart';
class UpgradeService {
String configUrl = "https://bxe-obs.banxiaoer.com/conf/xeapp_conf_dev.json";
Future<void> upgrade() async {
await _handleUpgrade();
}
Future<bool> _handleUpgrade() async {
Dio dio = Dio();
try {
Response response = await dio.get('$configUrl?t=${DateTime.now().millisecondsSinceEpoch}');
if (response.statusCode != 200) {
return false;
}
String version = response.data['version'] as String;
String zip = response.data['zip'] as String;
// 版本号相同,则不需要升级
if (version == (getIt.get<SharedPreferences>().getString('h5_version') ?? Constant.h5Version)) {
print('版本号相同,不需要升级');
return true;
}
// 下载zip文件
var tempDir = await getTemporaryDirectory();
var saveFilePath = '${tempDir.path}/${Uuid().v4()}.zip';
var downloadResult = await _downloadFile(dio, '$zip$version.zip', saveFilePath);
if (!downloadResult) {
return false;
}
// 解压zip文件
String? httpDirect;
if (Platform.isAndroid) {
var direct = await getExternalStorageDirectory();
httpDirect = '${direct?.path}/http_dist_assets_/$version';
} else if (Platform.isIOS || Platform.isMacOS) {
var direct = await getApplicationSupportDirectory();
httpDirect = '${direct.path}/http_dist_assets_/$version';
}
var result = await ZipUtil.extractZipFile(saveFilePath, httpDirect!);
if (!result) {
return false;
}
// 设置版本标识
var sharedPreferences = getIt.get<SharedPreferences>();
sharedPreferences.setString('h5_version', version);
return true;
} catch (e) {
print('升级请求失败: $e');
return false;
} finally {
// 请求结束
dio.close(force: true);
}
}
Future<bool> _downloadFile(Dio dio, String url, String savePath) async {
try {
Response response = await dio.download(url, savePath);
if (response.statusCode == 200) {
print('文件下载成功: $savePath');
return true;
} else {
print('文件下载失败: ${response.statusCode}');
return false;
}
} catch (e) {
print('文件下载失败: $e');
return false;
}
}
}
import 'package:appframe/bloc/mqtt_cubit.dart'; import 'package:appframe/bloc/im_cubit.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
class MqttPage extends StatelessWidget { class ImPage extends StatelessWidget {
const MqttPage({super.key}); const ImPage({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BlocProvider( return BlocProvider(
create: (context) => MqttCubit(), create: (context) => ImCubit(),
child: BlocConsumer<MqttCubit, MqttState>( child: BlocConsumer<ImCubit, ImState>(
builder: (context, state) { builder: (context, state) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('推送测试'), title: Text('消息测试'),
centerTitle: true, centerTitle: true,
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
leading: IconButton( leading: IconButton(
icon: Icon(Icons.arrow_back), icon: Icon(Icons.arrow_back),
onPressed: () { onPressed: () {
context.read<MqttCubit>().goWeb(); context.read<ImCubit>().goWeb();
}, },
), ),
), ),
......
...@@ -51,108 +51,62 @@ class WebPage extends StatelessWidget { ...@@ -51,108 +51,62 @@ class WebPage extends StatelessWidget {
}, },
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(state.title), title: Text(state.title, style: TextStyle(color: Color(state.titleColor), fontSize: 18)),
centerTitle: true, centerTitle: true,
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
leading: state.beBack backgroundColor: Color(state.bgColor),
actionsIconTheme: IconThemeData(color: Colors.white),
// leading: state.beBack
// ? IconButton(
// icon: const Icon(Icons.arrow_back, color: Colors.white),
// onPressed: () {
// ctx.read<WebCubit>().handleBack();
// },
// )
// : null,
leading: state.opIcon == 'back'
? IconButton( ? IconButton(
icon: const Icon(Icons.arrow_back), icon: const Icon(Icons.arrow_back, color: Colors.white),
onPressed: () { onPressed: () {
ctx.read<WebCubit>().handleBack(); ctx.read<WebCubit>().handleBack();
}, },
) )
: null, : (state.opIcon == 'home'
// actions: [ ? IconButton(
// Builder( icon: const Icon(Icons.home, color: Colors.white),
// builder: (BuildContext context) { onPressed: () {
// return IconButton( ctx.read<WebCubit>().handleHome();
// icon: const Icon(Icons.more_vert), },
// onPressed: () { )
// showModalBottomSheet( : null),
// context: context,
// builder: (BuildContext context) {
// return SizedBox(
// height: 300,
// child: Column(
// children: [
// ListTile(
// leading: const Icon(Icons.chat_outlined),
// title: const Text('微信授权'),
// onTap: () {
// Navigator.pop(context);
// ctx.read<WebCubit>().goWechatAuth();
// },
// ),
// ListTile(
// leading: const Icon(Icons.accessibility_new),
// title: const Text('身份认证'),
// onTap: () {
// Navigator.pop(context);
// ctx.read<WebCubit>().goAuth();
// },
// ),
// ListTile(
// leading: const Icon(Icons.app_blocking_sharp),
// title: const Text('打开小程序'),
// onTap: () {
// Navigator.pop(context);
// ctx.read<WebCubit>().goMiniProgram();
// },
// ),
// ListTile(
// leading: const Icon(Icons.refresh),
// title: const Text('刷新'),
// onTap: () {
// Navigator.pop(context);
// ctx.read<WebCubit>().refresh();
// },
// ),
// ListTile(
// leading: const Icon(Icons.cleaning_services),
// title: const Text('清理缓存'),
// onTap: () {
// Navigator.pop(context);
// ctx.read<WebCubit>().clearStorage();
// },
// ),
// ],
// ),
// );
// },
// );
// },
// );
// },
// ),
// ],
), ),
endDrawer: Drawer( endDrawer: Drawer(
width: MediaQuery.of(ctx).size.width * 0.8, width: MediaQuery.of(ctx).size.width * 0.8,
child: ListView(padding: EdgeInsets.zero, children: [ child: ListView(padding: EdgeInsets.zero, children: [
// DrawerHeader( DrawerHeader(
// decoration: BoxDecoration( decoration: BoxDecoration(
// color: Theme.of(ctx).colorScheme.primary, color: Color(0xFF7691FA),
// ), ),
// child: Text('设置', child: Text('设置',
// style: TextStyle( style: TextStyle(
// color: Theme.of(ctx).colorScheme.onPrimary, // color: Theme.of(ctx).colorScheme.onPrimary,
// fontSize: 24, fontSize: 24,
// ))), color: Colors.white,
ListTile( ))),
/*ListTile(
tileColor: Color(0xFF7691FA), tileColor: Color(0xFF7691FA),
title: Text('设置', title: Text('设置',
style: TextStyle( style: TextStyle(
color: Theme.of(ctx).colorScheme.onPrimary, color: Theme.of(ctx).colorScheme.onPrimary,
fontSize: 24, fontSize: 24,
) )),
), ),*/
),
ListTile( ListTile(
leading: const Icon(Icons.chat_bubble_outline), leading: const Icon(Icons.chat_bubble_outline),
title: const Text('推送测试'), title: const Text('消息测试'),
onTap: () { onTap: () {
Navigator.pop(ctx); Navigator.pop(ctx);
ctx.read<WebCubit>().goMqtt(); ctx.read<WebCubit>().goIm();
}, },
), ),
ListTile( ListTile(
...@@ -192,7 +146,8 @@ class WebPage extends StatelessWidget { ...@@ -192,7 +146,8 @@ class WebPage extends StatelessWidget {
title: const Text('刷新'), title: const Text('刷新'),
onTap: () { onTap: () {
Navigator.pop(ctx); Navigator.pop(ctx);
ctx.read<WebCubit>().refresh(); // ctx.read<WebCubit>().refresh();
ctx.read<WebCubit>().handleRefreshPage();
}, },
), ),
ListTile( ListTile(
...@@ -203,13 +158,52 @@ class WebPage extends StatelessWidget { ...@@ -203,13 +158,52 @@ class WebPage extends StatelessWidget {
ctx.read<WebCubit>().clearStorage(); ctx.read<WebCubit>().clearStorage();
}, },
), ),
ListTile(
leading: const Icon(Icons.logout),
title: const Text('退出登录'),
onTap: () {
Navigator.pop(ctx);
ctx.read<WebCubit>().logout();
},
),
])), ])),
body: state.loaded body: state.loaded
? SizedBox( ? SizedBox(
height: MediaQuery.of(ctx).size.height - 120, // 减去100像素留空 height: MediaQuery.of(ctx).size.height - 60, // 减去100像素留空
child: WebViewWidget(controller: ctx.read<WebCubit>().controller), child: WebViewWidget(controller: ctx.read<WebCubit>().controller),
) )
: const Center(child: CircularProgressIndicator()), : const Center(child: CircularProgressIndicator()),
bottomNavigationBar: state.showBottomNavBar
? BottomNavigationBar(
type: BottomNavigationBarType.fixed,
currentIndex: state.selectedIndex,
selectedItemColor: Color(0xFF7691fa),
unselectedItemColor: Color(0xFF969799),
onTap: (index) {
// 更新选中索引
ctx.read<WebCubit>().updateSelectedIndex(index);
// 根据 index 执行相应的操作
},
items: const [
BottomNavigationBarItem(
icon: Icon(Icons.home, size: 32),
label: '我的班级',
),
BottomNavigationBarItem(
icon: Icon(Icons.contact_page, size: 32),
label: '通讯录',
),
BottomNavigationBarItem(
icon: Icon(Icons.find_in_page, size: 32),
label: '发现',
),
BottomNavigationBarItem(
icon: Icon(Icons.person, size: 32),
label: '我的',
),
],
)
: null,
), ),
); );
}, },
...@@ -228,19 +222,3 @@ class WebPage extends StatelessWidget { ...@@ -228,19 +222,3 @@ class WebPage extends StatelessWidget {
); );
} }
} }
class LoginMainState {
final bool loaded;
final bool orientationCmdFlag;
final bool windowInfoCmdFlag;
final bool chooseImageCmdFlag;
final bool chooseVideoCmdFlag;
LoginMainState({
required this.loaded,
required this.orientationCmdFlag,
required this.windowInfoCmdFlag,
required this.chooseImageCmdFlag,
required this.chooseVideoCmdFlag,
});
}
import 'dart:convert'; import 'dart:convert';
import 'package:ffmpeg_kit_flutter_new_audio/ffmpeg_kit.dart'; import 'package:ffmpeg_kit_flutter_new/ffmpeg_kit.dart';
import 'package:ffmpeg_kit_flutter_new_audio/ffprobe_kit.dart'; import 'package:ffmpeg_kit_flutter_new/ffprobe_kit.dart';
import 'package:ffmpeg_kit_flutter_new_audio/return_code.dart'; import 'package:ffmpeg_kit_flutter_new/return_code.dart';
class AudioUtil { class AudioUtil {
/// 转码 /// 转码
......
import 'package:ffmpeg_kit_flutter_new/ffmpeg_kit.dart';
import 'package:ffmpeg_kit_flutter_new/return_code.dart';
class VideoUtil {
///
/// 将视频格式转换为mp4
/// 转码的同时,进行压缩
///
static Future<bool> convertToMp4(String inputPath, String outputPath) async {
// final session = await FFmpegKit.execute(
// '-i "$inputPath" -c:v libx264 -c:a aac -strict experimental -movflags faststart -f mp4 "$outputPath"');
final session = await FFmpegKit.execute(
'-i "$inputPath" -c:v libx264 -crf 28 -c:a aac -b:a 128k -strict experimental -movflags faststart -f mp4 "$outputPath"');
final returnCode = await session.getReturnCode();
return ReturnCode.isSuccess(returnCode);
}
///
/// 通过 ffmpeg 压缩视频
///
static Future<bool> compressVideo(String inputPath, String outputPath, String quality) async {
// 使用CRF模式进行压缩,值范围0-51,建议值18-28
// 高质量: CRF 18-20
// 中等质量: CRF 23-26
// 低质量: CRF 28-32
int crf;
switch (quality) {
case 'low':
crf = 32;
break;
case 'middle':
crf = 26;
break;
case 'high':
crf = 20;
break;
default:
throw Exception('参数错误');
}
final session = await FFmpegKit.execute(
'-i "$inputPath" -c:v libx264 -crf $crf -c:a aac -b:a 128k -preset medium -movflags faststart "$outputPath"');
final returnCode = await session.getReturnCode();
return ReturnCode.isSuccess(returnCode);
}
}
import 'dart:io';
import 'package:archive/archive.dart';
import 'package:flutter/services.dart';
class ZipUtil {
static Future<bool> extractZipFile(String zipFilePath, String extractPath) async {
try {
// 读取zip文件
Uint8List bytes;
if (zipFilePath.startsWith('assets/')) {
// 读取 assets 中的文件
final ByteData data = await rootBundle.load(zipFilePath);
bytes = data.buffer.asUint8List();
} else {
// 读取本地文件
final zipFile = File(zipFilePath);
bytes = await zipFile.readAsBytes();
}
// 解压ZIP文件
final archive = ZipDecoder().decodeBytes(bytes);
// 创建解压目录
final directory = Directory(extractPath);
if (!(await directory.exists())) {
await directory.create(recursive: true);
}
// 遍历并提取文件
for (final file in archive) {
final filename = file.name;
if (file.isFile) {
final data = file.content as List<int>;
final outputFile = File('$extractPath/$filename');
// 创建父目录
await outputFile.create(recursive: true);
// 写入文件内容
await outputFile.writeAsBytes(data);
} else {
// 创建目录
final dir = Directory('$extractPath/$filename');
await dir.create(recursive: true);
}
}
print('文件解压成功: $extractPath');
return true;
} catch (e) {
print('文件解压失败: $e');
return false;
}
}
}
...@@ -43,9 +43,12 @@ dependencies: ...@@ -43,9 +43,12 @@ dependencies:
connectivity_plus: ^7.0.0 connectivity_plus: ^7.0.0
device_info_plus: ^11.5.0 device_info_plus: ^11.5.0
dio: ^5.9.0 dio: ^5.9.0
# dio_http2_adapter: ^2.6.0
equatable: ^2.0.7 equatable: ^2.0.7
exif: ^3.3.0 exif: ^3.3.0
ffmpeg_kit_flutter_new_audio: ^1.1.0 # ffmpeg_kit_flutter_new_audio: ^1.1.0
# ffmpeg_kit_flutter_new_video: ^1.1.0
ffmpeg_kit_flutter_new: ^3.2.0
file_picker: ^10.3.2 file_picker: ^10.3.2
flutter_bloc: ^9.1.1 flutter_bloc: ^9.1.1
flutter_localization: ^0.3.3 flutter_localization: ^0.3.3
...@@ -63,14 +66,14 @@ dependencies: ...@@ -63,14 +66,14 @@ dependencies:
logger: ^2.6.2 logger: ^2.6.2
mime: ^2.0.0 mime: ^2.0.0
mobile_scanner: ^7.0.1 mobile_scanner: ^7.0.1
mqtt_client: ^10.11.1 # mqtt_client: ^10.11.1
network_info_plus: ^7.0.0 network_info_plus: ^7.0.0
open_file: ^3.5.10 open_file: ^3.5.10
path: ^1.9.1 path: ^1.9.1
path_provider: ^2.1.5 path_provider: ^2.1.5
permission_handler: ^12.0.1 permission_handler: ^12.0.1
shared_preferences: ^2.5.3 shared_preferences: ^2.5.3
sqflite: ^2.4.2 # sqflite: ^2.4.2
# video_thumbnail: ^0.5.6 # video_thumbnail: ^0.5.6
url_launcher: ^6.3.2 url_launcher: ^6.3.2
uuid: ^4.5.1 uuid: ^4.5.1
...@@ -80,6 +83,11 @@ dependencies: ...@@ -80,6 +83,11 @@ dependencies:
webview_flutter: ^4.13.0 webview_flutter: ^4.13.0
wechat_assets_picker: ^9.8.0 wechat_assets_picker: ^9.8.0
wechat_camera_picker: ^4.4.0 wechat_camera_picker: ^4.4.0
# squadron: ^7.2.0
tencent_cloud_chat_sdk: ^8.7.7201+2
tencent_cloud_chat_push: ^8.7.7201
# sig test
# crypto: ^3.0.7
# The following adds the Cupertino Icons font to your application. # The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.
...@@ -90,6 +98,8 @@ dev_dependencies: ...@@ -90,6 +98,8 @@ dev_dependencies:
sdk: flutter sdk: flutter
build_runner: ^2.7.0 build_runner: ^2.7.0
json_serializable: ^6.11.0 json_serializable: ^6.11.0
flutter_launcher_icons: ^0.14.4
# squadron_builder: ^8.0.0+1
# The "flutter_lints" package below contains a set of recommended lints to # The "flutter_lints" package below contains a set of recommended lints to
# encourage good coding practices. The lint set provided by the package is # encourage good coding practices. The lint set provided by the package is
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!