Commit ec67148a by sikang

add mac header

parent c6ac2f2e
...@@ -20,6 +20,7 @@ import okhttp3.internal.Util; ...@@ -20,6 +20,7 @@ import okhttp3.internal.Util;
import tech.starwin.LibConfig; import tech.starwin.LibConfig;
import tech.starwin.utils.LoginManager; import tech.starwin.utils.LoginManager;
import tech.starwin.utils.context_utils.AppInfoUtils; import tech.starwin.utils.context_utils.AppInfoUtils;
import tech.starwin.utils.context_utils.DeviceUtils;
/** /**
* Created by XLEO on 2018/1/30. * Created by XLEO on 2018/1/30.
...@@ -79,6 +80,7 @@ public class DefaultHeaderAddInterceptor implements Interceptor { ...@@ -79,6 +80,7 @@ public class DefaultHeaderAddInterceptor implements Interceptor {
.header("X-APP-SOURCE", LibConfig.XH_CHANNEL_NAME == null ? "" : LibConfig.XH_CHANNEL_NAME) .header("X-APP-SOURCE", LibConfig.XH_CHANNEL_NAME == null ? "" : LibConfig.XH_CHANNEL_NAME)
.header("thirdpartyDataFlag", String.valueOf(!TextUtils.isEmpty(LibConfig.TONGDUN_PARENT_KEY))) .header("thirdpartyDataFlag", String.valueOf(!TextUtils.isEmpty(LibConfig.TONGDUN_PARENT_KEY)))
// .header("X-APP-SIM-MOBILE", getSimInfo()) // .header("X-APP-SIM-MOBILE", getSimInfo())
.header("X-MAC_ADDRESS", DeviceUtils.getInstance().getMacAddress())
.header("X-AF-ID", LibConfig.APPSFLYER_DEV_KEY == null ? "" : LibConfig.APPSFLYER_DEV_KEY) .header("X-AF-ID", LibConfig.APPSFLYER_DEV_KEY == null ? "" : LibConfig.APPSFLYER_DEV_KEY)
.header("X-GA-ID", getGAId()) .header("X-GA-ID", getGAId())
.header("X-GP-PKG-FLAG", String.valueOf(!LibConfig.IS_COLLECT_MODE)) .header("X-GP-PKG-FLAG", String.valueOf(!LibConfig.IS_COLLECT_MODE))
......
...@@ -179,7 +179,7 @@ public class DeviceUtils { ...@@ -179,7 +179,7 @@ public class DeviceUtils {
} else { } else {
return appList; return appList;
} }
try { try {
PackageManager manager = context.getPackageManager(); PackageManager manager = context.getPackageManager();
List<PackageInfo> packages = manager.getInstalledPackages(0); List<PackageInfo> packages = manager.getInstalledPackages(0);
...@@ -489,30 +489,34 @@ public class DeviceUtils { ...@@ -489,30 +489,34 @@ public class DeviceUtils {
* *
* @return * @return
*/ */
String MAC = "NULL";
public String getMacAddress() { public String getMacAddress() {
String macAddress = null; if (MAC == "NULL") {
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer();
NetworkInterface networkInterface = null; NetworkInterface networkInterface = null;
try { try {
networkInterface = NetworkInterface.getByName("eth1"); networkInterface = NetworkInterface.getByName("eth1");
if (networkInterface == null) { if (networkInterface == null) {
networkInterface = NetworkInterface.getByName("wlan0"); networkInterface = NetworkInterface.getByName("wlan0");
} }
if (networkInterface == null) { if (networkInterface == null) {
return ""; MAC = "";
} }
byte[] addr = networkInterface.getHardwareAddress(); byte[] addr = networkInterface.getHardwareAddress();
for (byte b : addr) { for (byte b : addr) {
buf.append(String.format("%02X:", b)); buf.append(String.format("%02X:", b));
} }
if (buf.length() > 0) { if (buf.length() > 0) {
buf.deleteCharAt(buf.length() - 1); buf.deleteCharAt(buf.length() - 1);
}
MAC = buf.toString();
} catch (SocketException e) {
MAC = "";
e.printStackTrace();
} }
macAddress = buf.toString();
} catch (SocketException e) {
e.printStackTrace();
} }
return macAddress == null ? "" : macAddress; return MAC;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment