From d04b89a739078d36060b4a3af0779470327b40ab Mon Sep 17 00:00:00 2001
From: Runt <qingingrunt2010@qq.com>
Date: Tue, 28 Apr 2026 13:28:53 +0000
Subject: [PATCH] 设备信息调整 接口信息优化
---
libmvi/src/main/java/com/runt/open/mvi/data/PhoneDevice.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/libmvi/src/main/java/com/runt/open/mvi/data/PhoneDevice.java b/libmvi/src/main/java/com/runt/open/mvi/data/PhoneDevice.java
index 01ebede..4533358 100644
--- a/libmvi/src/main/java/com/runt/open/mvi/data/PhoneDevice.java
+++ b/libmvi/src/main/java/com/runt/open/mvi/data/PhoneDevice.java
@@ -2,9 +2,10 @@
import android.content.Context;
import android.os.Build;
+import android.util.DisplayMetrics;
import com.runt.open.mvi.retrofit.utils.NetWorkUtils;
-import com.runt.open.mvi.utils.DeviceIdUtils;
+import com.runt.open.mvi.utils.DeviceUtil;
/**
@@ -15,19 +16,25 @@
public class PhoneDevice {
- private String brand,model,androidVersion,androidCode,seriaNo,netIp;
+ private String brand,model,androidVersion,seriaNo,netIp;
+ private int androidCode,pixWidth,pixHeight;
+ private float density;
static PhoneDevice device;
public static void setDevice(Context context) {
- device = new PhoneDevice(Build.BRAND,Build.MODEL,Build.VERSION.SDK_INT+"",Build.VERSION.RELEASE, DeviceIdUtils.getDeviceId(context), NetWorkUtils.getNetIp());
+ device = new PhoneDevice(Build.BRAND,Build.MODEL,Build.VERSION.RELEASE, Build.VERSION.SDK_INT,"", NetWorkUtils.getNetIp());
+ DisplayMetrics displayPixel = DeviceUtil.getScreenPixel(context);
+ device.pixWidth = displayPixel.widthPixels;
+ device.pixHeight = displayPixel.heightPixels;
+ device.density = displayPixel.density;
}
public static PhoneDevice getDevice() {
return device;
}
- public PhoneDevice(String brand, String model, String androidVersion, String androidCode, String seriaNo, String netIp) {
+ public PhoneDevice(String brand, String model, String androidVersion, int androidCode, String seriaNo, String netIp) {
this.brand = brand;
this.model = model;
this.androidVersion = androidVersion;
@@ -60,11 +67,11 @@
this.androidVersion = androidVersion;
}
- public String getAndroidCode() {
+ public int getAndroidCode() {
return androidCode;
}
- public void setAndroidCode(String androidCode) {
+ public void setAndroidCode(int androidCode) {
this.androidCode = androidCode;
}
@@ -84,16 +91,40 @@
this.netIp = netIp;
}
+ public int getPixWidth() {
+ return pixWidth;
+ }
+
+ public void setPixWidth(int pixWidth) {
+ this.pixWidth = pixWidth;
+ }
+
+ public int getPixHeight() {
+ return pixHeight;
+ }
+
+ public void setPixHeight(int pixHeight) {
+ this.pixHeight = pixHeight;
+ }
+
+ public float getDensity() {
+ return density;
+ }
+
+ public void setDensity(float density) {
+ this.density = density;
+ }
@Override
public String toString() {
- return "PhoneDevice{" +
- "brand='" + brand + '\'' +
+ return "PhoneDevice{" + "brand='" + brand + '\'' +
", model='" + model + '\'' +
", androidVersion='" + androidVersion + '\'' +
- ", androidCode='" + androidCode + '\'' +
", seriaNo='" + seriaNo + '\'' +
", netIp='" + netIp + '\'' +
- '}';
+ ", androidCode=" + androidCode +
+ ", pixWidth=" + pixWidth +
+ ", pixHeight=" + pixHeight +
+ ", density=" + density + '}';
}
}
--
Gitblit v1.9.1