diff --git a/.DS_Store b/.DS_Store
index 7f6faba681beb174e70be157e75bfe481717540f..8a8ba61ad57e3804c29018a44f233518eb19f16e 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Demo/.DS_Store b/Demo/.DS_Store
index 0b1a7a0ec9c87ff5e2e4f43b550d470b78ea2878..7e782b2d70cb293b374a5071924861d5c60ad59a 100755
Binary files a/Demo/.DS_Store and b/Demo/.DS_Store differ
diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/huangli.xcuserdatad/UserInterfaceState.xcuserstate b/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/huangli.xcuserdatad/UserInterfaceState.xcuserstate
index 95f4f0c238515e566c9e3a530445817348132edc..bc22e0ee1c7f7531c7ba03f8999080288340b507 100644
Binary files a/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/huangli.xcuserdatad/UserInterfaceState.xcuserstate and b/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/huangli.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Demo/Demo.xcodeproj/xcuserdata/huangli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Demo/Demo.xcodeproj/xcuserdata/huangli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index fe2b45415124ec4c223006e19defd56850da95d9..b9e506b92a95f3ced94024dc18a94c95e017583d 100644
--- a/Demo/Demo.xcodeproj/xcuserdata/huangli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Demo/Demo.xcodeproj/xcuserdata/huangli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,4 +2,70 @@
 <Bucket
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.m"
+            timestampString = "575367591.8022031"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "87"
+            endingLineNumber = "87"
+            landmarkName = "-location"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../MobileTracking/MobileTracking/Service/MMA_LocationService.m"
+            timestampString = "575366669.91784"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "119"
+            endingLineNumber = "119"
+            landmarkName = "-locationKnown"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../MobileTracking/MobileTracking/Service/MMA_LocationService.m"
+            timestampString = "575366669.918323"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "131"
+            endingLineNumber = "131"
+            landmarkName = "-getCurrentLocation"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.m"
+            timestampString = "576396347.810122"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "32"
+            endingLineNumber = "32"
+            landmarkName = "-macAddress"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>
diff --git a/Demo/Demo/sdkconfig.xml b/Demo/Demo/sdkconfig.xml
index 290a7a126ef3105952195d26c9c449516ebcc681..7600a13c50361fb6ca716f6891591a764716d98c 100644
--- a/Demo/Demo/sdkconfig.xml
+++ b/Demo/Demo/sdkconfig.xml
@@ -443,7 +443,7 @@
                 <!-- 可视化监测采集策略 0 = TrackPositionChanged 位置改变时记录,1 = TrackVisibleChanged 可视改变时记录-->
                 <viewabilityTrackPolicy>1</viewabilityTrackPolicy>
                 <encrypt>
-                    <MAC>raw</MAC>
+                    <MAC>md5</MAC>
                     <IDA>raw</IDA>
                     <IMEI>md5</IMEI>
                     <ANDROIDID>raw</ANDROIDID>
@@ -474,7 +474,7 @@
                     </argument>
                     <argument>
                         <key>MAC</key>
-                        <value>m7</value>
+                        <value>m6a</value>
                         <urlEncode>true</urlEncode>
                         <isRequired>true</isRequired>
                     </argument>
diff --git a/MobileTracking/.DS_Store b/MobileTracking/.DS_Store
index 7a2cf323f03f3cedbf6fdcbe293fb49ef1b1ac85..d959a94235b8c1edd2d43c24101a58e9911b63e5 100755
Binary files a/MobileTracking/.DS_Store and b/MobileTracking/.DS_Store differ
diff --git a/OutputRelease/.DS_Store b/OutputRelease/.DS_Store
index 9d3c3eeef045c3a76b66f415ecc7ebea34d48a6a..d8f27c9a69a48b679ae934b9fcdd24984ca1cedd 100644
Binary files a/OutputRelease/.DS_Store and b/OutputRelease/.DS_Store differ
diff --git a/OutputRelease/sdkconfig.xml b/OutputRelease/sdkconfig.xml
index 290a7a126ef3105952195d26c9c449516ebcc681..7600a13c50361fb6ca716f6891591a764716d98c 100644
--- a/OutputRelease/sdkconfig.xml
+++ b/OutputRelease/sdkconfig.xml
@@ -443,7 +443,7 @@
                 <!-- 可视化监测采集策略 0 = TrackPositionChanged 位置改变时记录,1 = TrackVisibleChanged 可视改变时记录-->
                 <viewabilityTrackPolicy>1</viewabilityTrackPolicy>
                 <encrypt>
-                    <MAC>raw</MAC>
+                    <MAC>md5</MAC>
                     <IDA>raw</IDA>
                     <IMEI>md5</IMEI>
                     <ANDROIDID>raw</ANDROIDID>
@@ -474,7 +474,7 @@
                     </argument>
                     <argument>
                         <key>MAC</key>
-                        <value>m7</value>
+                        <value>m6a</value>
                         <urlEncode>true</urlEncode>
                         <isRequired>true</isRequired>
                     </argument>