Merge branch 'JUN'

重庆迈尖科技有限公司

2018-08-14 0e65694c9cc0027bacb3289ebfbfeabc320d25d0

Merge branch 'JUN'

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

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

@@ -81,38 +81,6 @@
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/界面/SJBaseViewController.m"
            timestampString = "555901445.964676"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "253"
            endingLineNumber = "253"
            landmarkName = "-networkError:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"
            timestampString = "555901445.965021"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "261"
            endingLineNumber = "261"
            landmarkName = "-networkError:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "../SGNetObserver-master/SGNetObserver/SGNetObserver.m"
            timestampString = "555902137.230881"
            startingColumnNumber = "9223372036854775807"

 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];
    
    //友盟分享