Parcourir la source

修改A133门口机会出现使用标准接口获取的mac和使用定制api获取的mac不一致问题,影响设备注册

weizhengliang il y a 4 mois
Parent
commit
1dcf186b2d

+ 1 - 1
android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/fragment/QrCodeFragment.kt

@@ -68,7 +68,7 @@ class QrCodeFragment : BaseFragment<QrCodeFragmentPresenter, QrCodeLayBinding>()
                 view_qr_code?.setImageBitmap(code)
             }
         }.start()
-        val macAddr = NetHelper.getInstance().macAddress
+        val macAddr = Constant.DEVICE_REGISTER_ID
         val ipAddr = NetHelper.getInstance().localIP
         val buildUrl = UrlManager.build()
         val serverIp =  buildUrl.buyer.substringAfterLast("//").substringBefore(":")

+ 1 - 1
android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/helper/AppInfoDialogHelper.java

@@ -21,7 +21,7 @@ public class AppInfoDialogHelper {
         }
 
         StringBuilder stringBuilder = new StringBuilder();
-        String macAddr = NetHelper.getInstance().getMacAddress();
+        String macAddr = Constant.DEVICE_REGISTER_ID;
         String ipAddr = NetHelper.getInstance().getLocalIP();
         stringBuilder.append("ID: ");
         stringBuilder.append(Constant.DEVICE_ID);

+ 1 - 1
android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/fragment/QrCodeFragment.kt

@@ -68,7 +68,7 @@ class QrCodeFragment : BaseFragment<QrCodeFragmentPresenter, QrCodeLayBinding>()
         rb_qr_code_main.isChecked = true
         showQRCodeImg(R.id.rb_qr_code_main)
 
-        val macAddr = NetHelper.getInstance().macAddress
+        val macAddr = Constant.DEVICE_REGISTER_ID
         val ipAddr = NetHelper.getInstance().localIP
         val buildUrl = UrlManager.build()
         val serverIp =  buildUrl.buyer.substringAfterLast("//").substringBefore(":")

+ 1 - 1
android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/helper/AppInfoDialogHelper.java

@@ -21,7 +21,7 @@ public class AppInfoDialogHelper {
         }
 
         StringBuilder stringBuilder = new StringBuilder();
-        String macAddr = NetHelper.getInstance().getMacAddress();
+        String macAddr = Constant.DEVICE_REGISTER_ID;
         String ipAddr = NetHelper.getInstance().getLocalIP();
         stringBuilder.append("ID: ");
         stringBuilder.append(Constant.DEVICE_ID);