fix(Venus): show all categories when venus flag is true

tripleCC · Apr 30, 2016 · 2aa8054 · 2aa8054
1 parent a0d2d8d
commit 2aa8054
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 6 deletions.
diff --git a/GanHuo/Assets.xcassets/images/uploadTip/upload_1.imageset/upload_1@2x.png b/GanHuo/Assets.xcassets/images/uploadTip/upload_1.imageset/upload_1@2x.png
diff --git a/GanHuo/Assets.xcassets/images/uploadTip/upload_2.imageset/upload_2@2x.png b/GanHuo/Assets.xcassets/images/uploadTip/upload_2.imageset/upload_2@2x.png
diff --git a/GanHuo/Assets.xcassets/images/uploadTip/upload_3.imageset/upload_3@2x.png b/GanHuo/Assets.xcassets/images/uploadTip/upload_3.imageset/upload_3@2x.png
diff --git a/GanHuo/Assets.xcassets/images/uploadTip/upload_4.imageset/upload_4@2x.png b/GanHuo/Assets.xcassets/images/uploadTip/upload_4.imageset/upload_4@2x.png
diff --git a/GanHuo/Assets.xcassets/images/uploadTip/upload_5.imageset/upload_5@2x.png b/GanHuo/Assets.xcassets/images/uploadTip/upload_5.imageset/upload_5@2x.png
diff --git a/GanHuo/Assets.xcassets/images/uploadTip/upload_6.imageset/upload_6@2x.png b/GanHuo/Assets.xcassets/images/uploadTip/upload_6.imageset/upload_6@2x.png
diff --git a/GanHuo/Controllers/Category/TPCCategoryViewController.swift b/GanHuo/Controllers/Category/TPCCategoryViewController.swift
@@ -87,7 +87,7 @@ class TPCCategoryViewController: TPCViewController {
     }
 
     private func setupChildController() {
-        let titles = TPCStorageUtil.objectForKey(TPCCategoryStoreKey) as? [String] ?? TPCConfiguration.allCategories
+        let titles = TPCStorageUtil.objectForKey(TPCCategoryStoreKey) as? [String] ?? (TPCConfiguration.allCategories.filter {!TPCFilterCategories.contains($0)})
         // 福利单独出来
         titles.filter{ $0 != "福利" }.forEach {
             let subCategoryVc = TPCSubCategoryViewController()

diff --git a/GanHuo/Info.plist b/GanHuo/Info.plist
@@ -53,7 +53,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>17</string>
+	<string>19</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>pocket-oauth-v1</string>

diff --git a/GanHuo/Util/TPCVenusUtil.swift b/GanHuo/Util/TPCVenusUtil.swift
@@ -47,16 +47,18 @@ class TPCVenusUtil {
                     TPCConfiguration.allRules.removeAtIndex(TPCConfiguration.allRules.indexOf(TPCRuleType.One)!)
                     TPCConfiguration.allCategories = TPCConfiguration.allCategories.filter{ !TPCFilterCategories.contains($0) }
                     TPCConfiguration.loadDataCountOnce = 5
+                    TPCStorageUtil.setObject(nil, forKey: TPCCategoryStoreKey)
+                    TPCStorageUtil.setObject(nil, forKey: TPCAllCategoriesKey, suiteName: TPCAppGroupKey)
                 } else {
                     debugPrint("Open venus model")
                     // Clear github image url cache when get true venusFlag at first time
                     TPCStorageUtil.shareInstance.clearFileCache()
                     KingfisherManager.sharedManager.cache.clearDiskCache()
                     KingfisherManager.sharedManager.cache.clearMemoryCache()
-                    TPCStorageUtil.setObject(nil, forKey: TPCCategoryStoreKey)
+                    // 给SE用，这里代码不是很好
+                    TPCStorageUtil.setObject(TPCConfiguration.allCategories, forKey: TPCAllCategoriesKey, suiteName: TPCAppGroupKey)
+                    TPCStorageUtil.setObject(TPCConfiguration.allCategories, forKey: TPCCategoryStoreKey)
                 }
-                // 给SE用，这里代码不是很好
-                TPCStorageUtil.setObject(TPCConfiguration.allCategories, forKey: TPCAllCategoriesKey, suiteName: TPCAppGroupKey)
             }
             completion(launchConfig: launchConfig)
         }

diff --git a/GanHuoShareExtension/Info.plist b/GanHuoShareExtension/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>17</string>
+	<string>19</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>