Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

assets/resources/game/prefab/uiPanel/PauseUI.prefab

@@ -900,7 +900,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 300,
+      "width": 320,
       "height": 70
     },
     "_anchorPoint": {
@@ -1302,7 +1302,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 300,
+      "width": 320,
       "height": 70
     },
     "_anchorPoint": {

assets/resources/module/blessingBag/blessingBag.prefab

@@ -8261,7 +8261,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 2

assets/resources/module/cashNormal/cashNormal.prefab

@@ -1800,7 +1800,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 37

assets/resources/module/help/help.prefab

@@ -716,7 +716,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 3

assets/resources/module/login/login.prefab

@@ -21,20 +21,23 @@
         "__id__": 2
       },
       {
-        "__id__": 5
+        "__id__": 6
       },
       {
-        "__id__": 9
+        "__id__": 10
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 43
+      },
+      {
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -95,10 +98,13 @@
     "_components": [
       {
         "__id__": 3
+      },
+      {
+        "__id__": 4
       }
     ],
     "_prefab": {
-      "__id__": 4
+      "__id__": 5
     },
     "_opacity": 255,
     "_color": {
@@ -190,6 +196,35 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": {
+      "__id__": 1
+    },
+    "_alignFlags": 4,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -211,14 +246,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 6
+        "__id__": 7
       },
       {
-        "__id__": 7
+        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 9
     },
     "_opacity": 255,
     "_color": {
@@ -272,7 +307,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 5
+      "__id__": 6
     },
     "_enabled": true,
     "_materials": [
@@ -304,11 +339,13 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 5
+      "__id__": 6
     },
     "_enabled": true,
     "alignMode": 1,
-    "_target": null,
+    "_target": {
+      "__id__": 1
+    },
     "_alignFlags": 1,
     "_left": 0,
     "_right": 0,
@@ -346,23 +383,23 @@
     },
     "_children": [
       {
-        "__id__": 10
+        "__id__": 11
       },
       {
-        "__id__": 13
+        "__id__": 14
       },
       {
-        "__id__": 25
+        "__id__": 26
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 42
     },
     "_opacity": 255,
     "_color": {
@@ -416,17 +453,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 9
+      "__id__": 10
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 12
+      "__id__": 13
     },
     "_opacity": 255,
     "_color": {
@@ -480,7 +517,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "_materials": [
@@ -511,10 +548,10 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 13
+      "__id__": 1
     },
     "asset": {
-      "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
+      "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
     "fileId": "39wNmXM8NI4q4sJUt5JvJu",
     "sync": false
@@ -524,24 +561,24 @@
     "_name": "progressbar",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 9
+      "__id__": 10
     },
     "_children": [
       {
-        "__id__": 14
+        "__id__": 15
       },
       {
-        "__id__": 17
+        "__id__": 18
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 25
     },
     "_opacity": 255,
     "_color": {
@@ -595,17 +632,17 @@
     "_name": "jindu1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 13
+      "__id__": 14
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 17
     },
     "_opacity": 255,
     "_color": {
@@ -659,7 +696,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 15
     },
     "_enabled": true,
     "_materials": [
@@ -689,7 +726,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 13
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -702,21 +739,21 @@
     "_name": "jindu2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 13
+      "__id__": 14
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 19
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -770,17 +807,17 @@
     "_name": "jindu2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 18
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -834,7 +871,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_materials": [
@@ -864,7 +901,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 13
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -877,7 +914,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [
@@ -897,7 +934,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 13
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -910,18 +947,18 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 13
+      "__id__": 14
     },
     "_enabled": true,
     "bar": {
-      "__id__": 19
+      "__id__": 20
     },
     "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 13
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -934,30 +971,30 @@
     "_name": "New Layout",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 9
+      "__id__": 10
     },
     "_children": [
       {
-        "__id__": 26
+        "__id__": 27
       },
       {
-        "__id__": 29
+        "__id__": 30
       },
       {
-        "__id__": 32
+        "__id__": 33
       },
       {
-        "__id__": 35
+        "__id__": 36
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1011,17 +1048,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 26
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 29
     },
     "_opacity": 200,
     "_color": {
@@ -1075,7 +1112,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 27
     },
     "_enabled": true,
     "_materials": [
@@ -1119,17 +1156,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 26
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 32
     },
     "_opacity": 200,
     "_color": {
@@ -1183,7 +1220,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 30
     },
     "_enabled": true,
     "_materials": [
@@ -1227,17 +1264,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 26
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 35
     },
     "_opacity": 200,
     "_color": {
@@ -1291,7 +1328,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 33
     },
     "_enabled": true,
     "_materials": [
@@ -1335,17 +1372,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 26
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 38
     },
     "_opacity": 200,
     "_color": {
@@ -1399,7 +1436,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 36
     },
     "_enabled": true,
     "_materials": [
@@ -1443,7 +1480,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 26
     },
     "_enabled": true,
     "_layoutSize": {
@@ -1486,7 +1523,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 10
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1528,20 +1565,49 @@
     },
     "_enabled": true,
     "bar": {
-      "__id__": 23
+      "__id__": 24
     },
     "lbl_progress": {
-      "__id__": 11
+      "__id__": 12
     },
     "lbl_server": {
-      "__id__": 30
+      "__id__": 31
     },
     "lbl_privacy": {
-      "__id__": 36
+      "__id__": 37
     },
     "_id": ""
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": {
+      "__id__": 1
+    },
+    "_alignFlags": 5,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 1334,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/resources/module/moreGame/moreGamePopNode.prefab

@@ -772,7 +772,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 2

assets/resources/module/pigBank/pigBank.prefab

@@ -2297,7 +2297,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": null,
     "bClickClose": false,

assets/resources/module/receiptNotice/receiptNotice.prefab

@@ -2317,7 +2317,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": null,
     "bClickClose": false,

assets/resources/module/redBagCash/redBagCash.prefab

@@ -2319,7 +2319,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": null,
     "bClickClose": false,

assets/resources/module/redBagCode/redBagCode.prefab

@@ -1082,7 +1082,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 3

assets/resources/module/redCode/redCode.prefab

@@ -3993,7 +3993,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 3

assets/resources/module/redeem/RedeemNode.prefab

@@ -9723,7 +9723,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 3

assets/resources/module/reward/reward.prefab

@@ -4367,7 +4367,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": null,
     "bClickClose": false,

assets/resources/module/reward/rewardLuck.prefab

@@ -4367,7 +4367,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 71

assets/resources/module/reward/rewardMission.prefab

@@ -4395,7 +4395,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": null,
     "bClickClose": false,

assets/resources/module/setting/setting.prefab

@@ -3068,7 +3068,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 180
+      "a": 230
     },
     "design_block_node": null,
     "bClickClose": false,

assets/resources/module/sign/sign.prefab

@@ -1793,7 +1793,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 3

assets/resources/module/turnable/texture/zhuanpan2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b9aad7ee-6434-403a-a2da-f67498d26f41",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 548,
+  "height": 535,
+  "platformSettings": {},
+  "subMetas": {
+    "zhuanpan2": {
+      "ver": "1.0.4",
+      "uuid": "9c29fcc0-719a-4e02-b665-f166d60a1279",
+      "rawTextureUuid": "b9aad7ee-6434-403a-a2da-f67498d26f41",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 548,
+      "height": 535,
+      "rawWidth": 548,
+      "rawHeight": 535,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/music/bgm.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "f77ecb31-e3b7-40ef-9acc-6d65df909e02",
   "downloadMode": 0,
-  "duration": 159.320816,
+  "duration": 34.507755,
   "subMetas": {}
 }

assets/script/before/GamePlay.ts

@@ -453,7 +453,7 @@ export default class GamePlay extends cc.Component {
         this.curPropType = PROPTYPE.Reset;
 
         let resetPropNum = gData.gameData.getProp(GameProp.resetPropNum);
-        if (resetPropNum) {
+        if (!resetPropNum || resetPropNum <= 0) {
             mk.ui.openPanel("game/prefab/uiPanel/GetPropUI");
             return;
         }
@@ -492,7 +492,7 @@ export default class GamePlay extends cc.Component {
         this.curPropType = PROPTYPE.Hammer;
 
         let hammerPropNum = gData.gameData.getProp(GameProp.hammerPropNum);
-        if (hammerPropNum<= 0) {
+        if (!hammerPropNum || hammerPropNum <= 0) {
             mk.ui.openPanel("game/prefab/uiPanel/GetPropUI");
             return;
         }
@@ -510,7 +510,7 @@ export default class GamePlay extends cc.Component {
 
         this.curPropType = PROPTYPE.Change;
         let changePropNum = gData.gameData.getProp(GameProp.changePropNum);
-        if (changePropNum <= 0) {
+        if (!changePropNum || changePropNum <= 0) {
             mk.ui.openPanel("game/prefab/uiPanel/GetPropUI");
             return;
         }

assets/script/before/view/PauseUI.ts

@@ -72,16 +72,13 @@ export default class PauseUI extends cc.Component {
 
     //初始化
     initMsuicSwitchState() {
-        // this.node_music_on.active = AudioMgr.Inst.getSwitchMusic();
-        // this.node_music_off.active = !this.node_music_on.active
-
-
+        this.node_music_on.active = mk.audio.getSwitchMusic();
+        this.node_music_off.active = !this.node_music_on.active
     }
 
     initEffectSwitchState() {
-        mk.console.log("初始化开关！！！！！！！！！！！！！！！")
-        // this.node_effect_on.active = AudioMgr.Inst.getSwitchEffect();
-        // this.node_effect_off.active = !this.node_effect_on.active;
+        this.node_effect_on.active = mk.audio.getSwitchEffect();
+        this.node_effect_off.active = !this.node_effect_on.active;
     }
 
     initEvent() {
@@ -122,13 +119,13 @@ export default class PauseUI extends cc.Component {
     }
 
     onClickMusicSwitch() {
-        // AudioMgr.Inst.turnSwitchMusic();
-        // this.initMsuicSwitchState();
+        mk.audio.switchMusicFunc();
+        this.initMsuicSwitchState();
     }
 
     onClickEffectSwitch() {
-        // AudioMgr.Inst.turnSwitchEffect();
-        // this.initEffectSwitchState();
+        mk.audio.switchEffectFunc();
+        this.initEffectSwitchState();
     }
 
     onClickRestartBtn() {
@@ -139,7 +136,7 @@ export default class PauseUI extends cc.Component {
 
     onClickExitBtn() {
         GameMgr.Inst.sendEvent(UI_NAME.PauseUI, "点击退出按钮");
-  
+
         mk.ui.closePanel("PauseUI")
         GamePlay.Inst.restart(false);//退出不扣体力
         GamePlay.Inst.node.active = false;

assets/script/before/view/uiItem/CellItem.ts

@@ -100,7 +100,7 @@ export default class CellItem extends cc.Component {
                 //现在(配置就对照游戏真实的布局)
                 type = GameConst.config_level[level][this.y][this.x];
             }
-          
+
             if (type) {
                 this.type = type;
             }
@@ -356,7 +356,7 @@ export default class CellItem extends cc.Component {
                 node_scoreEnergy.getComponent(ScoreEnergy).init(x, y, score);
                 GamePlay.Inst.node_effectUI.addChild(node_scoreEnergy);
 
-                if (this.spr_redPackIcon.node.active) {
+                if (this.spr_redPackIcon.node.active && GamePlay.Inst.finalGetScore < GamePlay.Inst.targetScore) {
                     mk.ui.openPanel("module/reward/rewardLuck");
                 }
             }

assets/script/before/view/uiItem/SelectCellItemBtn.ts

@@ -25,7 +25,7 @@ export default class SelectCellItemBtn extends cc.Component {
         this.spr_icon.node.width = 70;
         this.spr_icon.node.height = 70;
 
-        mk.loader.load(`game/texture/${GameConst.iconIndex}/${this.type}`, cc.SpriteFrame).then((spriteFrame) => {
+        mk.loader.load(`game/texture/cellItemIcon/${GameConst.iconIndex}/${this.type}`, cc.SpriteFrame).then((spriteFrame) => {
             this.spr_icon.spriteFrame = spriteFrame;
         })
     }

assets/script/game/module/turntable/Turnable.ts

@@ -114,6 +114,7 @@ export default class Turnable extends cc.Component {
 
             if (this.node_turn.angle <= this.endAngle) {
                 this.startDraw = false;
+                this.playOver();
             }
         }
     }

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stdout.txt

@@ -1,4 +1,2 @@
 Android NDK: WARNING: Unsupported source file extensions in D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x/cocos/Android.mk for module cocos2dx_static    
 Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/RecyclePool.hpp    
-[armeabi-v7a] Compile++ arm  : cocos2djs <= AppDelegate.cpp
-[armeabi-v7a] SharedLibrary  : libcocos2djs.so

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/util/DeviceUtil.java

@@ -17,6 +17,9 @@ import org.cocos2dx.javascript.thirdSdk.oaid.OaidHelper;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
+import java.net.NetworkInterface;
+import java.util.Collections;
+import java.util.List;
 
 public class DeviceUtil {
 
@@ -99,14 +102,18 @@ public class DeviceUtil {
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             Log.e("=====", "7.0以上");
             strMac = getMac();
+            Log.e("=====",Build.VERSION.SDK_INT +"");
+            Log.e("=====",strMac);
+            String  strMac1= getNewMac();
+            Log.e("=====",strMac1);
             return strMac;
         }
         return "02:00:00:00:00:00";
     }
 
     /**
-     * 这是使用adb shell命令来获取mac地址的方式
-     *
+     * 这是使用adb shell命令来获取mac地址的方式(可获取7.0以上 亲测)
+     * @description
      * @return
      */
     public static String getMac() {
@@ -141,7 +148,6 @@ public class DeviceUtil {
 
     /**
      * 根据wifi信息获取本地mac
-     *
      * @param context
      * @return
      */
@@ -160,6 +166,37 @@ public class DeviceUtil {
     }
 
     /**
+     * 通过网络接口取 (7.0以上可用 亲测)（暂时不用）
+     * @return
+     */
+    private static String getNewMac() {
+        try {
+            List<NetworkInterface> all = Collections.list(NetworkInterface.getNetworkInterfaces());
+            for (NetworkInterface nif : all) {
+                if (!nif.getName().equalsIgnoreCase("wlan0")) continue;
+
+                byte[] macBytes = nif.getHardwareAddress();
+                if (macBytes == null) {
+                    return null;
+                }
+
+                StringBuilder res1 = new StringBuilder();
+                for (byte b : macBytes) {
+                    res1.append(String.format("%02X:", b));
+                }
+
+                if (res1.length() > 0) {
+                    res1.deleteCharAt(res1.length() - 1);
+                }
+                return res1.toString();
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
      * 获取当前手机系统版本号
      *
      * @return 系统版本号