Skip to content

Commit

Permalink
V1.1.5 Beta
Browse files Browse the repository at this point in the history
  • Loading branch information
wanghongenpin committed Oct 24, 2024
1 parent 865e1ca commit fd2bdd4
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 47 deletions.
6 changes: 3 additions & 3 deletions lib/ui/configuration.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class AppConfiguration {
Locale? _language;

//是否显示更新内容公告
bool upgradeNoticeV14 = true;
bool upgradeNoticeV15 = true;

/// 是否启用画中画
ValueNotifier<bool> pipEnabled = ValueNotifier(Platform.isAndroid);
Expand Down Expand Up @@ -177,7 +177,7 @@ class AppConfiguration {
_theme = ThemeModel(mode: mode, useMaterial3: config['useMaterial3'] ?? true);
_theme.color = config['themeColor'] ?? "Blue";

upgradeNoticeV14 = config['upgradeNoticeV14'] ?? true;
upgradeNoticeV15 = config['upgradeNoticeV15'] ?? true;
_language = config['language'] == null ? null : Locale.fromSubtags(languageCode: config['language']);
pipEnabled.value = config['pipEnabled'] ?? true;
pipIcon.value = config['pipIcon'] ?? false;
Expand Down Expand Up @@ -222,7 +222,7 @@ class AppConfiguration {
'mode': _theme.mode.name,
'themeColor': _theme.color,
'useMaterial3': _theme.useMaterial3,
'upgradeNoticeV14': upgradeNoticeV14,
'upgradeNoticeV15': upgradeNoticeV15,
"language": _language?.languageCode,
"headerExpanded": headerExpanded,

Expand Down
38 changes: 19 additions & 19 deletions lib/ui/desktop/desktop.dart
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class _DesktopHomePagePageState extends State<DesktopHomePage> implements EventL
proxyServer.addListener(this);
panel = NetworkTabController(tabStyle: const TextStyle(fontSize: 16), proxyServer: proxyServer);

if (widget.appConfiguration.upgradeNoticeV14) {
if (widget.appConfiguration.upgradeNoticeV15) {
WidgetsBinding.instance.addPostFrameCallback((_) {
showUpgradeNotice();
});
Expand Down Expand Up @@ -142,37 +142,37 @@ class _DesktopHomePagePageState extends State<DesktopHomePage> implements EventL
actions: [
TextButton(
onPressed: () {
widget.appConfiguration.upgradeNoticeV14 = false;
widget.appConfiguration.upgradeNoticeV15 = false;
widget.appConfiguration.flushConfig();
Navigator.pop(context);
},
child: Text(localizations.cancel))
],
title: Text(isCN ? '更新内容V1.1.4' : "Update content V1.1.4", style: const TextStyle(fontSize: 18)),
title: Text(isCN ? '更新内容V1.1.5' : "Update content V1.1.5", style: const TextStyle(fontSize: 18)),
content: Container(
constraints: const BoxConstraints(maxWidth: 600),
child: SelectableText(
isCN
? '提示:默认不会开启HTTPS抓包,请安装证书后再开启HTTPS抓包。\n'
'点击HTTPS抓包(加锁图标),选择安装根证书,按照提示操作即可。\n\n'
'1. 手机端增加底部导航,可在设置中切换\n'
'2. 增加远程设备管理,可快速连接设备\n'
'3. iOS支持抓取Flutter应用,需要通过设备管理连接到电脑开启IP层代理(Beta)\n'
'4. 工具箱支持Unicode编码\n'
'5. 工具箱支持二维码编解码\n'
'6. 工具箱支持查看安卓系统证书名称\n'
'7. 高级重放支持指定时间执行\n'
'8. 修复请求重写批量导入规则混乱问题\n'
'1. 请求重写升级UI优化, 请求修改增加匹配数据查看\n'
'2. 请求弹出菜单UI优化, 支持请求高亮\n'
'3. 脚本内置File Api, 支持文件读取、写入等操作, 详细查看wiki文档\n'
"4. 脚本内置MD5方法, md5('xxx')\n"
'5. 支持内存自动清理设置, 到内存限制自动清理请求\n'
'6. 工具箱增加正则表达式, 支持匹配数据替换\n'
'7. ios支持生成新根证书, 生成需要重新安装根证书\n'
'8. 修复暗黑模式icon展示不清晰\n'
: 'Tips:By default, HTTPS packet capture will not be enabled. Please install the certificate before enabling HTTPS packet capture。\n'
'Click HTTPS Capture packets(Lock icon),Choose to install the root certificate and follow the prompts to proceed。\n\n'
'1. Mobile: Add bottom navigation bar,which can be switched in settings\n'
'2. Support remote device management to quickly connect to devices\n'
'3. IOS supports capturing Flutter applications, You need to connect to the computer through device management to enable IP layer proxy (Beta)\n'
'4. Toolbox supports Unicode encode\n'
'5. Toolbox supports QR code encoding and decoding\n'
'6. Toolbox supports viewing Android system certificate names\n'
'7. Custom Repeat support for specified time execution\n'
'8. Fix request rewrite batch import rule confusion\n'
'1. Request to rewrite and upgrade UI optimization, request to modify and add matching data viewing\n'
'2. Request pop-up menu UI optimization, support request highlighting\n'
'3. The script has built-in File Api, which supports file reading, writing and other operations. For details, please refer to the wiki document\n'
"4. The script has built-in MD5 method, md5('xxx')\n"
'5. Support memory automatic cleanup settings, memory limit automatic cleanup requests\n'
'6. Toolbox adds regular expressions to support matching data replacement\n'
'7. iOS supports generating new root certificates, which requires reinstalling the root certificate\n'
'8. Fixed unclear display of dark mode icon\n'
'',
style: const TextStyle(fontSize: 14))));
});
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/desktop/request/request_editor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ class _HttpState extends State<_HttpWidget> {
message = widget.message;
body = TextEditingController(text: widget.message?.bodyAsString);
if (widget.message?.headers == null && !widget.readOnly) {
initHeader["User-Agent"] = ["ProxyPin/1.1.4"];
initHeader["User-Agent"] = ["ProxyPin/1.1.5"];
initHeader["Accept"] = ["*/*"];
return;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/mobile/menu/menu.dart
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class MoreMenu extends StatelessWidget {
child: ListTile(
dense: true,
leading: const Icon(Icons.highlight_outlined),
title: Text(localizations.highlight),
title: Text(localizations.keyword + localizations.highlight),
onTap: () {
navigator(context, const KeywordHighlight());
},
Expand Down
38 changes: 19 additions & 19 deletions lib/ui/mobile/mobile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class MobileHomeState extends State<MobileHomePage> implements EventListener, Li
proxyServer.addListener(this);
proxyServer.start();

if (widget.appConfiguration.upgradeNoticeV14) {
if (widget.appConfiguration.upgradeNoticeV15) {
WidgetsBinding.instance.addPostFrameCallback((_) {
showUpgradeNotice();
});
Expand Down Expand Up @@ -256,27 +256,27 @@ class MobileHomeState extends State<MobileHomePage> implements EventListener, Li

String content = isCN
? '提示:默认不会开启HTTPS抓包,请安装证书后再开启HTTPS抓包。\n\n'
'1. 手机端增加底部导航,可在设置中切换\n'
'2. 增加远程设备管理,可快速连接设备\n'
'3. iOS支持抓取Flutter应用,需要通过设备管理连接到电脑开启IP层代理(Beta)\n'
'4. 工具箱支持Unicode编码\n'
'5. 工具箱支持二维码编解码\n'
'6. 工具箱支持查看安卓系统证书名称\n'
'7. 高级重放支持指定时间执行\n'
'8. 修复请求重写批量导入规则混乱问题\n'
'1. 请求重写升级UI优化, 请求修改增加匹配数据查看\n'
'2. 请求弹出菜单UI优化, 支持请求高亮\n'
'3. 脚本内置File Api, 支持文件读取、写入等操作, 详细查看wiki文档\n'
"4. 脚本内置MD5方法, md5('xxx')\n"
'5. 支持内存自动清理设置, 到内存限制自动清理请求\n'
'6. 工具箱增加正则表达式, 支持匹配数据替换\n'
'7. ios支持生成新根证书, 生成需要重新安装根证书\n'
'8. 修复暗黑模式icon展示不清晰\n'
: 'Tips:By default, HTTPS packet capture will not be enabled. Please install the certificate before enabling HTTPS packet capture。\n\n'
'Click HTTPS Capture packets(Lock icon),Choose to install the root certificate and follow the prompts to proceed。\n\n'
'1. Mobile: Add bottom navigation bar,which can be switched in settings\n'
'2. Support remote device management to quickly connect to devices\n'
'3. IOS supports capturing Flutter applications, You need to connect to the computer through device management to enable IP layer proxy (Beta)\n'
'4. Toolbox supports Unicode encode\n'
'5. Toolbox supports QR code encoding and decoding\n'
'6. Toolbox supports viewing Android system certificate names\n'
'7. Custom Repeat support for specified time execution\n'
'8. Fix request rewrite batch import rule confusion\n'
'1. Request to rewrite and upgrade UI optimization, request to modify and add matching data viewing\n'
'2. Request pop-up menu UI optimization, support request highlighting\n'
'3. The script has built-in File Api, which supports file reading, writing and other operations. For details, please refer to the wiki document\n'
"4. The script has built-in MD5 method, md5('xxx')\n"
'5. Support memory automatic cleanup settings, memory limit automatic cleanup requests\n'
'6. Toolbox adds regular expressions to support matching data replacement\n'
'7. iOS supports generating new root certificates, which requires reinstalling the root certificate\n'
'8. Fixed unclear display of dark mode icon\n'
'';
showAlertDialog(isCN ? '更新内容V1.1.4' : "Update content V1.1.4", content, () {
widget.appConfiguration.upgradeNoticeV14 = false;
showAlertDialog(isCN ? '更新内容V1.1.5' : "Update content V1.1.5", content, () {
widget.appConfiguration.upgradeNoticeV15 = false;
widget.appConfiguration.flushConfig();
});
}
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/mobile/request/request_editor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ class _HttpState extends State<_HttpWidget> with AutomaticKeepAliveClientMixin {
message = widget.message;
body = widget.message?.bodyAsString;
if (widget.message?.headers == null && !widget.readOnly) {
initHeader["User-Agent"] = ["ProxyPin/1.1.4"];
initHeader["User-Agent"] = ["ProxyPin/1.1.5"];
initHeader["Accept"] = ["*/*"];
return;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/har.dart
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class Har {
title = title.contains("ProxyPin") ? title : "[ProxyPin]$title";
har["log"] = {
"version": "1.2",
"creator": {"name": "ProxyPin", "version": "1.1.4"},
"creator": {"name": "ProxyPin", "version": "1.1.5"},
"pages": [
{
"title": title,
Expand Down
2 changes: 1 addition & 1 deletion linux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cd ../build/linux/x64/release
rm -rf package
mkdir -p package/DEBIAN
echo "Package: ProxyPin" >> package/DEBIAN/control
echo "Version: 1.1.4" >> package/DEBIAN/control
echo "Version: 1.1.5" >> package/DEBIAN/control
echo "Priority: optional" >> package/DEBIAN/control
echo "Architecture: amd64" >> package/DEBIAN/control
echo "Depends: ca-certificates" >> package/DEBIAN/control
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: network_proxy
description: ProxyPin
publish_to: 'none' # Remove this line if you wish to publish to pub.dev

version: 1.1.5+14
version: 1.1.5+15

environment:
sdk: '>=3.0.2 <4.0.0'
Expand Down

0 comments on commit fd2bdd4

Please sign in to comment.