diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bc63fec..f2a7403 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,10 +36,10 @@
-
-
-
-
+
+
+
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bc63fec..f2a7403 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,10 +36,10 @@
-
-
-
-
+
+
+
+
diff --git a/app/src/main/java/com/casic/smartwellapp/Entity/DeviceData.java b/app/src/main/java/com/casic/smartwellapp/Entity/DeviceData.java
index 1f064c4..685a0bf 100644
--- a/app/src/main/java/com/casic/smartwellapp/Entity/DeviceData.java
+++ b/app/src/main/java/com/casic/smartwellapp/Entity/DeviceData.java
@@ -1,16 +1,18 @@
package com.casic.smartwellapp.Entity;
public class DeviceData {
- private String name;
- private String card;
- private String yys;
- private String imei;
+ private String name;//用户名
+ private String card;//用户卡号
+ private String yys;//运营商
+ private String imei;//设备唯一编码
+ private String number;//全国注册备案号
- public DeviceData(String name, String card, String yys, String imei) {
+ public DeviceData(String name, String card, String yys, String imei, String recordNumber) {
this.name = name;
this.card = card;
this.yys = yys;
this.imei = imei;
+ this.number = recordNumber;
}
public String getName() {
@@ -45,6 +47,14 @@
this.imei = imei;
}
+ public String getNumber() {
+ return number;
+ }
+
+ public void setNumber(String number) {
+ this.number = number;
+ }
+
@Override
public String toString() {
return "DeviceData{" +
@@ -52,6 +62,7 @@
", card='" + card + '\'' +
", yys='" + yys + '\'' +
", imei='" + imei + '\'' +
+ ", number='" + number + '\'' +
'}';
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bc63fec..f2a7403 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,10 +36,10 @@
-
-
-
-
+
+
+
+
diff --git a/app/src/main/java/com/casic/smartwellapp/Entity/DeviceData.java b/app/src/main/java/com/casic/smartwellapp/Entity/DeviceData.java
index 1f064c4..685a0bf 100644
--- a/app/src/main/java/com/casic/smartwellapp/Entity/DeviceData.java
+++ b/app/src/main/java/com/casic/smartwellapp/Entity/DeviceData.java
@@ -1,16 +1,18 @@
package com.casic.smartwellapp.Entity;
public class DeviceData {
- private String name;
- private String card;
- private String yys;
- private String imei;
+ private String name;//用户名
+ private String card;//用户卡号
+ private String yys;//运营商
+ private String imei;//设备唯一编码
+ private String number;//全国注册备案号
- public DeviceData(String name, String card, String yys, String imei) {
+ public DeviceData(String name, String card, String yys, String imei, String recordNumber) {
this.name = name;
this.card = card;
this.yys = yys;
this.imei = imei;
+ this.number = recordNumber;
}
public String getName() {
@@ -45,6 +47,14 @@
this.imei = imei;
}
+ public String getNumber() {
+ return number;
+ }
+
+ public void setNumber(String number) {
+ this.number = number;
+ }
+
@Override
public String toString() {
return "DeviceData{" +
@@ -52,6 +62,7 @@
", card='" + card + '\'' +
", yys='" + yys + '\'' +
", imei='" + imei + '\'' +
+ ", number='" + number + '\'' +
'}';
}
}
diff --git a/app/src/main/java/com/casic/smartwellapp/MainActivity.java b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
index 98a6315..8b4e78f 100644
--- a/app/src/main/java/com/casic/smartwellapp/MainActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
@@ -72,7 +72,7 @@
public void initData() {
imei = obtainSimCardSerialNumber();//20210524 Pengxh修改
Log.d(TAG, "imei === " + imei);
- obtainRecordNumber();//20210813 Pengxh修改
+ saveRecordNumber();//20210813 Pengxh修改
// 获取控件对象
webview = findViewById(R.id.webView);
WebView.setWebContentsDebuggingEnabled(true);
@@ -212,7 +212,7 @@
yys = getYys(getApplicationContext());
String name = userInfoResult.getData().getName();
String identifyCard = userInfoResult.getData().getIdentityCard();
- deviceData = new DeviceData(name, identifyCard, yys, imei);
+ deviceData = new DeviceData(name, identifyCard, yys, imei, readRecordNumber());
Log.d(TAG, "deviceData === " + deviceData.toString());
webview.loadUrl("file:///android_asset/index.html");
}
@@ -281,12 +281,6 @@
return null;
}
}
-
- //提供JS调用Android接口方法
- @JavascriptInterface
- public String readRecordNumber() {
- return (String) SaveKeyValues.getValue("RecordNumber", "");
- }
}
//获取运营商
@@ -346,7 +340,7 @@
}
//根据移动警务要求,增加备案号获取sdk
- private void obtainRecordNumber() {
+ private void saveRecordNumber() {
ApplicationInfo appInfo = getApplicationInfo();
if (appInfo == null) {
return;
@@ -355,5 +349,9 @@
Log.d(TAG, "全国注册备案号: " + number);
SaveKeyValues.putValue("RecordNumber", number);
}
+
+ public String readRecordNumber() {
+ return (String) SaveKeyValues.getValue("RecordNumber", "");
+ }
}