新版上线

TOKTOK/TOKTOK.xcodeproj/project.pbxproj

@@ -1824,7 +1824,7 @@
 				CODE_SIGN_ENTITLEMENTS = TOKTOK/TOKTOK.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = BB92G3L793;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1840,7 +1840,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/TOKTOK/OtherFrameworks/wechat",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1904,7 +1904,7 @@
 					"-framework",
 					"\"WebKit\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.xsbanruo.TOKTOK;
+				PRODUCT_BUNDLE_IDENTIFIER = com.xsbanruo.TOKTOK.debug;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1924,7 +1924,7 @@
 				CODE_SIGN_ENTITLEMENTS = TOKTOK/TOKTOK.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = BB92G3L793;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1940,7 +1940,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/TOKTOK/OtherFrameworks/wechat",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2004,7 +2004,7 @@
 					"-framework",
 					"\"WebKit\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.xsbanruo.TOKTOK.debug;
+				PRODUCT_BUNDLE_IDENTIFIER = com.xsbanruo.TOKTOK;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

TOKTOK/TOKTOK/Home/HomeView/XSTTHomeViewController.m

@@ -82,14 +82,13 @@
             [self.navigationController pushViewController:XSTTBlindBoxToOrderTableViewController.new animated:true];
             break;
         case 1:
-            [self.navigationController pushViewController:XSTTBreweryListViewController.new animated:true];
+            [XSTTRouteManager navigationBackAndRouteTo:[[XSTTRouter alloc] initWithClass:nil property:@{} tabBarType:XSTTTabBarTypeBeerCentre]];
             break;
         case 2:
-            [self.navigationController pushViewController:XSTTStoreListViewController.new animated:true];
+            [self.navigationController pushViewController:XSTTBreweryListViewController.new animated:true];
             break;
         case 3:
-            [XSTTRouteManager navigationBackAndRouteTo:[[XSTTRouter alloc] initWithClass:nil property:@{} tabBarType:XSTTTabBarTypeBeerCentre]];
-            
+            [self.navigationController pushViewController:XSTTStoreListViewController.new animated:true];
             break;
             
         default:

TOKTOK/TOKTOK/SocialCircle/SocialCircleView/XSTTSocialCircleTableViewCell.m

@@ -194,7 +194,7 @@
 
 - (void)reloadData:(XSTTSocialCircleListModel *)data {
     _currentData = data;
-    _avatar.backgroundColor = UIColor.redColor;
+//    _avatar.backgroundColor = UIColor.redColor;
     [_avatar sd_setImageWithURL:xstt_fileURL(data.xstt_headImg)];
     _name.text = data.xstt_nickName;
     //3:4  1.3333