fix bug

app/src/main/java/com/emato/ich/update/InstallResultReceiver.java

@@ -18,24 +18,16 @@ public class InstallResultReceiver extends BroadcastReceiver {
     private static final String TAG = InstallResultReceiver.class.getName();
     @Override
     public void onReceive(Context context, Intent intent) {
-        try {
-            Log.i(TAG, "onReceive: "+intent.getIntExtra(PackageInstaller.EXTRA_STATUS,PackageInstaller.STATUS_FAILURE));
+        Log.i(TAG, "onReceive: "+intent.getIntExtra(PackageInstaller.EXTRA_STATUS,PackageInstaller.STATUS_FAILURE));
 
-            Intent intent1 = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
-            PendingIntent restartIntent = PendingIntent.getActivity(context, 0, intent1, PendingIntent.FLAG_ONE_SHOT);
-            AlarmManager mgr = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+        Intent intent1 = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+        PendingIntent restartIntent = PendingIntent.getActivity(context, 0, intent1, PendingIntent.FLAG_ONE_SHOT);
+        AlarmManager mgr = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {// 6.0及以上
-                mgr.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + 10000, restartIntent);
-
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {// 4.4及以上
-                mgr.setExact(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + 10000, restartIntent);
-            }
-        } catch (NullPointerException e) {
-            Log.w(TAG, "安装后启动出现空指针异常！可忽略！");
-        } catch (Exception e) {
-            Log.e(TAG, "安装后启动出现异常！", e);
-            LoggingUtils.sendAppErrorLog("安装后启动出现异常！", e);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {// 6.0及以上
+            mgr.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + 10000, restartIntent);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {// 4.4及以上
+            mgr.setExact(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + 10000, restartIntent);
         }
         /*if (intent != null) {
             final int status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS,PackageInstaller.STATUS_FAILURE);

app/src/main/java/com/emato/ich/utils/BaseUtils.java

@@ -40,6 +40,7 @@ import java.util.concurrent.atomic.AtomicReference;
 public class BaseUtils {
 
     private static final String TAG = "BaseUtils";
+    private static String MAC;
 
     private static String getMac() {
         // TODO 加密传输
@@ -64,7 +65,9 @@ public class BaseUtils {
                 //System.out.println(line);
                 sb.append(line);
             }
-            return sb.toString();
+            String s = sb.toString();
+            MAC = s;
+            return s;
         } catch (IOException e) {
             return "";
         }
@@ -115,7 +118,7 @@ public class BaseUtils {
     }
 
     public static String getClientId() {
-        return Md5Utils.string2Md5_16(getMac()).toUpperCase();
+        return StringUtils.isNullOrEmpty(MAC) ? Md5Utils.string2Md5_16(getMac()).toUpperCase() : Md5Utils.string2Md5_16(MAC).toUpperCase();
 //        return "285F18D92D0B6568";// 8F00B204E9800998
     }