Skip to content

Commit ec590ed

Browse files
author
liuchuancong
committed
fix(*)
1 parent 350394d commit ec590ed

6 files changed

Lines changed: 23 additions & 6 deletions

File tree

assets/version.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "2.0.15",
2+
"version": "2.0.16",
33
"version_num": 10215,
4-
"version_desc": "-Fixed: 修复部分UI显示问题.\n-Added: 新增播放器代理.",
4+
"version_desc": "-Fixed: 优化播放器.",
55
"prerelease":false,
66
"download_url": "https://github.com/liuchuancong/pure_live/releases"
77
}

lib/common/utils/version_util.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:get/get.dart';
33
import 'package:http/http.dart' as http;
44

55
class VersionUtil {
6-
static const String version = '2.0.15';
6+
static const String version = '2.0.16';
77
static const String projectUrl = 'https://github.com/liuchuancong/pure_live';
88
static const String releaseUrl = 'https://api.github.com/repos/liuchuancong/pure_live/releases?per_page=30';
99
static const String issuesUrl = 'https://github.com/liuchuancong/pure_live/issues';

lib/player/adapters/fijk_adapter.dart

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,24 @@ class FijkAdapter implements UnifiedPlayer {
108108
});
109109
}
110110

111+
Future<void> _setupProxy() async {
112+
final SettingsService settings = Get.find<SettingsService>();
113+
if (settings.enableProxy.value) {
114+
final String proxyUrl = "http://${settings.proxyHost.value}:${settings.proxyPort.value}";
115+
await _player.setOption(FijkOption.formatCategory, "http_proxy", proxyUrl);
116+
} else {
117+
await _player.setOption(FijkOption.formatCategory, "http_proxy", "");
118+
}
119+
}
120+
111121
@override
112122
Future<void> setDataSource(String url, List<String> playUrls, Map<String, String> headers, {LiveRoom? room}) async {
113123
try {
114124
_loadingSubject.add(true);
115125
if (_player.state != FijkState.idle) {
116126
await _player.reset();
117127
}
128+
_setupProxy();
118129
final SettingsService settings = Get.find<SettingsService>();
119130
await FijkHelper.setFijkOption(_player, enableCodec: settings.enableCodec.value, headers: headers);
120131
await _player.setDataSource(url, autoPlay: true);

lib/player/adapters/media_kit_adapter.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class MediaKitAdapter implements UnifiedPlayer {
5454
_stateSubject.add(PlayerState.initializing);
5555

5656
_player = Player();
57-
57+
String proxyUrl = "";
5858
if (_player.platform is NativePlayer) {
5959
final native = _player.platform as dynamic;
6060

@@ -71,6 +71,12 @@ class MediaKitAdapter implements UnifiedPlayer {
7171
if (settings.customPlayerOutput.value) {
7272
await native.setProperty('ao', settings.audioOutputDriver.value);
7373
}
74+
if (settings.enableProxy.value && settings.proxyHost.value.isNotEmpty) {
75+
proxyUrl = "http://${settings.proxyHost.value}:${settings.proxyPort.value}";
76+
await native.setProperty('http-proxy', proxyUrl);
77+
final currentProxy = await native.getProperty('http-proxy');
78+
debugPrint('当前引擎使用的代理地址: $currentProxy');
79+
}
7480
}
7581

7682
// =====================

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: pure_live
22
description: 纯粹直播,一款开源的第三方多平台直播聚合播放器.
33
publish_to: none
4-
version: 2.0.15+26
4+
version: 2.0.16+27
55

66
environment:
77
sdk: ^3.10.4

windows/packaging/msix/make_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
display_name: 纯粹直播
2-
msix_version: 1.2.0.15
2+
msix_version: 1.2.0.16
33
publisher: "O=puretech.com, S=Some-State, C=CN"
44
identity_name: com.mystyle.purelive
55
logo_path: assets/icons/icon.png

0 commit comments

Comments
 (0)