Merge branch 'master' of http://10.1.235.20:3000/ipu/ios-share

WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -26,7 +26,7 @@
                  moduleName = "WadeMobileFunc"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
                  timestampString = "578303950.945183"
                  timestampString = "578977107.6443141"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "291"
@@ -41,7 +41,7 @@
                  moduleName = "WadeMobileFunc"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
                  timestampString = "578303950.947293"
                  timestampString = "578977107.646101"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "292"
@@ -56,7 +56,7 @@
                  moduleName = "WadeMobileFunc"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
                  timestampString = "578303950.949271"
                  timestampString = "578977107.648159"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "291"

WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,17 +7,17 @@
		<key>WadeMobileFunc.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>5</integer>
			<integer>11</integer>
		</dict>
		<key>WadeMobileFunc4Appstore.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>3</integer>
			<integer>6</integer>
		</dict>
		<key>WadeMobileFuncAggregate.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>4</integer>
			<integer>7</integer>
		</dict>
	</dict>
</dict>

WadeMobileFunc/WadeMobileFunc/WDFMobileStorage.m

@@ -80,7 +80,7 @@ static NSString* const DES_KEY = @"87382947";
- (void)getMemoryCache:(NSArray *)param {
    id key = param[0];
    NSString *defvalue = param[1];
    NSString *defvalue = [NSString stringWithFormat:@"%@",param[1]];
    if ([key isKindOfClass:[NSArray class]]) {
        NSArray *keys = key;
        WDDataMap *map = [[WDDataMap alloc]init];
@@ -217,7 +217,7 @@ static NSString* const DES_KEY = @"87382947";
    }
    
    id key = param[0];
    NSString *defValue = param[1];
    NSString *defValue = [NSString stringWithFormat:@"%@",param[1]];
    id value = [self getOfflineCache:key defValue:defValue];
    /* 处理异常的结果 */
    if (!value || value == [NSNull null]) {