From edbc525a0e447e25829beafe909aee16b0d59941 Mon Sep 17 00:00:00 2001
From: wh201906 <wh201906@yandex.com>
Date: Sun, 18 Jun 2023 13:41:04 +0800
Subject: [PATCH] v0.1

---
 Qt/android/AndroidManifest.xml |   2 +-
 Qt/mEDIFIER.pro                |   5 +-
 Qt/mEDIFIER_zh_CN.ts           | 340 +++++++++++++++++++--------------
 README.md                      |  12 +-
 4 files changed, 207 insertions(+), 152 deletions(-)

diff --git a/Qt/android/AndroidManifest.xml b/Qt/android/AndroidManifest.xml
index 8bc67fd..5d2f564 100644
--- a/Qt/android/AndroidManifest.xml
+++ b/Qt/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="priv.wh201906.medifier.qt" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="v0.0.3" android:versionCode="3" android:installLocation="auto">
+<manifest package="priv.wh201906.medifier.qt" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="v0.1" android:versionCode="10" android:installLocation="auto">
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
          Remove the comment if you do not require these default permissions. -->
 
diff --git a/Qt/mEDIFIER.pro b/Qt/mEDIFIER.pro
index 3d7f3f5..1bd17b3 100644
--- a/Qt/mEDIFIER.pro
+++ b/Qt/mEDIFIER.pro
@@ -51,9 +51,12 @@ DISTFILES += \
     android/AndroidManifest.xml
 
 # Remember to change version in AndroidManifest.xml
-VERSION = 0.0.3
+VERSION = 0.1.0
 # Expose VERSION to the source files.
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+QMAKE_TARGET_PRODUCT = "mEDIFIER"
+QMAKE_TARGET_DESCRIPTION = "Alternative to Edifier Connect"
+QMAKE_TARGET_COMPANY = "wh201906"
 
 # For bluetoothapis.h on Windows, with MinGW
 win32: LIBS += -lBthprops
diff --git a/Qt/mEDIFIER_zh_CN.ts b/Qt/mEDIFIER_zh_CN.ts
index fd5514b..745ee0e 100644
--- a/Qt/mEDIFIER_zh_CN.ts
+++ b/Qt/mEDIFIER_zh_CN.ts
@@ -2,321 +2,369 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="zh_CN">
 <context>
-    <name>CommRFCOMM</name>
-    <message>
-        <location filename="commrfcomm.cpp" line="36"/>
-        <source>Device Connected</source>
-        <translation>设备已连接</translation>
-    </message>
-    <message>
-        <location filename="commrfcomm.cpp" line="41"/>
-        <source>Device Disconnected</source>
-        <translation>设备已断开</translation>
-    </message>
-</context>
-<context>
-    <name>DeviceForm</name>
-    <message>
-        <location filename="deviceform.ui" line="32"/>
-        <source>Search RFCOMM</source>
-        <translation>搜索RFCOMM设备</translation>
-    </message>
-    <message>
-        <location filename="deviceform.ui" line="39"/>
-        <source>Search BLE</source>
-        <translation>搜索BLE设备</translation>
-    </message>
-    <message>
-        <location filename="deviceform.ui" line="46"/>
-        <source>Stop</source>
-        <translation>停止</translation>
-    </message>
-    <message>
-        <location filename="deviceform.ui" line="65"/>
-        <source>Name</source>
-        <translation>设备名</translation>
-    </message>
-    <message>
-        <location filename="deviceform.ui" line="70"/>
-        <source>Address</source>
-        <translation>地址</translation>
-    </message>
-    <message>
-        <location filename="deviceform.ui" line="75"/>
-        <source>Type</source>
-        <translation>类型</translation>
-    </message>
-    <message>
-        <location filename="deviceform.ui" line="91"/>
-        <source>Connect</source>
-        <translation>连接</translation>
-    </message>
-    <message>
-        <location filename="deviceform.ui" line="98"/>
-        <source>Disconnect</source>
-        <translation>断开连接</translation>
-    </message>
-    <message>
-        <location filename="deviceform.cpp" line="18"/>
-        <location filename="deviceform.cpp" line="86"/>
-        <location filename="deviceform.cpp" line="203"/>
-        <source>RFCOMM</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="deviceform.cpp" line="19"/>
-        <location filename="deviceform.cpp" line="84"/>
-        <location filename="deviceform.cpp" line="201"/>
-        <source>BLE</source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="mainwindow.ui" line="14"/>
-        <source>mEDIFIER</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="68"/>
-        <source>Read Settings</source>
-        <translation>读取设置</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="23"/>
-        <source>Device</source>
-        <translation>设备</translation>
-    </message>
-</context>
-<context>
-    <name>W820NBPlusForm</name>
+    <name>BaseDevice</name>
     <message>
-        <location filename="w820nbplusform.ui" line="20"/>
-        <source>W820NB Plus</source>
-        <translation>W820NB双金标版</translation>
+        <location filename="devices/basedevice.ui" line="20"/>
+        <source>BaseDevice</source>
+        <translation>通用设备</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="26"/>
+        <location filename="devices/basedevice.ui" line="26"/>
         <source>Info</source>
         <translation>信息</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="34"/>
+        <location filename="devices/basedevice.ui" line="34"/>
         <source>Battery:</source>
         <translation>电量：</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="48"/>
-        <location filename="w820nbplusform.ui" line="73"/>
-        <location filename="w820nbplusform.ui" line="98"/>
+        <location filename="devices/basedevice.ui" line="48"/>
+        <location filename="devices/basedevice.ui" line="73"/>
+        <location filename="devices/basedevice.ui" line="98"/>
         <source>Get</source>
         <translation>获取</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="59"/>
+        <location filename="devices/basedevice.ui" line="59"/>
         <source>MAC Address:</source>
         <translation>MAC地址：</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="84"/>
+        <location filename="devices/basedevice.ui" line="84"/>
         <source>Firmware Version:</source>
         <translation>固件版本：</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="110"/>
+        <location filename="devices/basedevice.ui" line="110"/>
         <source>Name</source>
         <translation>设备名</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="127"/>
+        <location filename="devices/basedevice.ui" line="127"/>
         <source>Takes effect after removing the pairing record and re-pairing</source>
         <translation>删除配对记录并重新配对后生效</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="137"/>
-        <location filename="w820nbplusform.ui" line="217"/>
-        <location filename="w820nbplusform.ui" line="343"/>
-        <location filename="w820nbplusform.ui" line="398"/>
+        <location filename="devices/basedevice.ui" line="137"/>
+        <location filename="devices/basedevice.ui" line="217"/>
+        <location filename="devices/basedevice.ui" line="343"/>
+        <location filename="devices/basedevice.ui" line="398"/>
         <source>Set</source>
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="149"/>
-        <location filename="w820nbplusform.ui" line="162"/>
-        <location filename="w820nbplusform.ui" line="242"/>
+        <location filename="devices/basedevice.ui" line="149"/>
+        <location filename="devices/basedevice.ui" line="162"/>
+        <location filename="devices/basedevice.ui" line="242"/>
         <source>Noise Reduction</source>
         <translation>降噪</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="155"/>
-        <location filename="w820nbplusform.ui" line="235"/>
-        <location filename="w820nbplusform.ui" line="277"/>
+        <location filename="devices/basedevice.ui" line="155"/>
+        <location filename="devices/basedevice.ui" line="235"/>
+        <location filename="devices/basedevice.ui" line="277"/>
         <source>Normal</source>
         <translation>标准</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="169"/>
-        <location filename="w820nbplusform.ui" line="179"/>
-        <location filename="w820nbplusform.ui" line="249"/>
+        <location filename="devices/basedevice.ui" line="169"/>
+        <location filename="devices/basedevice.ui" line="179"/>
+        <location filename="devices/basedevice.ui" line="249"/>
         <source>Ambient Sound</source>
         <translation>环境声</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="227"/>
+        <location filename="devices/basedevice.ui" line="227"/>
         <source>Control Settings</source>
         <translation>操控设置</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="258"/>
+        <location filename="devices/basedevice.ui" line="258"/>
         <source>Please select at least 2 items</source>
         <translation>请选择至少2项</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="271"/>
+        <location filename="devices/basedevice.ui" line="271"/>
         <source>Sound Effect</source>
         <translation>音效</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="284"/>
+        <location filename="devices/basedevice.ui" line="284"/>
         <source>Pop</source>
         <translation>流行</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="291"/>
+        <location filename="devices/basedevice.ui" line="291"/>
         <source>Classical</source>
         <translation>古典</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="298"/>
+        <location filename="devices/basedevice.ui" line="298"/>
         <source>Rock</source>
         <translation>摇滚</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="308"/>
+        <location filename="devices/basedevice.ui" line="308"/>
         <source>Prompt Volume</source>
         <translation>耳机提示音量</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="353"/>
+        <location filename="devices/basedevice.ui" line="353"/>
         <source>Shutdown timer</source>
         <translation>定时关机</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="391"/>
+        <location filename="devices/basedevice.ui" line="391"/>
         <source>min</source>
         <translation>分钟</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="408"/>
+        <location filename="devices/basedevice.ui" line="408"/>
         <source>LDAC</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="416"/>
+        <location filename="devices/basedevice.ui" line="416"/>
         <source>OFF</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="423"/>
+        <location filename="devices/basedevice.ui" line="423"/>
         <source>44.1k/48k</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="430"/>
+        <location filename="devices/basedevice.ui" line="430"/>
         <source>96k</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="439"/>
+        <location filename="devices/basedevice.ui" line="439"/>
         <source>Takes effect after re-pairing</source>
         <translation>重新配对后生效</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="452"/>
+        <location filename="devices/basedevice.ui" line="452"/>
         <source>Game Mode</source>
         <translation>游戏模式</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="459"/>
+        <location filename="devices/basedevice.ui" line="459"/>
+        <source>Auto power off if there is no audio input for 30 minutes</source>
+        <oldsource>Auto power off if there is no audio input for 30 minutes.</oldsource>
+        <translation>无音频输入30分钟后自动关机</translation>
+    </message>
+    <message>
+        <location filename="devices/basedevice.ui" line="466"/>
         <source>Poweroff</source>
         <translation>关机</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="466"/>
+        <location filename="devices/basedevice.ui" line="473"/>
         <source>Disconnect</source>
         <translation>断开连接</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="473"/>
+        <location filename="devices/basedevice.ui" line="480"/>
         <source>Re-pair</source>
         <translation>重新配对</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="480"/>
+        <location filename="devices/basedevice.ui" line="487"/>
         <source>Factory Reset</source>
         <translation>恢复出厂设置</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="487"/>
+        <location filename="devices/basedevice.ui" line="494"/>
         <source>Play Control</source>
         <translation>播放控制</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="493"/>
+        <location filename="devices/basedevice.ui" line="500"/>
         <source>Vol+</source>
         <translation>音量+</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="500"/>
+        <location filename="devices/basedevice.ui" line="507"/>
         <source>Vol-</source>
         <translation>音量-</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="507"/>
+        <location filename="devices/basedevice.ui" line="514"/>
         <source>Play</source>
         <translation>播放</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="514"/>
+        <location filename="devices/basedevice.ui" line="521"/>
         <source>Pause</source>
         <translation>暂停</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="521"/>
+        <location filename="devices/basedevice.ui" line="528"/>
         <source>Prev</source>
         <translation>上一曲</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="528"/>
+        <location filename="devices/basedevice.ui" line="535"/>
         <source>Next</source>
         <translation>下一曲</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="538"/>
+        <location filename="devices/basedevice.ui" line="545"/>
         <source>Send Command</source>
         <translation>发送命令</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="544"/>
+        <location filename="devices/basedevice.ui" line="551"/>
         <source>command(Hex)</source>
         <translation>命令(16进制)</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="551"/>
+        <location filename="devices/basedevice.ui" line="558"/>
         <source>Raw</source>
         <translation>原始命令</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.ui" line="558"/>
+        <location filename="devices/basedevice.ui" line="565"/>
         <source>Send</source>
         <translation>发送</translation>
     </message>
     <message>
-        <location filename="w820nbplusform.cpp" line="211"/>
+        <location filename="devices/basedevice.cpp" line="196"/>
         <source>The name is too long</source>
-        <oldsource>The name is too long.</oldsource>
         <translation>设备名过长</translation>
     </message>
 </context>
+<context>
+    <name>CommBLE</name>
+    <message>
+        <location filename="comms/commble.cpp" line="115"/>
+        <source>Device Connected</source>
+        <translation>设备已连接</translation>
+    </message>
+    <message>
+        <location filename="comms/commble.cpp" line="174"/>
+        <source>Device Disconnected</source>
+        <translation>设备已断开</translation>
+    </message>
+</context>
+<context>
+    <name>CommRFCOMM</name>
+    <message>
+        <location filename="comms/commrfcomm.cpp" line="36"/>
+        <source>Device Connected</source>
+        <translation>设备已连接</translation>
+    </message>
+    <message>
+        <location filename="comms/commrfcomm.cpp" line="41"/>
+        <source>Device Disconnected</source>
+        <translation>设备已断开</translation>
+    </message>
+</context>
+<context>
+    <name>DeviceForm</name>
+    <message>
+        <location filename="deviceform.ui" line="32"/>
+        <source>Search RFCOMM</source>
+        <translation>搜索RFCOMM设备</translation>
+    </message>
+    <message>
+        <location filename="deviceform.ui" line="39"/>
+        <source>Search BLE</source>
+        <translation>搜索BLE设备</translation>
+    </message>
+    <message>
+        <location filename="deviceform.ui" line="46"/>
+        <source>Stop</source>
+        <translation>停止</translation>
+    </message>
+    <message>
+        <location filename="deviceform.ui" line="65"/>
+        <source>Name</source>
+        <translation>设备名</translation>
+    </message>
+    <message>
+        <location filename="deviceform.ui" line="70"/>
+        <source>Address</source>
+        <translation>地址</translation>
+    </message>
+    <message>
+        <location filename="deviceform.ui" line="75"/>
+        <source>Type</source>
+        <translation>类型</translation>
+    </message>
+    <message>
+        <location filename="deviceform.ui" line="91"/>
+        <source>Connect</source>
+        <translation>连接</translation>
+    </message>
+    <message>
+        <location filename="deviceform.ui" line="98"/>
+        <source>Disconnect</source>
+        <translation>断开连接</translation>
+    </message>
+    <message>
+        <location filename="deviceform.cpp" line="20"/>
+        <location filename="deviceform.cpp" line="109"/>
+        <location filename="deviceform.cpp" line="223"/>
+        <source>RFCOMM</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="deviceform.cpp" line="21"/>
+        <location filename="deviceform.cpp" line="107"/>
+        <location filename="deviceform.cpp" line="221"/>
+        <source>BLE</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="deviceform.cpp" line="55"/>
+        <source>Bluetooth is not available</source>
+        <translation>蓝牙不可用</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="mainwindow.ui" line="14"/>
+        <source>mEDIFIER</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="85"/>
+        <source>Read Settings</source>
+        <translation>读取设置</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="29"/>
+        <source>Device</source>
+        <translation>设备</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="119"/>
+        <source>Device not connected</source>
+        <translation>设备未连接</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="193"/>
+        <source>Device detected</source>
+        <translation>识别到设备</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="200"/>
+        <source>Generic Device</source>
+        <translation>通用设备</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="201"/>
+        <source>W820NB Double Gold</source>
+        <translation>W820NB双金标版</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="202"/>
+        <source>W200BT Plus</source>
+        <translation></translation>
+    </message>
+</context>
 </TS>
diff --git a/README.md b/README.md
index 4b3f547..d927d8a 100644
--- a/README.md
+++ b/README.md
@@ -3,12 +3,16 @@ I just don't know why the Edifier Connect takes up more than 200MB on my phone.
 
 # Pros
 + Smaller  
-  (Android: ~2MB, Qt(Android): ~9MB, Qt(PC): ~30MB)
-+ No Internet is required
+  (Android: ~2MB, Qt(Android): ~9MB, Qt(PC): ~30MB)  
++ No Internet is required  
++ Less click on the physical buttons  
++ Cross-platform  
 
 # Cons
-+ Tested on W820NB and W820NB Plus only
-+ Works for RFCOMM only  
++ Tested on W820NB Double Gold and W200BT Plus only  
+  (Maybe works for W820NB Plus and W820NB somehow)  
++ The BLE connection on Windows is not convenient  
++ Sending raw commands to your device might break it  
 
 # Previews
 (All versions have both English And Simplified Chinese interfaces)