small tune up

app/src/main/java/com/sheep/gamegroup/model/entity/QRCode.java

@@ -10,6 +10,7 @@ public class QRCode {
     //需要执行的扫码后续功能
     private String content;
     private long expire_time;
+    private long create_time;
     private String ip;
     private String qr_url;
     private int relation_id;
@@ -73,6 +74,14 @@ public class QRCode {
         this.expire_time = expire_time;
     }
 
+    public long getCreate_time() {
+        return create_time;
+    }
+
+    public void setCreate_time(long create_time) {
+        this.create_time = create_time;
+    }
+
     public String getIp() {
         return ip;
     }

app/src/main/java/com/sheep/gamegroup/module/qrcode/QRCodeActivity.java

@@ -78,6 +78,7 @@ public class QRCodeActivity extends BaseActivity implements Runnable {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         qrCode = baseMessage.getData(QRCode.class);
+                        qrCode.setExpire_time(qrCode.getExpire_time() + (System.currentTimeMillis()/1000 - qrCode.getCreate_time()));
                         Glide.with(QRCodeActivity.this).load(qrCode.getQr_url()).into(qrCodeImageView);
                         //二维码图片加载成功才开始轮询扫码结果
                         if (withLoop) {
@@ -101,7 +102,9 @@ public class QRCodeActivity extends BaseActivity implements Runnable {
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
+                        long expired_time = qrCode.getExpire_time();
                         qrCode = baseMessage.getData(QRCode.class);
+                        qrCode.setExpire_time(expired_time);
                         if (qrCode.getStatus() == 1) {
                             isLooping = false;
                             returnResult(qrCode.getAction_content());

app/src/main/java/com/sheep/gamegroup/module/qrcode/QRCodeCaptureHelper.java

@@ -41,7 +41,7 @@ public class QRCodeCaptureHelper {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        G.showToast("扫码失败");
+                        G.showToast(baseMessage);
                     }
                 });
     }
@@ -83,7 +83,7 @@ public class QRCodeCaptureHelper {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        G.showToast("扫码失败");
+                        G.showToast(baseMessage);
                     }
                 });
     }