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

重庆迈尖科技有限公司

2018-08-14 cda6ce9b21f44766e9e865b6472863c23ccfa921

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

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

Binary files differ

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

@@ -4,95 +4,91 @@
   version = "2.0">
   <Breakpoints>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "No"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"
            timestampString = "555912797.953004"
            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 = "555588815.727405"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "561"
            endingLineNumber = "561"
            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 = "555912797.953078"
            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 = "555912797.953122"
            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 = "555912797.953172"
            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 = "555912797.953239"
            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 = "555912797.953316"
            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>
   </Breakpoints>

 MIduo/AppDelegate.m

@@ -732,12 +732,7 @@
#pragma mark 友盟相关
- (void)setUmeng{
     
//    [UMCommonLogManager setUpUMCommonLogManager];
    [UMConfigure initWithAppkey:UmengKey channel:nil];
//    UMConfigInstance.appKey = UmengKey;
//    UMConfigInstance.channelId = nil;
//    UMConfigInstance.ePolicy = BATCH;
//    [MobClick startWithConfigure:UMConfigInstance];
    [MobClick setScenarioType:E_UM_NORMAL];
    
    //友盟分享