重庆迈尖科技有限公司
2018-08-30 91732c356b6fd5a452edee037de29290682fb1bd
no message
9个文件已修改
287 ■■■■ 已修改文件
MIduo.xcodeproj/xcuserdata/mj.xcuserdatad/xcschemes/MIduo.xcscheme 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/Info.plist 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/数据/Category/SJNetwork.m 150 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/优惠券/classificationViewController.m 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/动态/DynamicViewController.m 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/搜索/searchViewController.m 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/首页/recommendViewController.m 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcodeproj/xcuserdata/mj.xcuserdatad/xcschemes/MIduo.xcscheme
@@ -23,7 +23,7 @@
      </BuildActionEntries>
   </BuildAction>
   <TestAction
      buildConfiguration = "Debug"
      buildConfiguration = "Release"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      shouldUseLaunchSchemeArgsEnv = "YES">
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,38 +2,4 @@
<Bucket
   type = "0"
   version = "2.0">
   <Breakpoints>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x9996;&#x9875;/NEWHomeViewController.m"
            timestampString = "557295104.165622"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "192"
            endingLineNumber = "192"
            landmarkName = "-pushInfomationClicked:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x9996;&#x9875;/NEWHomeViewController.m"
            timestampString = "557295104.165681"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "199"
            endingLineNumber = "199"
            landmarkName = "-pushInfomationClicked:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
   </Breakpoints>
</Bucket>
MIduo/Info.plist
@@ -17,7 +17,7 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
    <string>1.1.1</string>
    <string>1.1.2</string>
    <key>CFBundleURLTypes</key>
    <array>
        <dict>
@@ -94,7 +94,7 @@
        </dict>
    </array>
    <key>CFBundleVersion</key>
    <string>13</string>
    <string>14</string>
    <key>LSApplicationQueriesSchemes</key>
    <array>
        <string>tbopen</string>
MIduo/Êý¾Ý/Category/SJNetwork.m
@@ -7,6 +7,8 @@
//
#import "SJNetwork.h"
#import <sys/utsname.h>
#define Version [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]  //build号
#define Package @"com.haicaojie-ios"  //相当于包名
@@ -28,6 +30,9 @@
    [dic setObject:apiversion forKey:@"apiversion"];
    [dic setObject:platform forKey:@"platform"];
    [dic setObject:appid forKey:@"appid"];
    [dic setObject:[self deviceType] forKey:@"deviceType"];
    [dic setObject:[[UIDevice currentDevice] systemVersion] forKey:@"osVersion"];
    [dic setObject:@"appstore" forKey:@"channel"];
    //现在的时间
    NSTimeInterval timeNow = [[NSDate date] timeIntervalSince1970];
    long long int date = (long long int)timeNow*1000;
@@ -55,7 +60,7 @@
        NSComparisonResult resuest = [obj1 compare:obj2];
        return resuest;
    }];
    NSString *resultString = @"";
    for (NSInteger index = 0; index < resultArray.count; index ++) {
        if (index == 0) {
@@ -69,5 +74,146 @@
    return resultString;
}
+ (NSString*)deviceType {
    struct utsname systemInfo;
    uname(&systemInfo);
    NSString*platform = [NSString stringWithCString: systemInfo.machine encoding:NSASCIIStringEncoding];
    if([platform isEqualToString:@"iPhone1,1"])  return@"iPhone 2G";
    if([platform isEqualToString:@"iPhone1,2"])  return@"iPhone 3G";
    if([platform isEqualToString:@"iPhone2,1"])  return@"iPhone 3GS";
    if([platform isEqualToString:@"iPhone3,1"])  return@"iPhone 4";
    if([platform isEqualToString:@"iPhone3,2"])  return@"iPhone 4";
    if([platform isEqualToString:@"iPhone3,3"])  return@"iPhone 4";
    if([platform isEqualToString:@"iPhone4,1"])  return@"iPhone 4S";
    if([platform isEqualToString:@"iPhone5,1"])  return@"iPhone 5";
    if([platform isEqualToString:@"iPhone5,2"])  return@"iPhone 5";
    if([platform isEqualToString:@"iPhone5,3"])  return@"iPhone 5c";
    if([platform isEqualToString:@"iPhone5,4"])  return@"iPhone 5c";
    if([platform isEqualToString:@"iPhone6,1"])  return@"iPhone 5s";
    if([platform isEqualToString:@"iPhone6,2"])  return@"iPhone 5s";
    if([platform isEqualToString:@"iPhone7,1"])  return@"iPhone 6 Plus";
    if([platform isEqualToString:@"iPhone7,2"])  return@"iPhone 6";
    if([platform isEqualToString:@"iPhone8,1"])  return@"iPhone 6s";
    if([platform isEqualToString:@"iPhone8,2"])  return@"iPhone 6s Plus";
    if([platform isEqualToString:@"iPhone8,4"])  return@"iPhone SE";
    if([platform isEqualToString:@"iPhone9,1"])  return@"iPhone 7";
    if([platform isEqualToString:@"iPhone9,3"])  return@"iPhone 7";
    if([platform isEqualToString:@"iPhone9,2"])  return@"iPhone 7 Plus";
    if([platform isEqualToString:@"iPhone9,4"])  return@"iPhone 7 Plus";
    if([platform isEqualToString:@"iPhone10,1"]) return@"iPhone 8";
    if([platform isEqualToString:@"iPhone10,4"]) return@"iPhone 8";
    if([platform isEqualToString:@"iPhone10,2"]) return@"iPhone 8 Plus";
    if([platform isEqualToString:@"iPhone10,5"]) return@"iPhone 8 Plus";
    if([platform isEqualToString:@"iPhone10,3"]) return@"iPhone X";
    if([platform isEqualToString:@"iPhone10,6"]) return@"iPhone X";
    if([platform isEqualToString:@"iPod1,1"])  return@"iPod Touch 1G";
    if([platform isEqualToString:@"iPod2,1"])  return@"iPod Touch 2G";
    if([platform isEqualToString:@"iPod3,1"])  return@"iPod Touch 3G";
    if([platform isEqualToString:@"iPod4,1"])  return@"iPod Touch 4G";
    if([platform isEqualToString:@"iPod5,1"])  return@"iPod Touch 5G";
    if([platform isEqualToString:@"iPad1,1"])  return@"iPad 1G";
    if([platform isEqualToString:@"iPad2,1"])  return@"iPad 2";
    if([platform isEqualToString:@"iPad2,2"])  return@"iPad 2";
    if([platform isEqualToString:@"iPad2,3"])  return@"iPad 2";
    if([platform isEqualToString:@"iPad2,4"])  return@"iPad 2";
    if([platform isEqualToString:@"iPad2,5"])  return@"iPad Mini 1G";
    if([platform isEqualToString:@"iPad2,6"])  return@"iPad Mini 1G";
    if([platform isEqualToString:@"iPad2,7"])  return@"iPad Mini 1G";
    if([platform isEqualToString:@"iPad3,1"])  return@"iPad 3";
    if([platform isEqualToString:@"iPad3,2"])  return@"iPad 3";
    if([platform isEqualToString:@"iPad3,3"])  return@"iPad 3";
    if([platform isEqualToString:@"iPad3,4"])  return@"iPad 4";
    if([platform isEqualToString:@"iPad3,5"])  return@"iPad 4";
    if([platform isEqualToString:@"iPad3,6"])  return@"iPad 4";
    if([platform isEqualToString:@"iPad4,1"])  return@"iPad Air";
    if([platform isEqualToString:@"iPad4,2"])  return@"iPad Air";
    if([platform isEqualToString:@"iPad4,3"])  return@"iPad Air";
    if([platform isEqualToString:@"iPad4,4"])  return@"iPad Mini 2G";
    if([platform isEqualToString:@"iPad4,5"])  return@"iPad Mini 2G";
    if([platform isEqualToString:@"iPad4,6"])  return@"iPad Mini 2G";
    if([platform isEqualToString:@"iPad4,7"])  return@"iPad Mini 3";
    if([platform isEqualToString:@"iPad4,8"])  return@"iPad Mini 3";
    if([platform isEqualToString:@"iPad4,9"])  return@"iPad Mini 3";
    if([platform isEqualToString:@"iPad5,1"])  return@"iPad Mini 4";
    if([platform isEqualToString:@"iPad5,2"])  return@"iPad Mini 4";
    if([platform isEqualToString:@"iPad5,3"])  return@"iPad Air 2";
    if([platform isEqualToString:@"iPad5,4"])  return@"iPad Air 2";
    if([platform isEqualToString:@"iPad6,3"])  return@"iPad Pro 9.7";
    if([platform isEqualToString:@"iPad6,4"])  return@"iPad Pro 9.7";
    if([platform isEqualToString:@"iPad6,7"])  return@"iPad Pro 12.9";
    if([platform isEqualToString:@"iPad6,8"])  return@"iPad Pro 12.9";
    if([platform isEqualToString:@"i386"])  return@"iPhone Simulator";
    if([platform isEqualToString:@"x86_64"])  return@"iPhone Simulator";
    return platform;
}
@end
MIduo/½çÃæ/ÓÅ»Ýȯ/classificationViewController.m
@@ -114,7 +114,7 @@
{
    RealReachability *reachability = (RealReachability *)notification.object;
    ReachabilityStatus status = [reachability currentReachabilityStatus];
    [self setupFlagLabelWithStatus:status
                           isVPNOn:[GLobalRealReachability isVPNOn]
                        accessType:[GLobalRealReachability currentWWANtype]];
@@ -153,7 +153,7 @@
                self.noNetworkViews.hidden = NO;
                
            } else {
                self.noNetworkViews.hidden = YES;
            }
            
@@ -229,7 +229,7 @@
-(void)loadDataSource {
    
    [self.view makeToastActivity:CSToastPositionCenter];
     [self.view makeToastActivity:CSToastPositionCenter];
    
    [[YTHNetInterface startInterface] cancelAll];
    [[YTHNetInterface startInterface] getCouponListWithPage:[NSString stringWithFormat:@"%ld",(long)self.page]
@@ -268,18 +268,19 @@
                                                              }
                                                              
                                                          } else {
                                                              if (self.GoodsData.count == 0) {
                                                                  self.noNetworkViews.primtTitle.text = @"网络连接异常,请检测网络设置";
                                                                  [self.noNetworkViews.iconImage setImage:[UIImage imageNamed:@"网络错误"]];
                                                                  self.noNetworkViews.hidden = NO;
                                                              } else {
                                                                  self.noNetworkViews.hidden = YES;
                                                                  [self getAddView];
                                                              }
                                                                          if (self.GoodsData.count == 0) {
                                                                              self.noNetworkViews.primtTitle.text = @"网络连接异常,请检测网络设置";
                                                                              [self.noNetworkViews.iconImage setImage:[UIImage imageNamed:@"网络错误"]];
                                                                              self.noNetworkViews.hidden = NO;
                                                                          } else {
                                                                              self.noNetworkViews.hidden = YES;
                                                                              [self getAddView];
                                                                          }
                                                          }
                                                      }
                                                  }];
MIduo/½çÃæ/¶¯Ì¬/DynamicViewController.m
@@ -34,6 +34,8 @@
@property (nonatomic, assign) NSInteger page;
@property (nonatomic,strong)SJNoNetwork *noNetworkViews;
/// è¯·æ±‚成功次数
@property (nonatomic, assign) NSInteger successNumber;
@end
@@ -51,11 +53,13 @@
    //去掉透明后导航栏下边的黑边
    [self.navigationController.navigationBar setShadowImage:image];
    
    self.navigationController.navigationBar.titleTextAttributes=@{NSForegroundColorAttributeName:XYRMainColor,NSFontAttributeName:[UIFont boldSystemFontOfSize:17]};
    self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:XYRMainColor,NSFontAttributeName:[UIFont boldSystemFontOfSize:17]};
}
- (void)viewDidLoad {
    [super viewDidLoad];
    self.successNumber = 0;
    
    // é‡å†™button
    UIButton *backbutton = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -164,7 +168,9 @@
        {
            self.noNetworkViews.hidden = YES;
            
            if (self.dataSource.count == 0) {
            if (self.successNumber == 0) {
                self.successNumber++;
                
                [self.view makeToastActivity:CSToastPositionCenter];
                [self getRecommendActivity];
@@ -177,7 +183,14 @@
        {
            self.noNetworkViews.hidden = YES;
            
            if (self.dataSource.count == 0) {
//            if (self.dataSource.count == 0) {
//
//                [self.view makeToastActivity:CSToastPositionCenter];
//                [self getRecommendActivity];
//            }
            if (self.successNumber == 0) {
                self.successNumber++;
                
                [self.view makeToastActivity:CSToastPositionCenter];
                [self getRecommendActivity];
@@ -316,7 +329,10 @@
                       }
                       
                   } else {
                       if (self.dataSource.count == 0) {
                           self.successNumber = 0;
                           
                           self.noNetworkViews.primtTitle.text = @"网络连接异常,请检测网络设置";
                           [self.noNetworkViews.iconImage setImage:[UIImage imageNamed:@"网络错误"]];
@@ -484,7 +500,7 @@
                                    } else {
                                        
                                        [SVProgressHUD dismiss];
                                        ALToastBottom(object[@"msg"])
                                    }
                                    
@@ -900,7 +916,7 @@
    
    if (shareType == SSDKPlatformSubTypeWechatTimeline || shareType == SSDKPlatformSubTypeWechatSession) {
        if (![WXApi isWXAppInstalled]) {
            ALToastCenter(@"微信未安装");
            return;
        }
@@ -913,7 +929,7 @@
    
    if ( SSDKPlatformSubTypeQQFriend == shareType || shareType == SSDKPlatformSubTypeQZone ) {
        if (![[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"mqq://"]]) {
            ALToastCenter(@"QQ未安装");
            return;
        }
MIduo/½çÃæ/ËÑË÷/searchViewController.m
@@ -183,7 +183,7 @@
                [self.dataOld removeAllObjects];
                [self getOldSearch];
                
                 [self performSelector:@selector(delayMethod) withObject:nil afterDelay:0.8f];
               //  [self performSelector:@selector(delayMethod) withObject:nil afterDelay:0.8f];
            }
            
         
@@ -367,7 +367,7 @@
            [self.collectionView reloadData];
            
            [self performSelector:@selector(delayMethod) withObject:nil afterDelay:0.8f];
        } else {
           
            [self.view hideToastActivity];
@@ -417,8 +417,6 @@
            
            [self.collectionView reloadData];
           
             [self performSelector:@selector(delayMethod) withObject:nil afterDelay:0.8f];
        } else {
            //显示网络连接失败
        }
@@ -719,4 +717,29 @@
    return _noNetworkViews;
}
#pragma mark åˆ¤æ–­é”®ç›˜æ˜¯å¦æ˜¾ç¤ºï¼ˆè¿”回值为0:键盘未显示)
- (CGFloat)visibleKeyboardHeight {
#if !defined(SV_APP_EXTENSIONS)
    UIWindow *keyboardWindow = nil;
    for (UIWindow *testWindow in [[UIApplication sharedApplication] windows]) {
        if(![[testWindow class] isEqual:[UIWindow class]]) {
            keyboardWindow = testWindow;
            break;
        }
    }
    for (__strong UIView *possibleKeyboard in [keyboardWindow subviews]) {
        if([possibleKeyboard isKindOfClass:NSClassFromString(@"UIPeripheralHostView")] || [possibleKeyboard isKindOfClass:NSClassFromString(@"UIKeyboard")]) {
            return CGRectGetHeight(possibleKeyboard.bounds);
        } else if([possibleKeyboard isKindOfClass:NSClassFromString(@"UIInputSetContainerView")]) {
            for (__strong UIView *possibleKeyboardSubview in [possibleKeyboard subviews]) {
                if([possibleKeyboardSubview isKindOfClass:NSClassFromString(@"UIInputSetHostView")]) {
                    return CGRectGetHeight(possibleKeyboardSubview.bounds);
                }
            }
        }
    }
#endif
    return 0;
}
@end
MIduo/½çÃæ/Ê×Ò³/recommendViewController.m
@@ -124,6 +124,13 @@
    //是否显示新人红包的弹窗
    if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"newuser"] intValue] == 0) {
        
        NSArray *tempArr = [[[NSUserDefaults standardUserDefaults] objectForKey:@"MainUrlArray"] objectForKey:@"info"];
        if (tempArr.count == 0 || !tempArr) {
            [YTHsharedManger startManger].isNewUser = 1;
        }
        if ([YTHsharedManger startManger].isNewUser == 0) {
            
            [self ShowNewUser];