From e82652dfb2200ffb8309823051b44d2ddd8b586d Mon Sep 17 00:00:00 2001
From: xu <perelmen>
Date: Wed, 13 Nov 2019 11:39:32 +0800
Subject: [PATCH] app-ht 1. U 调整代码格式 common 1. U 漏传代码

---
 app-ht/modules/device/controllers/DeviceController.php | 31 ++++++++++++++++++++++++++++---
 common/helpers/Utils.php                               | 25 +++++++++++++++++--------
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/app-ht/modules/device/controllers/DeviceController.php b/app-ht/modules/device/controllers/DeviceController.php
index 7a2ac66..6e43b80 100644
--- a/app-ht/modules/device/controllers/DeviceController.php
+++ b/app-ht/modules/device/controllers/DeviceController.php
@@ -5,6 +5,7 @@ namespace app\ht\modules\device\controllers;
 use Yii;
 use yii\base\Exception;
 use yii\data\Pagination;
+use yii\helpers\Url;
 use app\ht\controllers\BaseController;
 use common\helpers\Utils;
 use common\helpers\FileUtil;
@@ -19,7 +20,26 @@ use domain\device\models\Device as DeviceModel;
 use domain\device\CreateBatch;
 
 use stdClass;
-use yii\helpers\Url;
+use function array_unique;
+use function count;
+use function explode;
+use function fclose;
+use function filesize;
+use function fopen;
+use function fgets;
+use function feof;
+use function fwrite;
+use function preg_match;
+use function str_split;
+use function strtotime;
+use function sprintf;
+use function strtolower;
+use function substr;
+use function strpos;
+use function strtoupper;
+use function hexdec;
+use function mb_substr;
+use function mt_rand;
 
 /**
  * 设备管理
@@ -1232,8 +1252,13 @@ class DeviceController extends BaseController
         fclose($fileHandle);
         $returnMac = [];
         foreach ($macList as $k => $v) {
-            if (preg_match('/^[0-9a-fA-F:]{12,18}$/', $v)) {
-                $returnMac[] = strtoupper(trim($v));
+	    $v = trim($v);
+            if (preg_match('/^[0-9a-fA-F:]{12,18}$/', $v)) {            
+                if (false !== strpos($v, ":")) {
+                    $returnMac[] = strtoupper($v);
+                } else {
+                    $returnMac[] = strtoupper(Utils::coverToMacAddress($v));
+                }
             }
         }
 
diff --git a/common/helpers/Utils.php b/common/helpers/Utils.php
index 7b45d4c..1897c1a 100644
--- a/common/helpers/Utils.php
+++ b/common/helpers/Utils.php
@@ -510,7 +510,7 @@ class Utils
     static function macGenerate()
     {
         $adrArray = [ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F" ];
-        $returnMAC = [];
+        $returnMAC = '';
 
         for($i = 1; $i < 13 ; $i++) {
             $index = 0;
@@ -522,17 +522,26 @@ class Utils
                 $index = $indexArray[mt_rand(0, 7)];
             }
 
-            $returnMAC[] = $adrArray[$index];
+            $returnMAC = $returnMAC . $adrArray[$index];
         }
-        $returnStr = '';
-        foreach ($returnMAC as $k => $v) {
 
-            if (0 == ($k % 2) && 0 != $k) {
-                $returnStr = $returnStr.":";
-            }
-            $returnStr = $returnStr.$v;
+        return self::coverToMacAddress($returnMAC);
+    }
+
+    /**
+     * 把mac地址转化为带：的字符串
+     * @param $macStr
+     * @return string
+     */
+    static function coverToMacAddress($macStr)
+    {
+        if (empty($macStr)) {
+            return null;
         }
 
+        $macSplitArr = str_split($macStr, 2);
+        $returnStr = implode(":", $macSplitArr);
+
         return $returnStr;
     }
 }
\ No newline at end of file
--
libgit2 0.21.0