Skip to content

Commit 776b416

Browse files
committed
更新到1.0.0.5
1 parent d6535d1 commit 776b416

14 files changed

+1279
-1114
lines changed

DrCOM_JLU_Qt.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RESOURCES += \
6363
include(singleinstance/singleapplication.pri)
6464
DEFINES += QAPPLICATION_CLASS=QApplication
6565

66-
VERSION = 1.0.0.4
66+
VERSION = 1.0.0.5
6767

6868
# 更新日志:
6969
# v 0.0.0.0 实现基本功能
@@ -72,4 +72,4 @@ VERSION = 1.0.0.4
7272
# 调整字体为微软雅黑10号(就是win下正常的字体
7373
# v 1.0.0.3 没有这个版本,上次该发布0.2版本时候压缩包名字打错了。。。应该为1.0.0.2的,所以跳过这个版本号
7474
# v 1.0.0.4 优化用户体验,调整掉线时的提示信息,增加掉线时直接重启客户端的提示
75-
75+
# v 1.0.0.5 解决不稳定的bug,自动重启客户端重新登录,新增日志功能,方便查错

README.md

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
# drcom-jlu-qt
22
drcom for jlu in qt cross platform
33

4-
54
跨平台 **win linux mac**
65

6+
win和linux测试稳定可用(mac尚未测试,没有设备T^T
77

8-
win和linux测试~~稳定~~可用(mac尚未测试,没有设备T^T
9-
10-
(不稳定的bug正在修复中
11-
8+
(不稳定的bug已修复。解决方案:掉线后客户端会尝试自行重启,如果是不稳定的bug导致的掉线的话就直接又重新登录成功了。自动重启登录成功后窗口默认最小化,不会影响您的其他操作,不会弹窗。要是wifi没信号了那就登录失败。注意:自动重启功能依赖于“记住我”选项的勾选)
129

1310
下载链接:[https://github.com/code4lala/drcom-jlu-qt/releases](https://github.com/code4lala/drcom-jlu-qt/releases "https://github.com/code4lala/drcom-jlu-qt/releases")
1411

15-
1612
# 已实现的功能: #
1713

18-
1914
1. 自动识别mac地址 (可手动指定mac地址
2015
2. **最小化到托盘** (linux也可以最小化到托盘啦
2116
3. 单实例(您要是嫌开机自启慢的话呢直接打开就行,开机自启那个不会再开一个实例啦
@@ -40,7 +35,6 @@ UBUNTU:
4035

4136
# 待实现的功能: #
4237

43-
4438
1. 密码加密保存
4539
2. 喵喵喵?
4640
3.
@@ -50,35 +44,26 @@ UBUNTU:
5044

5145
# 感谢: #
5246

53-
5447
感谢[https://github.com/lyj3516](https://github.com/lyj3516 "https://github.com/lyj3516")提供的图标
5548

56-
5749
**jlu的drcom协议细节**
5850

5951
[https://github.com/drcoms/jlu-drcom-client/blob/master/jlu-drcom-java/jlu-drcom-protocol.md](https://github.com/drcoms/jlu-drcom-client/blob/master/jlu-drcom-java/jlu-drcom-protocol.md "https://github.com/drcoms/jlu-drcom-client/blob/master/jlu-drcom-java/jlu-drcom-protocol.md")
6052

61-
6253
**唯一实例**
6354

6455
[https://github.com/itay-grudev/SingleApplication](https://github.com/itay-grudev/SingleApplication "https://github.com/itay-grudev/SingleApplication")
6556

66-
6757
# 特别感谢: #
6858

69-
7059
[https://github.com/mchome/dogcom](https://github.com/mchome/dogcom "https://github.com/mchome/dogcom")
7160

72-
7361
提取出来jlu部分的代码改动到此项目中
7462

75-
7663
# 许可证: #
7764

78-
7965
GNU Affero General Public License v3.0
8066

81-
8267
# 更新日志: #
8368

8469
v 0.0.0.0 实现基本功能
@@ -91,3 +76,5 @@ v 1.0.0.3 没有这个版本,上次该发布0.2版本时候压缩包名字打
9176

9277
v 1.0.0.4 优化用户体验,调整掉线时的提示信息,增加掉线时直接重启客户端的提示
9378

79+
v 1.0.0.5 解决不稳定的bug,自动重启客户端重新登录,新增日志功能,方便查错
80+

constants.h

Lines changed: 38 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,62 @@
11
#ifndef CONSTANTS_H
22
#define CONSTANTS_H
33

4-
#include <QHostAddress>
4+
#include <QApplication>
55

66
enum {
7-
// 离线原因
8-
OFF_UNKNOWN,
9-
OFF_USER_LOGOUT,
10-
OFF_BIND_FAILED,
11-
OFF_CHALLENGE_FAILED,
7+
// 离线原因
8+
OFF_UNKNOWN,
9+
OFF_USER_LOGOUT,
10+
OFF_BIND_FAILED,
11+
OFF_CHALLENGE_FAILED,
1212
OFF_CHECK_MAC,
1313
OFF_SERVER_BUSY,
14-
OFF_WRONG_PASS,
15-
OFF_NOT_ENOUGH,
14+
OFF_WRONG_PASS,
15+
OFF_NOT_ENOUGH,
1616
OFF_FREEZE_UP,
1717
OFF_NOT_ON_THIS_IP,
1818
OFF_NOT_ON_THIS_MAC,
1919
OFF_TOO_MUCH_IP,
2020
OFF_UPDATE_CLIENT,
2121
OFF_NOT_ON_THIS_IP_MAC,
2222
OFF_MUST_USE_DHCP,
23-
OFF_TIMEOUT,
23+
OFF_TIMEOUT,
2424

25-
// challenge 成功 获取到服务器返回的ip地址
26-
OBTAIN_IP_ADDRESS,
25+
// challenge 成功 获取到服务器返回的ip地址
26+
OBTAIN_IP_ADDRESS,
2727

28-
// 当前状态
29-
STATE_OFFLINE,
30-
STATE_LOGGING,
31-
STATE_ONLINE
28+
// 当前状态
29+
STATE_OFFLINE,
30+
STATE_LOGGING,
31+
STATE_ONLINE
3232

3333
};
3434

3535
enum {
36-
LOGIN_CHECK_MAC = 0x01,
37-
LOGIN_SERVER_BUSY = 0x02,
38-
LOGIN_WRONG_PASS = 0x03,
39-
LOGIN_NOT_ENOUGH = 0x04,
40-
LOGIN_FREEZE_UP = 0x05,
41-
LOGIN_NOT_ON_THIS_IP = 0x07,
42-
LOGIN_NOT_ON_THIS_MAC = 0x0B,
43-
LOGIN_TOO_MUCH_IP = 0x14,
44-
LOGIN_UPDATE_CLIENT = 0x15,
45-
LOGIN_NOT_ON_THIS_IP_MAC = 0x16,
46-
LOGIN_MUST_USE_DHCP = 0x17
36+
LOGIN_CHECK_MAC = 0x01,
37+
LOGIN_SERVER_BUSY = 0x02,
38+
LOGIN_WRONG_PASS = 0x03,
39+
LOGIN_NOT_ENOUGH = 0x04,
40+
LOGIN_FREEZE_UP = 0x05,
41+
LOGIN_NOT_ON_THIS_IP = 0x07,
42+
LOGIN_NOT_ON_THIS_MAC = 0x0B,
43+
LOGIN_TOO_MUCH_IP = 0x14,
44+
LOGIN_UPDATE_CLIENT = 0x15,
45+
LOGIN_NOT_ON_THIS_IP_MAC = 0x16,
46+
LOGIN_MUST_USE_DHCP = 0x17
4747
};
4848

49-
const int PORT_BIND=61440;
50-
const int PORT_DEST=61440;
51-
const QString SERVER_IP="10.100.61.3";
49+
const int PORT_BIND = 61440;
50+
const int PORT_DEST = 61440;
51+
const QString SERVER_IP = "10.100.61.3";
52+
const QString SETTINGS_FILE_NAME = "DrCOM_JLU_Qt.ini";
53+
const QString
54+
ID_ACCOUNT = "account",
55+
ID_PASSWORD = "password",
56+
ID_MAC = "mac",
57+
ID_REMEMBER = "remember",
58+
ID_AUTO_LOGIN = "autoLogin";
59+
const QString ID_RESTART_TIMES = "restartTimes";
60+
const int RETRY_TIMES = 3;
5261

5362
#endif // CONSTANTS_H

0 commit comments

Comments
 (0)