venue/venue_android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备ID写了公共方法，放在SP中

Browse Source
This commit is contained in:
limqhz
2020-08-31 22:44:18 +08:00
parent c54f08990b
commit c387c49140
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/ydd/sportfaceid/MainActivity.java
View File

@@ -77,6 +77,11 @@ public class MainActivity extends SDBaseActivity {
// 应该是原来的保持屏幕常亮的代码 // 应该是原来的保持屏幕常亮的代码
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
order_view.setWebViewClient(new WebViewClient()); order_view.setWebViewClient(new WebViewClient());
order_view.getSettings().setUseWideViewPort(true);
order_view.getSettings().setLoadWithOverviewMode(true);
order_view.getSettings().setBuiltInZoomControls(true);
order_view.getSettings().setSupportZoom(true);
order_view.setInitialScale(66);
// current_date = TimeUtil.getCurrentDate(); // current_date = TimeUtil.getCurrentDate();
refreshWebView(); refreshWebView();
// 启动Service // 启动Service
@@ -184,7 +189,7 @@ public class MainActivity extends SDBaseActivity {
private void initQrIcon() { private void initQrIcon() {
Integer venueId = SDAppConfig.getInstance().getVenueId(); Integer venueId = SDAppConfig.getInstance().getVenueId();
String deviceName = DeviceIdUtil.generateDeviceId(this); String deviceName = DeviceIdUtil.newGenerateDeviceName(this);
String deviceType = SDAppConfig.getInstance().getDeviceType(); String deviceType = SDAppConfig.getInstance().getDeviceType();
String qrCert = deviceName + Constant.QRCODE_WORD + venueId + Constant.QRCODE_WORD + deviceType; String qrCert = deviceName + Constant.QRCODE_WORD + venueId + Constant.QRCODE_WORD + deviceType;
if (venueId != null) { if (venueId != null) {

2
app/src/main/java/com/ydd/sportfaceid/netty/ClientHandler.java
View File

@@ -87,7 +87,7 @@ public class ClientHandler extends SimpleChannelInboundHandler<String> {
*/ */
private HeartBeat getHbMessage() { private HeartBeat getHbMessage() {
HeartBeat hb = new HeartBeat(); HeartBeat hb = new HeartBeat();
hb.setDeviceName(DeviceIdUtil.generateDeviceId(mContext)); hb.setDeviceName(DeviceIdUtil.newGenerateDeviceName(mContext));
hb.setVenueId(SDAppConfig.getInstance().getVenueId()); hb.setVenueId(SDAppConfig.getInstance().getVenueId());
hb.setDeviceType(SDAppConfig.getInstance().getDeviceType()); hb.setDeviceType(SDAppConfig.getInstance().getDeviceType());
return hb; return hb;

26
app/src/main/java/com/ydd/sportfaceid/utils/DeviceIdUtil.java
View File

@@ -2,6 +2,7 @@ package com.ydd.sportfaceid.utils;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Build; import android.os.Build;
@@ -22,6 +23,10 @@ import java.util.UUID;
public class DeviceIdUtil { public class DeviceIdUtil {
static final private String INVALID_SERIAL_NUMBER = "12345678900"; static final private String INVALID_SERIAL_NUMBER = "12345678900";
static final private String DEVICE_NAME = "DEVICE_NAME";
private static SharedPreferences sp;
private static SharedPreferences.Editor spEditor;
@SuppressLint("MissingPermission") @SuppressLint("MissingPermission")
static final public String generateDeviceId(Context context) { static final public String generateDeviceId(Context context) {
@@ -51,7 +56,6 @@ public class DeviceIdUtil {
if (!TextUtils.isEmpty(deviceId) && !Build.UNKNOWN.equals(deviceId) && !INVALID_SERIAL_NUMBER.equals(deviceId)) { if (!TextUtils.isEmpty(deviceId) && !Build.UNKNOWN.equals(deviceId) && !INVALID_SERIAL_NUMBER.equals(deviceId)) {
return deviceId; return deviceId;
} }
deviceId = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); deviceId = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
if (!"9774d56d682e549c".equals(deviceId) && !INVALID_SERIAL_NUMBER.equals(deviceId) if (!"9774d56d682e549c".equals(deviceId) && !INVALID_SERIAL_NUMBER.equals(deviceId)
&& !TextUtils.isEmpty(deviceId) && deviceId.length() > 6) { && !TextUtils.isEmpty(deviceId) && deviceId.length() > 6) {
@@ -103,4 +107,24 @@ public class DeviceIdUtil {
return macSerial; return macSerial;
} }
/**
* 兼容版本从SP中获取
* @param context
* @return
*/
static final public String newGenerateDeviceName(Context context) {
String deviceName = "";
if (sp == null) {
sp = context.getSharedPreferences(DEVICE_NAME, Context.MODE_PRIVATE);
spEditor = sp.edit();
deviceName = UUID.randomUUID().toString().replace("-", "");
spEditor.putString(DEVICE_NAME,deviceName);
spEditor.commit();
}else {
deviceName = sp.getString(DEVICE_NAME,"ERROR_DEVICE_NAME");
}
return deviceName;
}
} }