1

Client/src/common/ClientConfig.h

@@ -6,12 +6,12 @@
 
 namespace ClientConfig
 {
-//constexpr const char *kHost = "49.232.135.144";
-constexpr const char* kHost = "192.168.94.166";
+constexpr const char *kHost = "49.232.135.144";
+//constexpr const char* kHost = "192.168.94.166";
 constexpr uint16_t kPort = 6000;
 constexpr uint16_t kMagic = 0x494D;
 constexpr bool kLogEnabled = true;
 constexpr int kLogLevel = 0;
-constexpr const char *kVersion = "1.0.0";
+constexpr const char *kVersion = "1.0.1";
 constexpr im::i18n::Lang kLang = im::i18n::Lang::Zh;
 }

Client/src/mainframe/ClientSend.cpp

@@ -254,6 +254,10 @@ void Client::resendFailed(QWidget *row)
 {
     if (!row || row->property("sendStatus").toInt() != LocalMsg::Failed)
         return;
+    if (!ConfirmDialog::ask(this, QStringLiteral("重发消息"),
+                            QStringLiteral("是否重新发送这条消息？"),
+                            QStringLiteral("重发"), QStringLiteral("取消"), false))
+        return;
     const qint64 localId = row->property("outgoingId").toLongLong();
     const qint64 peer = row->property("outgoingPeer").toLongLong();
     const int msgType = row->property("outgoingType").toInt();

Client/src/widgets/ConfirmDialog.cpp

@@ -174,9 +174,9 @@ ConfirmDialog::ConfirmDialog(QWidget *parent, const QString &title, const QStrin
 }
 
 bool ConfirmDialog::ask(QWidget *parent, const QString &title, const QString &text,
-                        const QString &okText, const QString &cancelText)
+                        const QString &okText, const QString &cancelText, bool dangerOk)
 {
-    ConfirmDialog dlg(parent, title, text, okText, cancelText, true);
+    ConfirmDialog dlg(parent, title, text, okText, cancelText, dangerOk);
     if (parent)
     {
         const QPoint c = parent->mapToGlobal(parent->rect().center());

Client/src/widgets/ConfirmDialog.h

@@ -28,7 +28,8 @@ class ConfirmDialog : public QDialog
 public:
     static bool ask(QWidget *parent, const QString &title, const QString &text,
                     const QString &okText = QStringLiteral("删除"),
-                    const QString &cancelText = QStringLiteral("取消"));
+                    const QString &cancelText = QStringLiteral("取消"),
+                    bool dangerOk = true);
     // 1=左侧, 2=右侧, 0=取消/关闭
     static int chooseAction(QWidget *parent, const QString &title, const QString &text,
                             const QString &leftText, const QString &rightText);