bug fix

ALand.xcodeproj/project.pbxproj

@@ -2310,7 +2310,7 @@
 				TargetAttributes = {
 					1940D2E61C9A56730080678C = {
 						CreatedOnToolsVersion = 7.2.1;
-						DevelopmentTeam = 2G3393EZPN;
+						DevelopmentTeam = W54V2VB863;
 					};
 					1940D2F91C9A56730080678C = {
 						CreatedOnToolsVersion = 7.2.1;
@@ -2887,9 +2887,9 @@
 				INFOPLIST_FILE = ALand/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.store.aland2;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.aland;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "f6b88569-d850-46ef-b723-c4bfe46b907b";
+				PROVISIONING_PROFILE = "";
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
@@ -2900,7 +2900,7 @@
 			baseConfigurationReference = AAF51B5D53AE9938C03065C3 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = Aland/PrefixHeader.pch;
@@ -2917,9 +2917,9 @@
 				INFOPLIST_FILE = ALand/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.store.aland2;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.aland;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "f6b88569-d850-46ef-b723-c4bfe46b907b";
+				PROVISIONING_PROFILE = "";
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};

ALand/Global/ShareView/ShareInstance.m

@@ -75,9 +75,11 @@
         [kWindow addSubview:_shareContentView];
 
     }
+    
     return _shareContentView;
 }
 
+
 /**
  *  分享店铺
  *
@@ -107,25 +109,32 @@
     [self showWithTitle:@"欢迎加入新营养部落，一起共创健康未来。" content:@"在新营养部落开店，享受自由健康生活，免费游览欧洲北美。" url:urlStr image:[UIImage appIcon]];
 }
 
+/** 分享商品 */
 - (void)shareGoodsWithGoodsModel:(CommotityListModel *)model image:(UIImage *)image
 {
     [MBProgressHUD showHUDAddedTo:kWindow animated:YES];
     
     [[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"goods/brand/get/%@", model.brand.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
         
-        
         [MBProgressHUD hideHUDForView:kWindow];
         if (kIsResponseSuccess(responseObject)) {
+            
             NSString *description = responseObject[@"goodsBrand"][@"description"];
+            NSString *url = [NSString stringWithFormat:@"%@Wap/detail/shop_id/%@/id/%@/hastbar/0/.html", [UserInfo shareInstance].webShopBaseUrl, [UserInfo shareInstance].shop.uuid, model.uuid];
             
-            [self showWithTitle:model.name content:description url:[NSString stringWithFormat:@"%@Wap/detail/shop_id/%@/id/%@/hastbar/0/.html", [UserInfo shareInstance].webShopBaseUrl, [UserInfo shareInstance].shop.uuid, model.uuid] image:image];
+            if (description && description.length > 0 && model.name.length > 0)
+            {
+                [self showWithTitle:model.name content:description url:url image:image];
+            }else
+            {
+                [MBProgressHUD Javen_showError:@"该商品暂不支持分享" onView:kWindow delay:0.5 complete:nil];
+            }
+ 
         }
-        
-        
     } failure:^(NSURLSessionDataTask *task, NSError *error) {
         
     }];
-
+    
 }
 
 @end

ALand/Global/UserInfo.m

@@ -14,7 +14,7 @@
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         userInfo = [[UserInfo alloc] init];
-//        [[JavenQNManager shareInstance] upLoadImage:[UIImage appIcon] isMD5Name:NO name:@"ios上传调试" commpelete:nil];
+        [[JavenQNManager shareInstance] upLoadImage:[UIImage appIcon] isMD5Name:NO name:@"ios-test" commpelete:nil];
         
     });
     return userInfo;

ALand/IBTUtilites/IBTUIKit/IBTUIViewController.m

@@ -84,6 +84,7 @@
 
 - (void)popAction {
     [self.view endEditing:YES];
+    [[UIApplication sharedApplication].keyWindow endEditing:YES];
     [self.navigationController.navigationBar endEditing:YES];
     [self.navigationController popViewControllerAnimated:YES];
 }