feat: 合规整改、新ffrom支持

config.gradle

@@ -10,7 +10,7 @@ ext {
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.55",
             "m-home"          : "0.0.23.95",
-            "m-im"            : "0.0.21.60",
+            "m-im"            : "0.0.21.61",
             "m-dynamic"       : "0.0.7.74",
             "m-article"       : "0.0.0.10",
             "m-muse"          : "0.0.28.81",
@@ -23,12 +23,12 @@ ext {
             //mdt 组件
             "ydl-tuicore"   : "0.0.25",
             //第一步
-            "ydl-platform"    : "0.0.41.41",
+            "ydl-platform"    : "0.0.41.44",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.94",
             "ydl-media"       : "0.0.21.52",
-            "ydl-pay"         : "0.0.18.19",
+            "ydl-pay"         : "0.0.18.21",
             "m-audioim"       : "0.0.49.30.23",
 
             "ydl-flutter-base": "0.0.14.38",
@@ -36,7 +36,7 @@ ext {
             //以下 几乎不会动
             "router"          : "0.0.1",
             "ydl-net"         : "0.0.3.94",
-            "ydl-utils"       : "0.0.3.8",
+            "ydl-utils"       : "0.0.3.12",
 
 
             //-------------- 业务模块 API 层 --------------
@@ -96,7 +96,7 @@ ext {
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.55",
             "m-home"          : "0.0.23.95",
-            "m-im"            : "0.0.21.60",
+            "m-im"            : "0.0.21.61",
             "m-dynamic"       : "0.0.7.74",
             "m-article"       : "0.0.0.10",
 
@@ -110,19 +110,19 @@ ext {
             //mdt 组件
             "ydl-tuicore"   : "0.0.25",
             //第一步
-            "ydl-platform"    : "0.0.41.41",
+            "ydl-platform"    : "0.0.41.44",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.94",
             "ydl-media"       : "0.0.21.52",
-            "ydl-pay"         : "0.0.18.19",
+            "ydl-pay"         : "0.0.18.21",
             "m-audioim"       : "0.0.49.30.23",
             "ydl-flutter-base": "0.0.14.38",
 
             //以下 几乎不会动
             "router"          : "0.0.1",
             "ydl-net"         : "0.0.3.94",
-            "ydl-utils"       : "0.0.3.8",
+            "ydl-utils"       : "0.0.3.12",
 
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.6",

m-im/src/main/java/com/yidianling/avchatkit/common/util/NetworkUtil.java

@@ -544,17 +544,13 @@ public class NetworkUtil {
      */
 
     public static String getActiveMacAddress(Context context) {
-        if (!DeviceTool.checkHasAgreeSecret()) {
-            return "";
-        }
+        if (DeviceTool.checkHasAgreeSecret()) {
             WifiManager wifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-
             WifiInfo info = wifi.getConnectionInfo();
-
             if (info != null) {
                 return info.getMacAddress();
             }
-
+        }
         return "";
     }
 

m-im/src/main/java/com/yidianling/im/config/NimSDKOptionConfig.java

@@ -236,7 +236,7 @@ class NimSDKOptionConfig {
 
         } else {
             String appFrom = BaseApp.Companion.getInstance().getGlobalConfig().getAppFrom();
-            if (YDLConstants.FROM_YDL.equals(appFrom)) {
+            if (YDLConstants.FROM_YDL.equals(appFrom) || YDLConstants.FROM_YDL2.equals(appFrom)) {
                 // 小米推送
                 config.xmAppId = "2882303761517432980";
                 config.xmAppKey = "5241743243980";

ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/params/WxPayParam.java

@@ -18,9 +18,10 @@ public class WxPayParam extends CommonPayParam {
         if(!TextUtils.isEmpty(BaseApp.instance.getGlobalConfig().getAppWxPayType())) {
             type =BaseApp.instance.getGlobalConfig().getAppWxPayType();
         }else {
-            if (YDLConstants.FROM_XLZX.equals(BaseApp.instance.getGlobalConfig().getAppFrom())) {
+            String appFrom = BaseApp.instance.getGlobalConfig().getAppFrom();
+            if (YDLConstants.FROM_XLZX.equals(appFrom)) {
                 type = "wxapp_consult";
-            } else if(YDLConstants.FROM_YDL.equals(BaseApp.instance.getGlobalConfig().getAppFrom())) {
+            } else if (YDLConstants.FROM_YDL.equals(appFrom) || YDLConstants.FROM_YDL2.equals(appFrom)) {
                 type = "wxapp_hz";
             }
         }

ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/utils/RxDeviceTool.java

@@ -122,80 +122,12 @@ public class RxDeviceTool {
     }
 
     /**
-     * IMEI （唯一标识序列号）
-     * <p>需与{@link #isPhone(Context)}一起使用</p>
-     * <p>需添加权限 {@code <uses-permission android:name="android.permission.READ_PHONE_STATE"/>}</p>
-     *
-     * @param context 上下文
-     * @return IMEI
-     */
-//    public static String getIMEI(Context context) {
-//        String deviceId;
-//        if (isPhone(context)) {
-//            deviceId = getDeviceIdIMEI(context);
-//        } else {
-//            deviceId = getAndroidId(context);
-//        }
-//        return deviceId;
-//    }
-
-    /**
-     * 获取设备的IMSI
-     *
-     * @param context
-     * @return
-     */
-//    public static String getIMSI(Context context) {
-//        return getSubscriberId(context);
-//    }
-
-    /**
-     * 获取设备的IMEI
-     *
-     * @param context
-     * @return
-     */
-//    public static String getDeviceIdIMEI(Context context) {
-//        String id;
-//        //android.telephony.TelephonyManager
-//        TelephonyManager mTelephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-//        if (mTelephony.getDeviceId() != null) {
-//            id = mTelephony.getDeviceId();
-//        } else {
-//            //android.provider.Settings;
-//            id = Settings.Secure.getString(context.getApplicationContext().getContentResolver(), Settings.Secure.ANDROID_ID);
-//        }
-//        return id;
-//    }
-
-    /**
-     * 获取设备的软件版本号
-     *
-     * @param context
-     * @return
-     */
-//    public static String getDeviceSoftwareVersion(Context context) {
-//        TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-//        return tm.getDeviceSoftwareVersion();
-//    }
-
-    /**
      * 获取android系统版本号
      */
     public static String getOsBuileVersion() {
         return Build.VERSION.RELEASE;
     }
 
-    /**
-     * 获取手机号
-     *
-     * @param context
-     * @return
-     */
-//    public static String getLine1Number(Context context) {
-//        TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-//        return tm.getLine1Number();
-//    }
 
     /**
      * 获取ISO标准的国家码，即国际长途区号
@@ -308,28 +240,6 @@ public class RxDeviceTool {
     }
 
     /**
-     * 获取唯一的用户ID
-     *
-     * @param context
-     * @return
-     */
-//    public static String getSubscriberId(Context context) {
-//        TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-//        return tm.getSubscriberId();
-//    }
-
-    /**
-     * 获取语音邮件号码
-     *
-     * @param context
-     * @return
-     */
-//    public static String getVoiceMailNumber(Context context) {
-//        TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-//        return tm.getVoiceMailNumber();
-//    }
-
-    /**
      * 获取ANDROID ID
      *
      * @param context
@@ -449,66 +359,6 @@ public class RxDeviceTool {
         return result;
     }
 
-    /**
-     * 获取设备信息
-     *
-     * @param context
-     * @return
-     */
-//    public static String getDeviceInfo(Context context) {
-//        try {
-//            org.json.JSONObject json = new org.json.JSONObject();
-//            TelephonyManager tm = (TelephonyManager) context
-//                    .getSystemService(Context.TELEPHONY_SERVICE);
-//            String device_id = null;
-//            if (checkPermission(context, Manifest.permission.READ_PHONE_STATE)) {
-//                device_id = getDeviceIdIMEI(context);
-//            }
-//            String mac = null;
-//            FileReader fstream = null;
-//            try {
-//                fstream = new FileReader("/sys/class/net/wlan0/address");
-//            } catch (FileNotFoundException e) {
-//                fstream = new FileReader("/sys/class/net/eth0/address");
-//            }
-//            BufferedReader in = null;
-//            if (fstream != null) {
-//                try {
-//                    in = new BufferedReader(fstream, 1024);
-//                    mac = in.readLine();
-//                } catch (IOException e) {
-//                } finally {
-//                    if (fstream != null) {
-//                        try {
-//                            fstream.close();
-//                        } catch (IOException e) {
-//                            e.printStackTrace();
-//                        }
-//                    }
-//                    if (in != null) {
-//                        try {
-//                            in.close();
-//                        } catch (IOException e) {
-//                            e.printStackTrace();
-//                        }
-//                    }
-//                }
-//            }
-//            json.put("mac", mac);
-//            if (TextUtils.isEmpty(device_id)) {
-//                device_id = mac;
-//            }
-//            if (TextUtils.isEmpty(device_id)) {
-//                device_id = Settings.Secure.getString(context.getContentResolver(),
-//                        Settings.Secure.ANDROID_ID);
-//            }
-//            json.put("device_id", device_id);
-//            return json.toString();
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        return null;
-//    }
 
 
     /**

ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/bean/WXRechargeIdParam.java

@@ -22,9 +22,10 @@ public class WXRechargeIdParam extends BaseCommand {
         if(!TextUtils.isEmpty(BaseApp.instance.getGlobalConfig().getAppWxPayType())) {
             type =BaseApp.instance.getGlobalConfig().getAppWxPayType();
         }else {
-            if (YDLConstants.FROM_XLZX.equals(BaseApp.instance.getGlobalConfig().getAppFrom())) {
+            String appFrom = BaseApp.instance.getGlobalConfig().getAppFrom();
+            if (YDLConstants.FROM_XLZX.equals(appFrom)) {
                 type = "wxapp_consult";
-            } else if(YDLConstants.FROM_YDL.equals(BaseApp.instance.getGlobalConfig().getAppFrom())) {
+            } else if (YDLConstants.FROM_YDL.equals(appFrom) || YDLConstants.FROM_YDL2.equals(appFrom)) {
                 type = "wxapp_hz";
             }
         }

ydl-platform/src/main/java/com/ydl/ydlcommon/app/YdlRepository.kt

@@ -6,10 +6,8 @@ import android.os.Build
 import com.alibaba.android.arouter.launcher.ARouter
 import com.bun.miitmdid.core.JLibrary
 import com.tencent.mmkv.MMKV
-import com.ydl.devicesidlib.DeviceIDHelper
 import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.data.http.UpLoadLogUtils
-import com.ydl.ydlcommon.utils.AppProgressUtils
 import com.ydl.ydlcommon.utils.BuryPointUtils
 import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.log.LogHelper

ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/YDLConstants.kt

@@ -17,10 +17,12 @@ object YDLConstants {
     const val BUNDLE = "bundle"
 
     const val FROM_YDL = "android"
+    //壹点灵sem渠道ffrom
+    const val FROM_YDL2 = "BaiduSem"
     const val FROM_XLZX = "ATK_7_android"
 
     //自定义注解，限制入参类型
-    @StringDef(FROM_YDL, FROM_XLZX)
+    @StringDef(FROM_YDL, FROM_XLZX, FROM_YDL2)
     annotation class AppFrom
 
 

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/DeviceTool.java

@@ -20,8 +20,8 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.tbruyelle.rxpermissions2.RxPermissions;
-import com.yidianling.common.tools.RxTool;
 import com.ydl.ydlcommon.BuildConfig;
+import com.yidianling.common.tools.RxTool;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -122,9 +122,7 @@ public class DeviceTool {
     @SuppressLint("MissingPermission")
     public static final String getIMEI() {
         Activity topTaskActivity = ActivityManager.Companion.getInstance().getTopTaskActivity();
-        if (!checkHasAgreeSecret()) {
-            return "";
-        }
+        if (checkHasAgreeSecret()) {
             try {
                 String imei = "";
                 RxPermissions rxPermissions = new RxPermissions(topTaskActivity);
@@ -132,7 +130,7 @@ public class DeviceTool {
                 if (rxPermissions.isGranted(Manifest.permission.READ_PHONE_STATE)) {
                     //实例化TelephonyManager对象
                     TelephonyManager telephonyManager = (TelephonyManager) topTaskActivity.getSystemService(Context.TELEPHONY_SERVICE);
-                if (null == telephonyManager){
+                    if (null == telephonyManager) {
                         return "";
                     }
                     //获取IMEI号
@@ -147,7 +145,9 @@ public class DeviceTool {
                 e.printStackTrace();
                 return "";
             }
-
+        } else {
+            return "";
+        }
     }
     /**
      * 检查是否同意隐私协议
@@ -162,9 +162,7 @@ public class DeviceTool {
 
 
     public static String getEncryptionAndroidID() {
-        if (!checkHasAgreeSecret()) {
-            return "";
-        }
+        if (checkHasAgreeSecret()) {
             try {
                 @SuppressLint("HardwareIds") String id = Settings.Secure.getString(
                         RxTool.getContext().getContentResolver(),
@@ -174,11 +172,14 @@ public class DeviceTool {
             } catch (Exception e) {
                 return "";
             }
-    }
-    public static String getAndroidID() {
-        if (!checkHasAgreeSecret()) {
+
+        }else {
             return "";
         }
+
+    }
+    public static String getAndroidID() {
+        if (checkHasAgreeSecret()) {
             try {
                 @SuppressLint("HardwareIds") String id = Settings.Secure.getString(
                         RxTool.getContext().getContentResolver(),
@@ -188,6 +189,10 @@ public class DeviceTool {
             } catch (Exception e) {
                 return "";
             }
+
+        } else {
+            return "";
+        }
     }
 
     //没有网络连接
@@ -269,11 +274,8 @@ public class DeviceTool {
     }
 
     public static String getMac(Context context) {
-        if (!checkHasAgreeSecret()) {
-            return "02:00:00:00:00:00";
-        }
+        if (checkHasAgreeSecret()) {
             String strMac = null;
-
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
                 strMac = getLocalMacAddressFromWifiInfo(context);
                 return strMac;
@@ -293,21 +295,22 @@ public class DeviceTool {
                     return strMac;
                 }
             }
-
+        }
         return "02:00:00:00:00:00";
+
     }
     /*
     * 获取MAC地址
     *GPRS链接和WIFI链接返回同一个MAC地址
     * */
     public static String getMacFromHardware() {
-        if (!checkHasAgreeSecret()) {
-            return "02:00:00:00:00:00";
-        }
+        if (checkHasAgreeSecret()) {
             try {
                 List<NetworkInterface> all = Collections.list(NetworkInterface.getNetworkInterfaces());
                 for (NetworkInterface nif : all) {
-                if (!nif.getName().equalsIgnoreCase("wlan0")) continue;
+                    if (!nif.getName().equalsIgnoreCase("wlan0")) {
+                        continue;
+                    }
 
                     byte[] macBytes = nif.getHardwareAddress();
                     if (macBytes == null) {
@@ -327,7 +330,9 @@ public class DeviceTool {
             } catch (Exception e) {
                 e.printStackTrace();
             }
+        }
         return "02:00:00:00:00:00";
+
     }
     /**
      *
@@ -351,11 +356,8 @@ public class DeviceTool {
      * @return
      */
     public static String getLocalWifiIpAddress(Context context) {
-        if (!checkHasAgreeSecret()) {
-            return "隐私协议未同意，不让获取";
-        }
+        if (checkHasAgreeSecret()) {
             try {
-
                 WifiManager wifiManager = (WifiManager) context
                         .getSystemService(Context.WIFI_SERVICE);
                 WifiInfo wifiInfo = wifiManager.getConnectionInfo();
@@ -364,14 +366,16 @@ public class DeviceTool {
             } catch (Exception ex) {
                 return " 获取IP出错鸟!!!!请保证是WIFI,或者请重新打开网络!\n" + ex.getMessage();
             }
-        // return null;
+        }else {
+            return "隐私协议未同意，不让获取";
+        }
     }
 
-    //GPRS连接下的ip
+    /**
+     * GPRS连接下的ip
+     * */
     public static String getLocalGPRSIpAddress() {
-        if (!checkHasAgreeSecret()) {
-            return null;
-        }
+        if (checkHasAgreeSecret()) {
             try {
                 for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements(); ) {
                     NetworkInterface intf = en.nextElement();
@@ -385,6 +389,8 @@ public class DeviceTool {
             } catch (SocketException ex) {
                 Log.e("WifiPreferenceIpAddress", ex.toString());
             }
+        }
+
         return null;
     }
 
@@ -393,9 +399,7 @@ public class DeviceTool {
      * @return
      */
     public static String getNewMac() {
-        if (!checkHasAgreeSecret()) {
-            return null;
-        }
+        if (checkHasAgreeSecret()) {
             try {
                 List<NetworkInterface> all = Collections.list(NetworkInterface.getNetworkInterfaces());
                 for (NetworkInterface nif : all) {
@@ -419,53 +423,46 @@ public class DeviceTool {
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
-        return null;
         }
-    public static String getLocalMacAddressFromWifiInfo(Context context) {
-        if (!checkHasAgreeSecret()) {
         return null;
     }
+
+    public static String getLocalMacAddressFromWifiInfo(Context context) {
+        if (checkHasAgreeSecret()) {
             WifiManager wifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
             WifiInfo winfo = wifi.getConnectionInfo();
             String mac = winfo.getMacAddress();
             return mac;
 
+        } else {
+            return null;
+        }
     }
     /*
     * 获取IPV6地址
     * */
     public static String getLocalIpV6() {
-        if (!checkHasAgreeSecret()) {
-            return null;
-        }
+        if (checkHasAgreeSecret()) {
             try {
                 for (Enumeration<NetworkInterface> en = NetworkInterface
                         .getNetworkInterfaces(); en.hasMoreElements(); ) {
                     NetworkInterface intf = en.nextElement();
                     for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements(); ) {
                         InetAddress inetAddress = enumIpAddr.nextElement();
-                    // logger.error("ip1       " + inetAddress);
-                 /*   logger.error("getHostName  " + inetAddress.getHostName());
-                    logger.error("getCanonicalHostName  " + inetAddress.getCanonicalHostName());
-                    logger.error("getAddress  " + Arrays.toString(inetAddress.getAddress()));
-                    logger.error("getHostAddress  " + inetAddress.getHostAddress());*/
-
                         if (!inetAddress.isLoopbackAddress() && inetAddress instanceof Inet6Address) {
                             return inetAddress.getHostAddress();
                         }
-
-
                     }
                 }
             } catch (Exception ex) {
                 Log.e("IP Address", ex.toString());
             }
-        return null;
         }
-    public static String getMacAddress(Context context) {
-        if (!checkHasAgreeSecret()) {
         return null;
     }
+
+    public static String getMacAddress(Context context) {
+        if (checkHasAgreeSecret()) {
             // 如果是6.0以下，直接通过wifimanager获取
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
                 String macAddress0 = getMacAddress0(context);
@@ -499,16 +496,16 @@ public class DeviceTool {
                     Log.e("----->" + "NetInfoManager",
                             "getMacAddress:" + e.toString());
                 }
-
             }
             return macSerial;
-    }
 
-    private static String getMacAddress0(Context context) {
-        if (!checkHasAgreeSecret()) {
+        } else {
             return null;
         }
+    }
 
+    private static String getMacAddress0(Context context) {
+        if (checkHasAgreeSecret()) {
             if (isAccessWifiStateAuthorized(context)) {
                 WifiManager wifiMgr = (WifiManager) context
                         .getSystemService(Context.WIFI_SERVICE);
@@ -520,10 +517,9 @@ public class DeviceTool {
                     Log.e("----->" + "NetInfoManager",
                             "getMacAddress0:" + e.toString());
                 }
-
+            }
         }
         return "";
-
     }
 
     /**
@@ -567,10 +563,8 @@ public class DeviceTool {
      * @return
      */
     public static String getMacAddress() {
-        if (!checkHasAgreeSecret()) {
-            return null;
-        }
         String strMacAddr = null;
+        if (checkHasAgreeSecret()) {
             try {
                 // 获得IpD地址
                 InetAddress ip = getLocalInetAddress();
@@ -586,6 +580,8 @@ public class DeviceTool {
                 }
                 strMacAddr = buffer.toString().toUpperCase();
             } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         return strMacAddr;
     }
@@ -595,10 +591,8 @@ public class DeviceTool {
      * @return
      */
     private static InetAddress getLocalInetAddress() {
-        if (!checkHasAgreeSecret()) {
-            return null;
-        }
         InetAddress ip = null;
+        if (checkHasAgreeSecret()) {
             try {
                 // 列举
                 Enumeration<NetworkInterface> en_netInterface = NetworkInterface
@@ -610,11 +604,12 @@ public class DeviceTool {
                     while (en_ip.hasMoreElements()) {
                         ip = en_ip.nextElement();
                         if (!ip.isLoopbackAddress()
-                            && ip.getHostAddress().indexOf(":") == -1)
+                                && ip.getHostAddress().indexOf(":") == -1) {
                             break;
-                    else
+                        } else {
                             ip = null;
                         }
+                    }
 
                     if (ip != null) {
                         break;
@@ -624,6 +619,7 @@ public class DeviceTool {
 
                 e.printStackTrace();
             }
+        }
         return ip;
     }
 
@@ -633,9 +629,7 @@ public class DeviceTool {
      * @return
      */
     public static String getLocalIpAddress() {
-        if (!checkHasAgreeSecret()) {
-            return null;
-        }
+        if (checkHasAgreeSecret()) {
             try {
                 for (Enumeration<NetworkInterface> en = NetworkInterface
                         .getNetworkInterfaces(); en.hasMoreElements(); ) {
@@ -651,20 +645,20 @@ public class DeviceTool {
             } catch (SocketException ex) {
                 ex.printStackTrace();
             }
+        }
         return null;
     }
 
     public static String getMachineHardwareAddress() {
-        if (!checkHasAgreeSecret()) {
-            return null;
-        }
+        String hardWareAddress = null;
+        if (checkHasAgreeSecret()) {
             Enumeration<NetworkInterface> interfaces = null;
             try {
                 interfaces = NetworkInterface.getNetworkInterfaces();
             } catch (SocketException e) {
                 e.printStackTrace();
             }
-        String hardWareAddress = null;
+
             NetworkInterface iF = null;
             if (interfaces == null) {
                 return null;
@@ -679,6 +673,7 @@ public class DeviceTool {
                     e.printStackTrace();
                 }
             }
+        }
         return hardWareAddress;
     }
 
@@ -703,10 +698,8 @@ public class DeviceTool {
     }
 
     public static String getLocalMacAddressFromBusybox() {
-        if (!checkHasAgreeSecret()) {
-            return "";
-        }
         String result = "";
+        if (checkHasAgreeSecret()) {
             String Mac = "";
             result = callCmd("busybox ifconfig", "HWaddr");
             // 如果返回的result == null，则说明网络不可取
@@ -720,6 +713,7 @@ public class DeviceTool {
                         result.length() - 1);
                 result = Mac;
             }
+        }
         return result;
     }
 

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/YdlBuryPointUtil.java

@@ -5,7 +5,6 @@ import android.util.Log;
 
 import com.umeng.analytics.MobclickAgent;
 import com.ydl.burypointlib.BuryPointHelper;
-//import com.ydl.devicesidlib.DemoHelper;
 import com.ydl.devicesidlib.DeviceIDHelper;
 import com.ydl.pushserver.pushagent.YdlPushAgent;
 import com.ydl.pushserver.pushagent.common.listener.IYDLPushListener;
@@ -18,6 +17,8 @@ import com.yidianling.common.tools.RxAppTool;
 import com.yidianling.common.tools.RxDeviceTool;
 import com.yidianling.common.tools.RxNetTool;
 
+import static com.ydl.ydlcommon.utils.DeviceTool.checkHasAgreeSecret;
+
 //import static com.bun.miitmdid.content.ContextKeeper.getApplicationContext;
 //import com.ydl.burypointlib.BuryPointHelper;
 
@@ -43,7 +44,10 @@ public class YdlBuryPointUtil {
             RegisterEventBean registerEventBean = new RegisterEventBean();
             registerEventBean.setAppId(context.getPackageName());
             registerEventBean.setAppVersion(RxAppTool.getAppVersionName(context));
-                    String deviceId = DeviceIDHelper.getInstance().getDeviceId();
+            String deviceId = "";
+            if (checkHasAgreeSecret()) {
+                deviceId = DeviceIDHelper.getInstance().getDeviceId();
+            }
             registerEventBean.setDeviceId(deviceId);
             registerEventBean.setManufacturer(RxDeviceTool.getBuildMANUFACTURER());
             registerEventBean.setChannel(YdlCommonOut.Companion.getChannelName());
@@ -92,7 +96,10 @@ public class YdlBuryPointUtil {
             RegisterEventBean registerEventBean = new RegisterEventBean();
             registerEventBean.setAppId(context.getPackageName());
             registerEventBean.setAppVersion(RxAppTool.getAppVersionName(context));
-            String deviceId = DeviceIDHelper.getInstance().getDeviceId();
+            String deviceId ="";
+            if (checkHasAgreeSecret()) {
+                deviceId = DeviceIDHelper.getInstance().getDeviceId();
+            }
             registerEventBean.setDeviceId(deviceId);
             registerEventBean.setManufacturer(RxDeviceTool.getBuildMANUFACTURER());
             registerEventBean.setChannel(YdlCommonOut.Companion.getChannelName());

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/actionutil/ActionCountUtils.kt

@@ -151,6 +151,7 @@ class ActionCountUtils {
                 * 第一次安装获取失败，第二次打开就能成功
                 * 所以Utils.getIMEI(topTaskActivity)传入activity解决这个问题
                 * */
+                if (DeviceTool.checkHasAgreeSecret()){
                     deviceId = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
                         val topTaskActivity = ActivityManager.getInstance().getTopTaskActivity()
                         //获取imei
@@ -159,6 +160,8 @@ class ActionCountUtils {
                         //android Q及以上取oaid
                         DeviceIDHelper.getInstance().deviceId
                     }
+                }
+
                 actionDataParams.deviceId(deviceId)
                 signs.forEachIndexed { index, s ->
                     //拓展参数个数确定，暂不使用反射调用
@@ -266,6 +269,8 @@ class ActionCountUtils {
                 * 第一次安装获取失败，第二次打开就能成功
                 * 所以Utils.getIMEI(topTaskActivity)传入activity解决这个问题
                 * */
+
+                if (DeviceTool.checkHasAgreeSecret()){
                     deviceId = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
                         val topTaskActivity = ActivityManager.getInstance().getTopTaskActivity()
                         //获取imei
@@ -274,6 +279,8 @@ class ActionCountUtils {
                         //android Q及以上取oaid
                         DeviceIDHelper.getInstance().deviceId
                     }
+                }
+
                 baiduActionDataParams.deviceId(deviceId)
                 baiduActionDataParams.convertType(convertType)
                 baiduActionDataParams.convertTime(System.currentTimeMillis() / 1000)
@@ -342,7 +349,9 @@ class ActionCountUtils {
             actionDataParams.sign2 = sign2
             actionDataParams.api = api
             actionDataParams.appVersion(RxDeviceTool.getAppVersionName(BaseApp.getApp()))
-            val deviceId = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
+            var deviceId = ""
+            if (DeviceTool.checkHasAgreeSecret()){
+                deviceId = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
                     val topTaskActivity = ActivityManager.getInstance().getTopTaskActivity()
                     //获取imei
                     Utils.getIMEI(topTaskActivity)
@@ -350,6 +359,8 @@ class ActionCountUtils {
                     //android Q及以上取oaid
                     DeviceIDHelper.getInstance().deviceId
                 }
+            }
+
             actionDataParams.deviceId=deviceId
 
             actionDataParams.time(System.currentTimeMillis())
@@ -388,7 +399,9 @@ class ActionCountUtils {
             actionDataParams.sign2 = sign2
             actionDataParams.sign3 = sign3
             actionDataParams.appVersion(RxDeviceTool.getAppVersionName(BaseApp.getApp()))
-            val deviceId = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
+            var deviceId = ""
+            if (DeviceTool.checkHasAgreeSecret()) {
+                deviceId = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
                     val topTaskActivity = ActivityManager.getInstance().getTopTaskActivity()
                     //获取imei
                     Utils.getIMEI(topTaskActivity)
@@ -396,7 +409,8 @@ class ActionCountUtils {
                     //android Q及以上取oaid
                     DeviceIDHelper.getInstance().deviceId
                 }
-            actionDataParams.deviceId=deviceId
+            }
+            actionDataParams.deviceId = deviceId
 
             actionDataParams.time(System.currentTimeMillis())
             actionDataParams.appId(appId)
@@ -434,10 +448,7 @@ class ActionCountUtils {
          * @return
          */
         fun getIpAddress(context: Context): String {
-
-            if (!DeviceTool.checkHasAgreeSecret()) {
-                return ""
-            }
+            if (DeviceTool.checkHasAgreeSecret()) {
                 // 获取WiFi服务
                 val wifiManager = context.getSystemService(Context.WIFI_SERVICE) as WifiManager
                 // 判断WiFi是否开启
@@ -451,6 +462,8 @@ class ActionCountUtils {
                     return getIpAddress()
                 }
             }
+            return ""
+        }
 
         private fun intToIp(ipAddress: Int): String {
             return (ipAddress and 0xFF).toString() + "." +

ydl-utils/src/main/java/com/yidianling/common/tools/RxDeviceTool.java

@@ -161,64 +161,6 @@ public class RxDeviceTool {
     }
 
     /**
-     * IMEI （唯一标识序列号）
-     * <p>需与{@link #isPhone(Context)}一起使用</p>
-     * <p>需添加权限 {@code <uses-permission android:name="android.permission.READ_PHONE_STATE"/>}</p>
-     *
-     * @param context 上下文
-     * @return IMEI
-     */
-//    public static String getIMEI(Context context) {
-//        String deviceId;
-//        if (isPhone(context)) {
-//            deviceId = getDeviceIdIMEI(context);
-//        } else {
-//            deviceId = getAndroidId(context);
-//        }
-//        return deviceId;
-//    }
-
-    /**
-     * 获取设备的IMSI
-     *
-     * @param context
-     * @return
-     */
-//    public static String getIMSI(Context context) {
-//        return getSubscriberId(context);
-//    }
-
-    /**
-     * 获取设备的IMEI
-     *
-     * @param context
-     * @return
-     */
-//    public static String getDeviceIdIMEI(Context context) {
-//        String id;
-//        //android.telephony.TelephonyManager
-//        TelephonyManager mTelephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-//        if (mTelephony.getDeviceId() != null) {
-//            id = mTelephony.getDeviceId();
-//        } else {
-//            //android.provider.Settings;
-//            id = Settings.Secure.getString(context.getApplicationContext().getContentResolver(), Settings.Secure.ANDROID_ID);
-//        }
-//        return id;
-//    }
-
-    /**
-     * 获取设备的软件版本号
-     *
-     * @param context
-     * @return
-     */
-//    public static String getDeviceSoftwareVersion(Context context) {
-//        TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-//        return tm.getDeviceSoftwareVersion();
-//    }
-
-    /**
      * 获取android系统版本号
      */
     public static String getOsBuileVersion(){
@@ -226,17 +168,6 @@ public class RxDeviceTool {
     }
 
     /**
-     * 获取手机号
-     *
-     * @param context
-     * @return
-     */
-//    public static String getLine1Number(Context context) {
-//        TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-//        return tm.getLine1Number();
-//    }
-
-    /**
      * 获取ISO标准的国家码，即国际长途区号
      *
      * @param context