From 9d01f2ae37f5173f3416924959563ff9683b1030 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 16 四月 2020 13:30:20 +0800
Subject: [PATCH] 获得二维码签到url后，传给展示二维码的 dialog，用以生成二维码
---
/dev/null | 9 ---------
.gitignore | 1 +
app/src/main/java/safeluck/drive/evaluation/customview/QRCodeDialog.java | 6 +++++-
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 7 +------
4 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1c118a4..c580c08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
signal_config_file.json.orig
lib/.cxx/cmake
ndk_locator_record.json
+misc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 37a7509..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/build/classes" />
- </component>
- <component name="ProjectType">
- <option name="id" value="Android" />
- </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/safeluck/drive/evaluation/customview/QRCodeDialog.java b/app/src/main/java/safeluck/drive/evaluation/customview/QRCodeDialog.java
index 9c6d241..ed65810 100644
--- a/app/src/main/java/safeluck/drive/evaluation/customview/QRCodeDialog.java
+++ b/app/src/main/java/safeluck/drive/evaluation/customview/QRCodeDialog.java
@@ -5,6 +5,7 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -36,6 +37,7 @@
*/
public class QRCodeDialog extends DialogFragment {
+ private static final String TAG = "QRCodeDialog";
private String message="姝ｅ湪鍔犺浇...";
private boolean canCancel= true;
private ImageView iv_qrCode;
@@ -56,7 +58,8 @@
initView(view);
setCancelable(canCancel);
Bundle bundle =getArguments();
- message = bundle.getString("title");
+ message = bundle.getString("tittle");
+ Log.i(TAG,"meesage="+message);
Message message = Message.obtain();
message.what = 1;
handler.sendMessageDelayed(message,15*1000);
@@ -75,6 +78,7 @@
QRCodeDialog fragment = new QRCodeDialog();
Bundle bundle = new Bundle();
bundle.putString("tittle", message);
+ Log.i(TAG,"messae="+message);
fragment.setArguments(bundle);
return fragment;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index 982c815..ffa71bb 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -648,15 +648,10 @@
break;
case R.id.btn_return:
-// _mActivity.onBackPressed();
- QRCodeDialog qrCodeDialog = QRCodeDialog.newInstance("f");
- qrCodeDialog.setStyle(DialogFragment.STYLE_NORMAL,R.style.Dialog_FullScreen);
- qrCodeDialog.show(getFragmentManager(),"qrcode");
+ _mActivity.onBackPressed();
break;
case R.id.iv_head:
MyLog.i(PlatFormConstant.HTTPTAG,"绛惧埌");
-// AYSdk.getInstance().sendCmd(Constant.READ_PHYSICAL_ID,"");
- //TODO 鑾峰緱鐗╃悊鍗″彿 鍙戦�丣KMessage0201缁欏钩鍙帮紝鑾峰彇濮撳悕銆佽韩浠借瘉銆乭ead_url
loadProgressDialog = LoadProgressDialog.newInstance("璇风◢鍚�...");
loadProgressDialog.setStyle(DialogFragment.STYLE_NORMAL,R.style.Dialog_FullScreen);
loadProgressDialog.showNow(getFragmentManager(),"loadingdiaolog");
--
Gitblit v1.8.0