Merge branch 'aeline'

重庆迈尖科技有限公司

2018-09-03 ab456891f000ccd5209c6654b2a14fee2c2f7ee9

Merge branch 'aeline'

# Conflicts:
#	MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate
#	MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

 MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate

Binary files differ

 MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -4,9 +4,25 @@
   version = "2.0">
   <Breakpoints>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x9080;&#x8bf7;/&#x5546;&#x54c1;&#x5206;&#x4eab;/ShonpingShareViewController.m"
            timestampString = "555988233.959499"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "51"
            endingLineNumber = "51"
            landmarkName = "-back:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "No"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            scope = "0"
@@ -19,252 +35,13 @@
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x4f18;&#x60e0;&#x5238;/classificationViewController.m"
            timestampString = "557398515.520295"
            filePath = "MIduo/&#x6570;&#x636e;/lib/ZJScrollPageView/ZJScrollSegmentView.m"
            timestampString = "556443556.3123471"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "147"
            endingLineNumber = "147"
            landmarkName = "-setStatusBarBackgroundColor:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x6570;&#x636e;/lib/ZJScrollPageView/ZJContentView.m"
            timestampString = "556452484.3681279"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "192"
            endingLineNumber = "192"
            landmarkName = "-reload"
            landmarkType = "7">
            <Locations>
               <Location
                  shouldBeEnabled = "Yes"
                  ignoreCount = "0"
                  continueAfterRunningActions = "No"
                  symbolName = "-[ZJContentView reload]"
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/fanliquan/MIduo/%E6%95%B0%E6%8D%AE/lib/ZJScrollPageView/ZJContentView.m"
                  timestampString = "557633214.076292"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "192"
                  endingLineNumber = "192"
                  offsetFromSymbolStart = "20">
               </Location>
               <Location
                  shouldBeEnabled = "Yes"
                  ignoreCount = "0"
                  continueAfterRunningActions = "No"
                  symbolName = "__23-[ZJContentView reload]_block_invoke"
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/fanliquan/MIduo/%E6%95%B0%E6%8D%AE/lib/ZJScrollPageView/ZJContentView.m"
                  timestampString = "557633214.077917"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "193"
                  endingLineNumber = "193"
                  offsetFromSymbolStart = "108">
               </Location>
            </Locations>
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/LoginViewController.m"
            timestampString = "556517749.124685"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "487"
            endingLineNumber = "487"
            landmarkName = "-TaoBaoBound"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/AppDelegate.m"
            timestampString = "557630526.632936"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "613"
            endingLineNumber = "613"
            landmarkName = "-userNotificationCenter:willPresentNotification:withCompletionHandler:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/AppDelegate.m"
            timestampString = "557630526.633334"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "624"
            endingLineNumber = "624"
            landmarkName = "-registerLocalNotification:alertBody:userDict:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/AppDelegate.m"
            timestampString = "557630526.633499"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "647"
            endingLineNumber = "647"
            landmarkName = "-getRequestWithLocalNotificationSleep:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/AppDelegate.m"
            timestampString = "557630526.633657"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "565"
            endingLineNumber = "565"
            landmarkName = "-application:didReceiveLocalNotification:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x6570;&#x636e;/YTHsharedManger.m"
            timestampString = "556518226.882774"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "221"
            endingLineNumber = "221"
            landmarkName = "-LogInForTaoBaoWith:Withblock:"
            landmarkType = "7">
            <Locations>
               <Location
                  shouldBeEnabled = "Yes"
                  ignoreCount = "0"
                  continueAfterRunningActions = "No"
                  symbolName = "__48-[YTHsharedManger LogInForTaoBaoWith:Withblock:]_block_invoke"
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/fanliquan/MIduo/%E6%95%B0%E6%8D%AE/YTHsharedManger.m"
                  timestampString = "557633214.097622"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "221"
                  endingLineNumber = "221"
                  offsetFromSymbolStart = "1068">
               </Location>
               <Location
                  shouldBeEnabled = "Yes"
                  ignoreCount = "0"
                  continueAfterRunningActions = "No"
                  symbolName = "__48-[YTHsharedManger LogInForTaoBaoWith:Withblock:]_block_invoke_2"
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/fanliquan/MIduo/%E6%95%B0%E6%8D%AE/YTHsharedManger.m"
                  timestampString = "557633214.099214"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "222"
                  endingLineNumber = "222"
                  offsetFromSymbolStart = "56">
               </Location>
               <Location
                  shouldBeEnabled = "Yes"
                  ignoreCount = "0"
                  continueAfterRunningActions = "No"
                  symbolName = "__destroy_helper_block_.180"
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/fanliquan/MIduo/%E6%95%B0%E6%8D%AE/YTHsharedManger.m"
                  timestampString = "557633214.100762"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "221"
                  endingLineNumber = "221"
                  offsetFromSymbolStart = "20">
               </Location>
            </Locations>
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x7f51;&#x9875;&#x89c6;&#x56fe;/&#x5546;&#x54c1;&#x8be6;&#x60c5;/GoodDeTrViewController.m"
            timestampString = "556532591.328869"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "663"
            endingLineNumber = "663"
            landmarkName = "-TaoBaoBound"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/AppDelegate.m"
            timestampString = "557630526.633848"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "600"
            endingLineNumber = "600"
            landmarkName = "-userNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/AppDelegate.m"
            timestampString = "557630526.634005"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "581"
            endingLineNumber = "581"
            landmarkName = "-application:didReceiveRemoteNotification:fetchCompletionHandler:"
            startingLineNumber = "68"
            endingLineNumber = "68"
            landmarkName = "-initWithFrame:segmentStyle:delegate:titles:titleDidClick:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>