From aa434414ed7ef77caf97e84fcebdd5ea7a229ab9 Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Mon, 10 Mar 2025 11:06:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E7=94=B5=E5=8E=8B=E7=9A=84=E6=9D=A1=E4=BB=B6=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/GPIOControl.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/cpp/GPIOControl.h b/app/src/main/cpp/GPIOControl.h index 52261117..5d740a0a 100644 --- a/app/src/main/cpp/GPIOControl.h +++ b/app/src/main/cpp/GPIOControl.h @@ -66,8 +66,8 @@ #define CMD_SET_SYSTEM_RESET 202 #define CMD_GET_LIGHT_ADC 101 #define CMD_SET_LIGHT_ADC 102 - #define CMD_GET_CHARGING_BUS_VOLTAGE_STATE 112 - #define CMD_GET_BAT_BUS_VOLTAGE_STATE 117 +#define CMD_GET_CHARGING_BUS_VOLTAGE_STATE 112 +#define CMD_GET_BAT_BUS_VOLTAGE_STATE 117 //#define CMD_GET_CHARGING_BUS_VOLTAGE_STATE 117 //#define CMD_GET_BAT_BUS_VOLTAGE_STATE 112 #define CMD_SET_SPI_MODE 0 // TO BE ADDED @@ -349,11 +349,7 @@ public: #endif static int getChargingBusVoltage() { -#ifndef USING_N938 return getInt(CMD_GET_CHARGING_BUS_VOLTAGE_STATE); -#else - return -1; -#endif } #if 0 From 964fa2a91b151b1248d1f75847a39ed4cb83888a Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 10 Mar 2025 11:42:30 +0800 Subject: [PATCH 2/3] Update version to 1.3.63 Based Core Version to 1.4.34 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index f1e41991..852dca67 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ plugins { // 10,00,000 major-minor-build def AppMajorVersion = 1 def AppMinorVersion = 3 -def AppBuildNumber = 62 +def AppBuildNumber = 63 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From 691acaf67e4814b83f539ac9a35bdd1d800a24c9 Mon Sep 17 00:00:00 2001 From: liuguijing <1440265357@qq.com> Date: Mon, 10 Mar 2025 13:44:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E8=8E=B7=E5=8F=96sim=E5=8D=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=97=B6=EF=BC=8C=E7=83=AD=E7=82=B9=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8Cip=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=83=AD=E7=82=B9=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xypower/common/NetworkUtils.java | 31 ++++++++++++++++++- .../com/xypower/mpmaster/sms/SimUtil.java | 2 +- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/xypower/common/NetworkUtils.java b/common/src/main/java/com/xypower/common/NetworkUtils.java index 58065629..97ba3971 100644 --- a/common/src/main/java/com/xypower/common/NetworkUtils.java +++ b/common/src/main/java/com/xypower/common/NetworkUtils.java @@ -6,14 +6,20 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.net.ConnectivityManager; +import android.net.LinkProperties; +import android.net.Network; +import android.net.NetworkCapabilities; import android.net.NetworkInfo; import android.net.Uri; +import android.net.wifi.WifiManager; import android.telephony.TelephonyManager; import android.text.TextUtils; +import android.text.format.Formatter; import java.net.Inet4Address; import java.net.InetAddress; import java.net.NetworkInterface; +import java.net.SocketException; import java.net.URI; import java.util.Enumeration; import java.util.regex.Pattern; @@ -55,7 +61,7 @@ public class NetworkUtils { } public static String getMobileNetworkIp(Context context) { - ConnectivityManager connectivityManager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE); + ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); @SuppressLint("MissingPermission") NetworkInfo[] networkInfos = connectivityManager.getAllNetworkInfo(); if (networkInfos == null || networkInfos.length == 0) { @@ -89,6 +95,29 @@ public class NetworkUtils { } + public static String getMobileIPAddress() { + try { + Enumeration interfaces = NetworkInterface.getNetworkInterfaces(); + while (interfaces.hasMoreElements()) { + NetworkInterface networkInterface = interfaces.nextElement(); + if (networkInterface.isUp() && !networkInterface.isLoopback()) { + if (networkInterface.getName() != null && !networkInterface.getName().contains("ap")) { + Enumeration addresses = networkInterface.getInetAddresses(); + while (addresses.hasMoreElements()) { + InetAddress address = addresses.nextElement(); + if (!address.isLoopbackAddress() && address.getAddress().length == 4) { // IPv4 + return address.getHostAddress(); + } + } + } + } + } + } catch (SocketException e) { + e.printStackTrace(); + } + return null; + } + public static int addAPN(Context context, String name, String desc, String numeric, String user, String pwd) { int id = -1; String NUMERIC = getSIMInfo(context); diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java b/mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java index 801a19fe..63d6ea51 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java @@ -687,7 +687,7 @@ public class SimUtil { result.append(isActiveSlot ? ",默认" : ""); if (isActiveSlot) { - result.append(",IP=" + NetworkUtils.getMobileNetworkIp(context)); + result.append(",IP=" + NetworkUtils.getMobileIPAddress()); } result.append(" ");