From 5799817e231dc7e9dd41ff9d8d1e6ce5499fe864 Mon Sep 17 00:00:00 2001 From: wh201906 Date: Wed, 22 Nov 2023 21:35:51 +0800 Subject: [PATCH] V0.3.3 --- CHANGELOG.md | 11 +- doc/CHANGELOG/CHANGELOG_zh_CN.md | 11 +- .../metadata/android/en-US/changelogs/33.txt | 8 + .../metadata/android/zh-CN/changelogs/33.txt | 8 + ...io.github.wh201906.serialtest.metainfo.xml | 13 + src/SerialTest.pro | 2 +- src/android/AndroidManifest.xml | 2 +- src/i18n/SerialTest_zh_CN.qm | Bin 19613 -> 20239 bytes src/i18n/SerialTest_zh_CN.ts | 407 ++++++++++-------- 9 files changed, 274 insertions(+), 188 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/33.txt create mode 100644 fastlane/metadata/android/zh-CN/changelogs/33.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bc992a..be1441e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ [中文](doc/CHANGELOG/CHANGELOG_zh_CN.md) +## V0.3.3 ++ Add support for specifying service UUID in Bluetooth client mode (commit 1bd23bf4e0) ++ Add support for showing IPv6 addresses on Android (commit 03a0e7938c) ++ Add option for remembering the data to be sent in DataTab (commit 00eb0e2e36) ++ Add option for clearing both received data and graph at the same time (commit a4779028d2) ++ Improve the permission request process on Android ++ Add point-only mode for plotting (commit daf34607c9) ++ Fix the missing separator when appending hex data with timestamp (commit 00eb0e2e36) + ## V0.3.2 + Fix 2 bugs in the Control Panel + Fix a bug in the timestamp (commit c73e12c30ad) @@ -76,4 +85,4 @@ + Fix some bugs ## V0.1 -The first released version \ No newline at end of file +The first released version diff --git a/doc/CHANGELOG/CHANGELOG_zh_CN.md b/doc/CHANGELOG/CHANGELOG_zh_CN.md index c07b584..c4346f6 100644 --- a/doc/CHANGELOG/CHANGELOG_zh_CN.md +++ b/doc/CHANGELOG/CHANGELOG_zh_CN.md @@ -2,6 +2,15 @@ [English](../../CHANGELOG.md) +## V0.3.3 ++ 支持在蓝牙客户端模式中指定目标服务UUID (commit 1bd23bf4e0) ++ 支持在Android端显示IPv6地址 (commit 03a0e7938c) ++ 支持记住数据界面中的待发送数据 (commit 00eb0e2e36) ++ 支持同时清除接收到的数据和图表 (commit a4779028d2) ++ 改进Android上的权限请求过程 ++ 添加单独绘制点的功能 (commit daf34607c9) ++ 修复接收带时间戳的十六进制数据时缺少分隔符的问题 (commit 00eb0e2e36) + ## V0.3.2 + 修复控制面板中的2处BUG + 修复时间戳中的一处错误 @@ -76,4 +85,4 @@ + 修复一些BUG ## V0.1 -第一个公开版本 \ No newline at end of file +第一个公开版本 diff --git a/fastlane/metadata/android/en-US/changelogs/33.txt b/fastlane/metadata/android/en-US/changelogs/33.txt new file mode 100644 index 0000000..7bfc0b9 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/33.txt @@ -0,0 +1,8 @@ +V0.3.3 ++ Add support for specifying service UUID in Bluetooth client mode (commit 1bd23bf4e0) ++ Add support for showing IPv6 addresses on Android (commit 03a0e7938c) ++ Add option for remembering the data to be sent in DataTab (commit 00eb0e2e36) ++ Add option for clearing both received data and graph at the same time (commit a4779028d2) ++ Improve the permission request process on Android ++ Add point-only mode for plotting (commit daf34607c9) ++ Fix the missing separator when appending hex data with timestamp (commit 00eb0e2e36) diff --git a/fastlane/metadata/android/zh-CN/changelogs/33.txt b/fastlane/metadata/android/zh-CN/changelogs/33.txt new file mode 100644 index 0000000..cd1144b --- /dev/null +++ b/fastlane/metadata/android/zh-CN/changelogs/33.txt @@ -0,0 +1,8 @@ +V0.3.3 ++ 支持在蓝牙客户端模式中指定目标服务UUID (commit 1bd23bf4e0) ++ 支持在Android端显示IPv6地址 (commit 03a0e7938c) ++ 支持记住数据界面中的待发送数据 (commit 00eb0e2e36) ++ 支持同时清除接收到的数据和图表 (commit a4779028d2) ++ 改进Android上的权限请求过程 ++ 添加单独绘制点的功能 (commit daf34607c9) ++ 修复接收带时间戳的十六进制数据时缺少分隔符的问题 (commit 00eb0e2e36) diff --git a/pack/aur/io.github.wh201906.serialtest.metainfo.xml b/pack/aur/io.github.wh201906.serialtest.metainfo.xml index 2d8b677..a2d06a6 100644 --- a/pack/aur/io.github.wh201906.serialtest.metainfo.xml +++ b/pack/aur/io.github.wh201906.serialtest.metainfo.xml @@ -55,6 +55,19 @@ + + +
    +
  • Add support for specifying service UUID in Bluetooth client mode (commit 1bd23bf4e0)
    • +
  • Add support for showing IPv6 addresses on Android (commit 03a0e7938c)
    • +
  • Add option for remembering the data to be sent in DataTab (commit 00eb0e2e36)
    • +
  • Add option for clearing both received data and graph at the same time (commit a4779028d2)
    • +
  • Improve the permission request process on Android
    • +
  • Add point-only mode for plotting (commit daf34607c9)
    • +
  • Fix the missing separator when appending hex data with timestamp (commit 00eb0e2e36)
    • +
+ +
    diff --git a/src/SerialTest.pro b/src/SerialTest.pro index b1755e4..07e80c0 100644 --- a/src/SerialTest.pro +++ b/src/SerialTest.pro @@ -94,7 +94,7 @@ qnx { } # Remember to change version in AndroidManifest.xml -VERSION = 0.3.2 +VERSION = 0.3.3 QMAKE_TARGET_PRODUCT = "SerialTest" QMAKE_TARGET_DESCRIPTION = "SerialTest" QMAKE_TARGET_COMPANY = "wh201906" diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml index 0cc0fac..b455d51 100644 --- a/src/android/AndroidManifest.xml +++ b/src/android/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/src/i18n/SerialTest_zh_CN.qm b/src/i18n/SerialTest_zh_CN.qm index 6775623e51810939eca9bd7b7b3cdb018d5281f5..5610f3b2ca465a2a1a5260b69f8570c820f7e878 100644 GIT binary patch delta 2801 zcmY*a2~<;O8vS^Ae-d6c1Vx}2BPcr(7Ey2k6&I)i3b-IeS)LM%fgyncT5|?*>Vl#T zR-tOKmJx-ij#2AU#jPF1j!KW(svVcQjCxve94(Gkotu+6)=5sz&A+|xe&4;{|28$c z)NgiKqm6q+#L|fRs(~AbB0PZmiS$E=WMhdmYn>Q))rmYZM`RPzV>;?0v56qg zf8|8ad&H(;evsXXQ9Z=w9zn9#h?xtC25X5`GyumDtE?jOjwiO#0?cvZs8V7ZlR#7L zMAcp=zH{A)0p-NDFbbuBMq=A95a}KhYny|76vTFcNOT9#jB!1&qaxP7wQY0Ja>H-i z{^p{!`s*kqv<6w8cj8bbrNpiy>J>&Q#!RBf{xqpEpUC~36GOK)%C_EC0g16e8HF#fba z^!=3c^-&O+M!9P+99mwN)&#E+xHCaOswWko$-bnuW%PWIE#H>au*9BSj;Bw zYQz;HpCjDOBOo$T#@+c(H<5o2_i&yT#2#?Ztdp?6M#3$OA@Yrtq^Phz?wlmwVs$W% zmKbyJAopLL7}_PNiZ$T@<0OAP{FEr6Q}Xqx=g6c-()ltGhQ1&>1ym%m&j8t%;>eu4zO zBKVV4gJ6|5TOc1`jc;eX!_e|GP8@!a$#cSp`UEkrc%y^?)y=QP1yRq|-#iZ@$8Fu<8C}BK{*Lo3--+rk zSUU&(qSv!8P5={A+5W2I7~f)tUW1?4b@q+JsG30beR3|+&tlK!Z-kNRq^=&2OXwp_ zo^l1_N79rwJ@{2itJOOo+bHS6q&lphkuFy>;W@mteta%vP;i5E?{~#$jo+l-UfPO| zSIe0377P_7GrSl~G$L5`hin)|9q7d95i;|YhcN0r*^L4oc|4Lmzl{B!)8*3Q-Dq&T z?K<;}k3A!AX}}E{I#RyvWGYec1o_Uhcud?V`GGpf6l9klI0_qhFLq);s{C->DU7$- zBBa_7ujQ^{i4pS6buGH%4H^FG#IT=Tjq++lnc@1$Nz4yhYO_kUoNu1(Q>oTEN+VDb ziV%_|a2+F{VXNSIcRSJOQen_X;3~}*g1d(SJA~k8Gm+aKA-pyV+T0YvcRztwR|-)* z!6@D_Cq^t2qWght{3T(CJH&`g5{4@tfP989@liZ#7OPix2uK|J6KUOx*(l>@Q7MVSBjYV=%%VA8`hWBi2G#e?x$*(o%9 z{}}5eY)yx`hMI)drrUU#{3Pt^CqV34VP6Htff2&7%-*=2t_UYKJwrZG3Sm2V$DCG- zIJ5&M&QRp-Lw>{VC<@nk;ChR=p;)B4jtwsr*5J)V?`&5rY1<1k#wzNjt0Cq}#VW~D zqS$oBhT{n277iQ>%u#H1yM{o$6|Ij~ARn{h)Z~-s)fz?TwpVcBWW{ZV%k(Oxss@Eh z{6(p%UyA*IQNCN?Aef^})&GD$@iUa>%?-Hr`zp;xfId%bC2~*e=+nwir63$vs@&ex zh2DRuJmiA6M8tc_&QcU6=!WwC5ERU}OL^Z|3*Onv`zE071Le~fQAFHe)tDt0aIRA| z<>sMi`mbOYy{bB+83ssGElKseL3ml2s`G3#*?yC|#t#cr zbEgZzomWfs$lcRVt$OZ8Og zE;bM)y|Dl2ddS0?G_z*j#(5zHvRO^@R8zN57QV@p^jcZ1$gR(jrdi8_Qlm0%y}d?3 zq^C-X#8;1Bu%5$pgtYO?NS>?95X&kI1)?r1D>+GLFzZYu7M;0NEHKP9h=pM~OOfc< zV#qV5my}ujbmq6V2k9##BlVHNy7vu6qb^_6m7B#vTl0Y4_VxWlxmNi$i#IWq{|jha zFwo2X+n}u;eWZ&!D75szn;ra^5=)VNbzEQ0dvV9_vy%)aQ3leobYqFd);w5iJ2+hF z&b@VzrI#2?7TdMq#=g>`p|drwecqgwW>~6>V!STFwc^wGnjNqz|6dSU7o2> zH?J(Ow8$~(;O3Y#8y1usEqNxfq}*(*a?n;}h!%^%G|!xAOG}X1!V=x>io}nkDZVRr zrKSB&VPW#@r5RmoTqzOD delta 2241 zcmXX{2~bp57QOxZzfbq?4MA3=5tMyjg=VvmQEWvVH7bNcBVgEc5@C#>lO7FDTo^zb zR7hA{2y2ODt4IvEkqn~7XrTz1Bv^w+tr~R%1;m$k5%Jc< zx9%aDeHD0!$k&hf)4wB9Oeg+34Y>_awhS=vxNK`AK=9Glfd?zs+ z74If?hyjlgYa1e(VMVNC4Uy*zV#kq4Xg;tA&qs-!&mnTXYwnimIfK$XEYq9ZBgp8t z9c-VIFru4`ku^k9{K;6joG4gJi)z;r*<6>TR!R|8Vf`r(YJ@n^k~)+#GmVzM zo*;_Jp=D`X!P6XCvHMGu|AF z#?Rpft~kMequi}*2osjfeIGPRonPf)R%d;Gp0iM-`rnik={?Q(8Q zIMK9ia-#H~r~Uk2)}fQ`ov^msDgN*otOt$r&7Eiw)mHwCNIZMZ=3C|!7o%6o_|`L^KJw3er$3N?U&1LJ zd{;f5r>5|h2V-C+gYW+5Eu!dnzIOr@JCySMB_8lVojH~FG)3KD{G^i=S0s%7i77Jt zalD8*8bE;iZRQqQOB6B2ywBx>F5=bY5(D zK_<#BWiJaphm#HoN?YhA+6fDOKME%?!PpUuyefrKZ9DYK61F6jWBrP-OH~J&QiaNS zIPcvioVuA$3&~@OaP{^P1W2=Dh5tanAFT3T1riw+TYZ=g=V-ko4Aof`jXp+z*H&X$ zJo1mR`fUXJ?G7u1{1fQt0kcl9H$-ewG*{cAGnOh^`WGWkhNA0RTr)dM(Nhk2yap6K z=ivv(%MyBIDSFEX@chiYTF{3&3@LN|Pzc%9DRb{Rf&TwU=r2r}=M!-Z?g0q$H5xlP_}TFng(0w7=g*ln`ltE7%(iBVs_=JCNd6 zG2p}myn0&~hd+={B~8gL%?T(wp66E?J}Og;@54il z!HWoF9RQpQ%uqF0|A;_7s@7+db+1(or1Yal52yxP-oSGys_{ur1-Yv=+rdw~MXjma zfy!oFR4>e$%H%3Le;^DP7hCHB&Xamf+2r z&}(*8>TMzyX}QbUm{fyWAsE%ztv9DC?M>lpw58E_hj16P)z>#-@-5NszX>(eP1<_* zBqC+Iw*IOS|NpFQosZzLzi3aq&4=Gxv^Vdgft*(BG>&={`B-P2;*5dOs0;G*1rF=N zX24r6;ktJ|`W6GDTUQo53q>r@?GV9%+(lQrH=Tkh=8mp86M>?E!Sf$hDzA3N{C zs!qCx>mMP&G~JW&3QQiKJfg%4mZ{=dTT7WfM`3aGI$~>iU=TR7b)1`{ur9vD@Ien| m1Ej~-YFXBM#l<-r&2!@lEyHnLa&tnWjYXfhPdK7mAp95Mfku!3 diff --git a/src/i18n/SerialTest_zh_CN.ts b/src/i18n/SerialTest_zh_CN.ts index c4e907b..1f62a56 100644 --- a/src/i18n/SerialTest_zh_CN.ts +++ b/src/i18n/SerialTest_zh_CN.ts @@ -4,82 +4,82 @@ Connection - + Failed to listen on adapter 无法在该适配器上监听连接 - + Failed to register service on adapter 无法在该适配器上注册服务 - + Failed to listen to 无法监听连接 - + (Multicast)Failed to listen to port (组播)无法监听端口 - + (Multicast)Failed to join (组播)无法加入组播 - + Bluetooth SPP Service - + Controller Error: 控制器错误： - + Service Error: 服务错误： - + SerialPort 串口 - + Bluetooth Client 蓝牙客户端 - + Bluetooth Server 蓝牙服务器 - + BLE Central BLE 中心设备(Central) - + BLE Peripheral BLE 外围设备(Peripheral) - + TCP Client TCP客户端 - + TCP Server TCP服务器 - + UDP @@ -317,16 +317,16 @@ - - + + Export 导出 - - + + Copy All 复制全部 @@ -354,7 +354,7 @@ - + Suffix 后缀 @@ -406,8 +406,8 @@ - - + + Info 信息 @@ -417,36 +417,36 @@ 不是有效编码名。 - + Export received data 导出已接收数据 - - + + Successed! 成功！ - - + + Failed! 失败！ - + Export sended data 导出已发送数据 - - + + Export Selected 导出选中 - - + + Copy Selected 复制选中 @@ -455,8 +455,8 @@ DeviceTab - - + + Refresh 刷新 @@ -505,8 +505,8 @@ - - + + Connect 连接 @@ -543,7 +543,7 @@ - + Local Adapter: 本机适配器： @@ -562,13 +562,13 @@ - + Receive 接收 - + Send 发送 @@ -641,90 +641,100 @@ - + Target Address: 目标地址： - + + Service UUID + 服务UUID + + + + If Service UUID is not specified, the SerialPort service UUID(0x1101) will be used. + 如果未指定服务UUID，程序将使用串口服务UUID(0x1101)。 + + + Rx Service UUID 接收服务(Service)UUID - + Rx Characteristic UUID 接收特征值(Characteristic)UUID - + Tx Service UUID 发送服务(Service)UUID - + Tx Characteristic UUID 发送特征值(Characteristic)UUID - + Local Address: 本机地址： - + Local Port: 本机端口号： - - + + Remote Address: 远端地址： - + Remote Port: 远端端口号： - + Set local port to 0 to use a random and available port. 当本机端口号为0时，系统会随机选取一个可用端口。 - + In UDP mode, you can change the remote address and port on the fly. 在UDP模式下，你可以随时直接修改远端地址和端口号。 - + Service Name: 服务名称： - + SerialTest_BT - + Open 打开 - + Close 关闭 - - + + Searching... 搜索中... - + Bonded 已配对 @@ -751,42 +761,42 @@ you can change the remote address and port on the fly. 设备 - + NoFlowControl 无流控 - + HardwareControl 软件流控 - + SoftwareControl 硬件流控 - + NoParity 无校验 - + EvenParity 偶校验 - + OddParity 奇校验 - + SpaceParity 固定0 - + MarkParity 固定1 @@ -811,27 +821,27 @@ you can change the remote address and port on the fly. TCP服务器 - - - + + + Disconnect 断开 - - - - - - - - - + + + + + + + + + Error 错误 - + The port has been opened. 串口已打开。 @@ -840,114 +850,114 @@ you can change the remote address and port on the fly. 设备已连接。 - - + + The server is already running. 服务器正在运行中。 - - + + The device has already connected. 设备已连接。 - + Yes 是 - + No 否 - + The client has already connected to the server. 已连接到服务器。 - + The socket has already bound to a port. 已绑定至端口。 - + Delete 删除 - + Discovered 已发现 - + Please close the current connection first. 请先关闭当前连接。 - + Unsupported interface. 尚未支持此连接类型。 - + Remote Address/Name: 远端地址/主机名： - + Service 服务(Service) - + Characteristic 特征值(Characteristic) - + Descriptor 描述符(Descriptor) - + Broadcast - + Read - + WriteNoResponse - + Write - + Notify - + Indicate - + WriteSigned - + ExtendedProperty @@ -1146,32 +1156,32 @@ Continue? 数据 - + Plot 绘图 - + Control 控制 - + On Top 窗口置顶 - + Dock all windows 吸附所有悬浮窗口 - + Ver: 版本： - + Check Update 检查更新 @@ -1180,13 +1190,13 @@ Continue? 请先打开串口。 - - + + Connected Clients 客户端数 - + Cannot open the serial port. 无法打开串口。 @@ -1195,32 +1205,32 @@ Continue? 串口已打开。 - + NoParity 无校验 - + EvenParity 偶校验 - + OddParity 奇校验 - + SpaceParity 固定0 - + MarkParity 固定1 - + OneStop 1 @@ -1230,64 +1240,64 @@ Continue? 连接 - + File 文件收发 - + Settings 设置 - + Press Back again to exit. 再按一次返回键退出。 - + Closing... 关闭中... - + Please connect to something first. 请先建立一次连接。 - + TwoStop 2 - + OneAndHalfStop 1.5 - + BaudRate 波特率 - + DataBits 数据位 - + StopBits 停止位 - + Parity 校验 - - - + + + Remote 远端 @@ -1300,23 +1310,23 @@ Continue? 设备名 - - - - - + + + + + Local 本机 - - - + + + State 状态 - + Port 端口 @@ -1329,50 +1339,50 @@ Continue? 请先打开蓝牙！ - + Rx - + Tx - - - + + + Error 错误 - + Remote Name 远端名称 - - + + Any 任意 - + Cannot establish the connection. 无法建立连接。 - + Cannot start the server. 无法启动服务。 - + Cannot bind to the specified address and port. 无法绑定至指定地址和端口。 - + No port is opened. 未打开串口。 @@ -1454,6 +1464,26 @@ Continue? Data Splitter: 数据项分隔符： + + + Style: + 样式： + + + + Line + 线 + + + + Point + 点 + + + + Both + 线+点 + @@ -1479,9 +1509,8 @@ Continue? 无 - Scatter - 显示点 + 显示点 New graph name @@ -1601,7 +1630,12 @@ If no config file is detected, This app will create one in the current working d 主题： - + + Remember data to be sent in DataTab + 记住数据界面中等待发送的数据 + + + Merge Timestamps With Short Intervals: 合并间隔过短的时间戳: @@ -1648,27 +1682,32 @@ If no config file is detected, This app will create one in the current working d 合并间隔过短的时间戳 - + ms 毫秒 - + + Clear received data in DataTab and graph in PlotTab simultaneously + 同时清空绘图和数据界面中的已接收数据 + + + Restart the app to make settings with "*" take effect. 带*的设置项将在程序重启后生效。 - + Version: 版本： - + Latest Release: 检查更新： - + Report Bugs: 反馈问题： @@ -1719,8 +1758,8 @@ If no config file is detected, This app will create one in the current working d - - + + Warning 警告 @@ -1734,90 +1773,90 @@ Continue? 继续吗？ - - - + + + Create 创建 - + The file already exists at 文件已存在，位于 - + Cannot create file there. 无法在此处创建文件。 - + Read 读取 - + Cannot read config. 无法读取配置。 - + Created at 已创建于 - + All history will be deleted! Continue? 所有的历史记录都会被删除！ 继续吗？ - + This app will be closed after import! Continue? 导入成功后程序会自动关闭！ 继续吗？ - + Import config from file 从文件导入配置 - - + + Config files 配置文件 - - + + All files 所有文件 - + Error 错误 - + Unsupported file format. 文件格式不支持。 - + Info 信息 - + Imported. 已导入。 - + Export config to file 导出配置到文件