diff --git a/Android/app/build.gradle b/Android/app/build.gradle index c407dda..d751aa6 100644 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "priv.wh201906.medifier" minSdk 19 targetSdk 31 - versionCode 1 - versionName "0.0.1" + versionCode 2 + versionName "0.0.2" } buildTypes { diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml index 79280b3..f8c1b8f 100644 --- a/Android/app/src/main/AndroidManifest.xml +++ b/Android/app/src/main/AndroidManifest.xml @@ -2,7 +2,12 @@ + + + + + - + - + @@ -74,4 +74,11 @@ + + + + + + + diff --git a/Qt/commrfcomm.h b/Qt/commrfcomm.h index 18e83d5..2d07362 100644 --- a/Qt/commrfcomm.h +++ b/Qt/commrfcomm.h @@ -7,6 +7,7 @@ class CommRFCOMM : public Comm { + Q_OBJECT public: explicit CommRFCOMM(QObject *parent = nullptr); void open(const QString& address) override; diff --git a/Qt/deviceform.ui b/Qt/deviceform.ui index dbc3c45..18a61d6 100644 --- a/Qt/deviceform.ui +++ b/Qt/deviceform.ui @@ -10,9 +10,6 @@ 300 - - Form - diff --git a/Qt/mEDIFIER.pro b/Qt/mEDIFIER.pro index 3a85443..e13e7aa 100644 --- a/Qt/mEDIFIER.pro +++ b/Qt/mEDIFIER.pro @@ -43,3 +43,10 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android +DISTFILES += \ + android/AndroidManifest.xml + +# Remember to change version in AndroidManifest.xml +VERSION = 0.0.2 +# Expose VERSION to the source files. +DEFINES += APP_VERSION=\\\"$$VERSION\\\" diff --git a/Qt/mEDIFIER_zh_CN.ts b/Qt/mEDIFIER_zh_CN.ts index fcd9489..c8e3430 100644 --- a/Qt/mEDIFIER_zh_CN.ts +++ b/Qt/mEDIFIER_zh_CN.ts @@ -2,228 +2,315 @@ - DeviceForm + CommRFCOMM + + + Device Connected + 设备已连接 + - - Form - + + Device Disconnected + 设备已断开 + + + DeviceForm - + Search RFCOMM - + 搜索RFCOMM设备 - + Search BLE - + 搜索BLE设备 - + Stop - + 停止 - + Name - + 设备名 - + Address - + 地址 - + Type - + 类型 - + Connect - + 连接 - + Disconnect - + 断开连接 - - + + + RFCOMM - + - - + + + BLE - + MainWindow - MainWindow - - - - - Tab 1 - + mEDIFIER + Read Settings - + 读取设置 - + Device - + 设备 W820NBPlusForm - Form - + W820NB Plus + W820NB双金标版 + Info + 信息 + + + + Battery: + 电量: + + + + + + Get + 获取 + + + + MAC Address: + MAC地址: + + + + Firmware Version: + 固件版本: + + + Name - + 设备名 - + Takes effect after removing the pairing record and re-pairing - + 删除配对记录并重新配对后生效 - - - - + + + + Set - + 设置 - - - + + + Noise Reduction - + 降噪 - - - + + + Normal - + 标准 - - - + + + Ambient Sound - + 环境声 - + Control Settings - + 操控设置 - + Please select at least 2 items - + 请选择至少2项 - + Sound Effect - + 音效 - + Pop - + 流行 - + Classical - + 古典 - + Rock - + 摇滚 - + Prompt Volume - + 耳机提示音量 - + Shutdown timer - + 定时关机 - + min - + 分钟 - + LDAC - + - + OFF - + 关闭 - + 44.1k/48k - + - + 96k - + - + Takes effect after re-pairing - + 重新配对后生效 - + Game Mode - + 游戏模式 - + Poweroff - + 关机 - + Disconnect - + 断开连接 - + Re-pair - + 重新配对 - + Factory Reset - + 恢复出厂设置 + + + + Play Control + 播放控制 + + + + Vol+ + 音量+ + + + + Vol- + 音量- + + + + Play + 播放 + + + + Pause + 暂停 + + + + Prev + 上一曲 + + + + Next + 下一曲 + + + + Send Command + 发送命令 + + + + command(Hex) + 命令(16进制) + + + + Raw + 原始命令 + + + + Send + 发送 diff --git a/Qt/mainwindow.ui b/Qt/mainwindow.ui index 686a9e8..be302fd 100644 --- a/Qt/mainwindow.ui +++ b/Qt/mainwindow.ui @@ -25,7 +25,7 @@ - Tab 1 + Tab 1 diff --git a/README.md b/README.md index 407debe..4b3f547 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,20 @@ # mEDIFIER I just don't know why the Edifier Connect takes up more than 200MB on my phone. -# Limitations +# Pros ++ Smaller + (Android: ~2MB, Qt(Android): ~9MB, Qt(PC): ~30MB) ++ No Internet is required + +# Cons + Tested on W820NB and W820NB Plus only + Works for RFCOMM only -![preview](doc/preview.png) \ No newline at end of file +# Previews +(All versions have both English And Simplified Chinese interfaces) +| Android | Qt(Android) | Qt(PC) | +| --- | --- | --- | +| ![preview](doc/preview_android.jpg) | ![preview](doc/preview_qt_android.jpg) | ![preview](doc/preview_qt_pc.jpg) | + +# Download +[GitHub Releases](https://github.com/wh201906/mEDIFIER/releases) diff --git a/doc/preview.png b/doc/preview.png deleted file mode 100644 index 478ee93..0000000 Binary files a/doc/preview.png and /dev/null differ diff --git a/doc/preview_android.jpg b/doc/preview_android.jpg new file mode 100644 index 0000000..7a35ae6 Binary files /dev/null and b/doc/preview_android.jpg differ diff --git a/doc/preview_qt_android.jpg b/doc/preview_qt_android.jpg new file mode 100644 index 0000000..caab8b2 Binary files /dev/null and b/doc/preview_qt_android.jpg differ diff --git a/doc/preview_qt_pc.jpg b/doc/preview_qt_pc.jpg new file mode 100644 index 0000000..e7b0dc3 Binary files /dev/null and b/doc/preview_qt_pc.jpg differ