Skip to content

dev: fix pushs #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OctagonalStar merged 3 commits into from
Mar 14, 2026
Merged

dev: fix pushs #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc06ea2
fix: hotfix model not load
OctagonalStar Mar 14, 2026
c2e38bf
Merge branch 'main' into dev
OctagonalStar Mar 14, 2026
e93183c
fix: fix pkserver error on client
OctagonalStar Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions lib/funcs/local_pk_server.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ class PKServer with ChangeNotifier{
bool get connected => _connection?.connectionState == RTCPeerConnectionState.RTCPeerConnectionStateConnected;
String? connectpwd;

@override
void dispose() {
disconnect();
super.dispose();
}

Future<void> initHost(bool isHoster, BuildContext context, {String? offer}) async {
isServer = isHoster;

Expand Down Expand Up @@ -108,7 +114,7 @@ class PKServer with ChangeNotifier{
};

// 增加超时保护（某些网络下可能收不到完成信号）
return completer.future.timeout(const Duration(minutes: 1), onTimeout: () async {
return completer.future.timeout(const Duration(seconds: 15), onTimeout: () async {
logger.info("ICE 收集超时，尝试使用当前收集到的 Candidate");
String sdp = (await _connection!.getLocalDescription())!.sdp!;
sdp = optimizeSdp(sdp);
Expand Down Expand Up @@ -239,7 +245,7 @@ class PKServer with ChangeNotifier{
if(message == "ping") {
logger.finer("[$packageid] 回复心跳包");
_channel!.send(RTCDataChannelMessage("pong"));
Future.delayed(Duration(seconds: 1), (){
Future.delayed(Duration(seconds: 5), (){
if(_channel?.state == RTCDataChannelState.RTCDataChannelOpen) {
logger.finer("发送心跳包");
_channel!.send(RTCDataChannelMessage("ping"));
Expand Down Expand Up @@ -378,9 +384,6 @@ class PKServer with ChangeNotifier{
pkState.sideTookenTime = data["tookenTime"];
over = true;
}
if(pkState.selfTookenTime != null && pkState.sideTookenTime != null) {
disconnect();
}
notifyListeners();
}
}
Expand Down
6 changes: 3 additions & 3 deletions lib/vars/global.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ class Global with ChangeNotifier {
Future<void> refreshApp() async {
logger.info("应用设置中");
AppData appData = AppData();
if(AppData().config.audio.audioSource == 2) await appData.loadTTS(AppData().config.audio.playRate);
if(AppData().config.egg.stella) await appData.loadEggs();
if(appData.config.audio.audioSource == 2) await appData.loadTTS(appData.config.audio.playRate);
if(appData.config.egg.stella) await appData.loadEggs();
changeLoggerBehavior();
updateTheme();
notifyListeners();
Expand Down Expand Up @@ -195,7 +195,7 @@ class AppData {

// load TTS model if any
Future<void> loadTTS(double playRate) async {
if(kIsWeb || vitsTTS != null || modelTTSDownloaded) return;
if(kIsWeb || vitsTTS != null || !modelTTSDownloaded) return;
logger.info("TTS: 加载本地TTS中");
sherpa_onnx.initBindings();
final vits = sherpa_onnx.OfflineTtsVitsModelConfig(
Expand Down
Loading