tabbar

Macalline.xcodeproj/project.pbxproj

@@ -936,7 +936,7 @@
 				ORGANIZATIONNAME = JianjiYuan;
 				TargetAttributes = {
 					09CD6F931A2C46B300A581BA = {
-						DevelopmentTeam = 4WRSWKXL27;
+						DevelopmentTeam = C237GFQJK4;
 					};
 					09CD6FAE1A2C46B300A581BA = {
 						DevelopmentTeam = C237GFQJK4;
@@ -1273,18 +1273,18 @@
 			baseConfigurationReference = 9DF2AE748F48D7C21F3300FE /* Pods.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Macalline/Macalline-Prefix.pch";
 				INFOPLIST_FILE = "Macalline/Macalline-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.macalline;
+				PRODUCT_BUNDLE_IDENTIFIER = com.bestrun.app.macalline;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "1167b943-9098-47a9-b05a-c0dd6682858f";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "1167b943-9098-47a9-b05a-c0dd6682858f";
+				PROVISIONING_PROFILE = "11731369-fded-4c9f-a9cc-90b93f6e60f5";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "11731369-fded-4c9f-a9cc-90b93f6e60f5";
 				SDKROOT = iphoneos;
 				VALID_ARCHS = "arm64 armv7";
 				WRAPPER_EXTENSION = app;
@@ -1296,18 +1296,18 @@
 			baseConfigurationReference = 416BF2437F5E4BB7D7F8A2AF /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Macalline/Macalline-Prefix.pch";
 				INFOPLIST_FILE = "Macalline/Macalline-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.macalline;
+				PRODUCT_BUNDLE_IDENTIFIER = com.bestrun.app.macalline;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "1167b943-9098-47a9-b05a-c0dd6682858f";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "1167b943-9098-47a9-b05a-c0dd6682858f";
+				PROVISIONING_PROFILE = "11731369-fded-4c9f-a9cc-90b93f6e60f5";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "11731369-fded-4c9f-a9cc-90b93f6e60f5";
 				SDKROOT = iphoneos;
 				VALID_ARCHS = "arm64 armv7";
 				WRAPPER_EXTENSION = app;

Macalline/AppDelegate.m

@@ -64,7 +64,7 @@
 - (void)setDefaultUserDefaultValues
 {
 //    if ([[UIApplication getObjectType:String key:kServerAddress] isEqualToString:@""]) {
-//        [UIApplication saveObject:@"192.168.199.197" type:String key:kServerAddress];
+//        [UIApplication saveObject:@"219.235.234.212" type:String key:kServerAddress];
 //    }
 //    if ([[UIApplication getObjectType:String key:kServerPort] isEqualToString:@""]) {
 //        [UIApplication saveObject:@"8080" type:String key:kServerPort];

Macalline/Classes/ViewControllers/TabBar/TabBarViewController.m

@@ -178,6 +178,7 @@
                                                         [tabBarItemImages objectAtIndex:index]]];
         [item setBackgroundSelectedImage:selectedimage withUnselectedImage:unselectedimage];
         item.badgeBackgroundColor = RGBColor(229, 0, 129, 1);
+        item.badgeTextColor = [UIColor whiteColor];
         item.titlePositionAdjustment = UIOffsetMake(0, 15);
         item.badgePositionAdjustment = UIOffsetMake(20, 0);
         

Macalline/Classes/ViewControllers/Task/TaskUploadViewController.m

@@ -11,7 +11,7 @@
 #import "DBDaoMgr.h"
 #import "BaseTextField.h"
 #import "UIScrollView+Customized.h"
-
+#import "MBProgressHUD.h"
 @interface TaskUploadViewController () < ImageBrowserDelegate, UITextViewDelegate,
 UIAlertViewDelegate, UITextFieldDelegate, UIActionSheetDelegate >
 {
@@ -49,6 +49,7 @@ UIAlertViewDelegate, UITextFieldDelegate, UIActionSheetDelegate >
 
 
 @property (weak, nonatomic) IBOutlet UIView *picSelectedView;
+@property (nonatomic, strong) MBProgressHUD *hud;
 
 @property (strong,nonatomic)UIButton *btnAdd;
 @property (strong,nonatomic)UIButton *btnMinus;
@@ -305,6 +306,9 @@ UIAlertViewDelegate, UITextFieldDelegate, UIActionSheetDelegate >
 
 - (void)uploadCheckPointPicture
 {
+    self.hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    self.hud.labelText = @"图片上传中…";
+    [self.hud show:YES];
     if ([self saveImageToDbAndCachePath])
     {
         if([self.picRequireMode isEqualToString:@"2"] || [self.picRequireMode isEqualToString:@"3"])
@@ -336,6 +340,7 @@ UIAlertViewDelegate, UITextFieldDelegate, UIActionSheetDelegate >
                                                      dataType:BRNetMgrDataTypeJSON
                                                      fileType:BRNetMgrFileTypeJpeg
                                                     files:arrFiles];
+
                 [self.networkMgr startOperation:operation];
             }
         }
@@ -361,11 +366,13 @@ UIAlertViewDelegate, UITextFieldDelegate, UIActionSheetDelegate >
                                              dataType:BRNetMgrDataTypeJSON
                                              fileType:BRNetMgrFileTypeJpeg
                                              files:arrFiles];
+
         [self.networkMgr startOperation:operation];
         }
     }
     else
     {
+        [self.hud hide:YES];
         self.hasSaved=@"处理图片出错！";
         [UIApplication showToastViewMessage:self.hasSaved];
     }
@@ -451,7 +458,7 @@ UIAlertViewDelegate, UITextFieldDelegate, UIActionSheetDelegate >
 - (void)httpOperationSuccess:(AFHTTPRequestOperation *)operation
                       result:(NSDictionary *)result
 {
-   
+    [self.hud hide:YES];
 
     if ([operation.userInfo[@"interface"] isEqualToString:@"handleCheckPointEX"]) {
         
@@ -496,7 +503,8 @@ UIAlertViewDelegate, UITextFieldDelegate, UIActionSheetDelegate >
 - (void)httpOperationFailed:(AFHTTPRequestOperation *)operation
                       error:(NSError *)error
 {
-    
+    [self.hud hide:YES];
+
 }
 
 - (void)btnBackClick:(id)sender