Merge branch 'master' of ssh://193.112.35.168:29418/haicaojie

重庆迈尖科技有限公司

2018-08-20 99b01ea80df7d097c2c6a0a6da6a31b40c381093

Merge branch 'master' of ssh://193.112.35.168:29418/haicaojie

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

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

@@ -4,95 +4,283 @@
   version = "2.0">
   <Breakpoints>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "No"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"
            timestampString = "555932281.9243211"
            scope = "0"
            stopOnStyle = "0">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/MergeAccountViewController.h"
            timestampString = "555402530.7800241"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "253"
            endingLineNumber = "253"
            landmarkName = "-networkError:"
            startingLineNumber = "28"
            endingLineNumber = "28">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/LoginViewController.m"
            timestampString = "555922261.738368"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "560"
            endingLineNumber = "560"
            landmarkName = "-WeChatHasLoged:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "No"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"
            timestampString = "555932281.924618"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/MineViewController.m"
            timestampString = "555582159.340149"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "263"
            endingLineNumber = "263"
            landmarkName = "-didReceiveMemoryWarning"
            startingLineNumber = "679"
            endingLineNumber = "679"
            landmarkName = "-noticeOrderOrShopCarBackWithLoginVc"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "No"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"
            timestampString = "555932281.9247071"
            filePath = "MIduo/&#x754c;&#x9762;/&#x641c;&#x7d22;/searchDetailViewController.m"
            timestampString = "555588815.727831"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "268"
            endingLineNumber = "268"
            landmarkName = "SJBaseViewController"
            landmarkType = "3">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "No"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"
            timestampString = "555932281.924788"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "269"
            endingLineNumber = "269">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "No"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"
            timestampString = "555932281.924858"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "255"
            endingLineNumber = "255"
            landmarkName = "-networkError:"
            startingLineNumber = "640"
            endingLineNumber = "640"
            landmarkName = "-searchDataWithText:WithPage:WithFilter:WithOrder:WithStartPrice:WithEndPrice:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "No"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"
            timestampString = "555932281.9249279"
            filePath = "../SGNetObserver-master/SGNetObserver/SGNetObserver.m"
            timestampString = "555902137.230881"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "269"
            endingLineNumber = "269">
            startingLineNumber = "77"
            endingLineNumber = "77"
            landmarkName = "-networkStatusDidChanged"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/SJUnbindPhoneViewController.m"
            timestampString = "555922371.278873"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "101"
            endingLineNumber = "101"
            landmarkName = "-unBindPhonewithPhoneString:"
            landmarkType = "7">
            <Locations>
               <Location
                  shouldBeEnabled = "Yes"
                  ignoreCount = "0"
                  continueAfterRunningActions = "No"
                  symbolName = "__58-[SJUnbindPhoneViewController unBindPhonewithPhoneString:]_block_invoke"
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/haicaojie/MIduo/%E7%95%8C%E9%9D%A2/%E6%88%91%E7%9A%84/SJUnbindPhoneViewController.m"
                  timestampString = "555929976.738608"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "101"
                  endingLineNumber = "101"
                  offsetFromSymbolStart = "508">
               </Location>
               <Location
                  shouldBeEnabled = "Yes"
                  ignoreCount = "0"
                  continueAfterRunningActions = "No"
                  symbolName = "__58-[SJUnbindPhoneViewController unBindPhonewithPhoneString:]_block_invoke_2"
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/haicaojie/MIduo/%E7%95%8C%E9%9D%A2/%E6%88%91%E7%9A%84/SJUnbindPhoneViewController.m"
                  timestampString = "555929976.740299"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "101"
                  endingLineNumber = "101"
                  offsetFromSymbolStart = "36">
               </Location>
            </Locations>
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/SJUnbindPhoneViewController.m"
            timestampString = "555922374.87973"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "104"
            endingLineNumber = "104"
            landmarkName = "-unBindPhonewithPhoneString:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <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 = "555929971.643994"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "277"
            endingLineNumber = "277"
            landmarkName = "-webView:shouldStartLoadWithRequest:navigationType:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <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 = "555929971.64446"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "276"
            endingLineNumber = "276"
            landmarkName = "-webView:shouldStartLoadWithRequest:navigationType:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <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 = "555929971.6446691"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "303"
            endingLineNumber = "303"
            landmarkName = "-webView:shouldStartLoadWithRequest:navigationType:"
            landmarkType = "7">
            <Locations>
               <Location
                  shouldBeEnabled = "Yes"
                  ignoreCount = "0"
                  continueAfterRunningActions = "No"
                  symbolName = "-[ShonpingShareViewController webView:shouldStartLoadWithRequest:navigationType:]"
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/haicaojie/MIduo/%E7%95%8C%E9%9D%A2/%E9%82%80%E8%AF%B7/%E5%95%86%E5%93%81%E5%88%86%E4%BA%AB/ShonpingShareViewController.m"
                  timestampString = "555929976.753899"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "305"
                  endingLineNumber = "305"
                  offsetFromSymbolStart = "3016">
               </Location>
               <Location
                  shouldBeEnabled = "Yes"
                  ignoreCount = "0"
                  continueAfterRunningActions = "No"
                  symbolName = "-[ShonpingShareViewController webView:shouldStartLoadWithRequest:navigationType:]"
                  moduleName = "MIduo"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mj/Desktop/haicaojie/MIduo/%E7%95%8C%E9%9D%A2/%E9%82%80%E8%AF%B7/%E5%95%86%E5%93%81%E5%88%86%E4%BA%AB/ShonpingShareViewController.m"
                  timestampString = "555929976.755477"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "305"
                  endingLineNumber = "305"
                  offsetFromSymbolStart = "3068">
               </Location>
            </Locations>
         </BreakpointContent>
      </BreakpointProxy>
      <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 = "555929971.644861"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "298"
            endingLineNumber = "298"
            landmarkName = "-webView:shouldStartLoadWithRequest:navigationType:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <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 = "555929971.645052"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "290"
            endingLineNumber = "290"
            landmarkName = "-webView:shouldStartLoadWithRequest:navigationType:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <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 = "555929971.6452399"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "516"
            endingLineNumber = "516"
            landmarkName = "-dealloc"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
   </Breakpoints>