Merge pull request #7 from nfls/1.2.6-christmas

1.2.6 christmas
nfls · Dec 30, 2017 · 242e2f6 · 242e2f6
2 parents a37887a + 578c2e6
commit 242e2f6
Show file tree

Hide file tree

Showing 33 changed files with 1,296 additions and 234 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
+## Unity
+Unity/
 ## Build generated
 build/
 DerivedData/

diff --git a/ContentExtension/Info.plist b/ContentExtension/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.6</string>
+	<string>1.2.7</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

diff --git a/General/AppDelegate.swift b/General/AppDelegate.swift
@@ -25,19 +25,32 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var time = Date().timeIntervalSince1970
     var theme = ThemeManager()
     var url:String? = nil
-
+    @objc var currentUnityController: UnityAppController?
+    var isUnityRunning = false
+    var application: UIApplication?
+    var enableAllOrientation = true
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+        self.application = application
+        unity_init(CommandLine.argc, CommandLine.unsafeArgv)
+        currentUnityController = UnityAppController()
+        currentUnityController!.application(application, didFinishLaunchingWithOptions: launchOptions)
+        // first call to startUnity will do some init stuff, so just call it here and directly stop it again
+        startUnity()
+        stopUnity()
+
         IQKeyboardManager.sharedManager().enable = true
         NetworkActivityIndicatorManager.shared.isEnabled = true
         NetworkActivityIndicatorManager.shared.completionDelay = 0.5
+        /*
         UMAnalyticsConfig.sharedInstance().appKey = "59c733a1c895764c1100001c"
-        UMAnalyticsConfig.sharedInstance().channelId = "App Store"
+        MAnalyticsConfig.sharedInstance().channelId = "App Store"
         MobClick.start(withConfigure: UMAnalyticsConfig.sharedInstance())
         let version = Bundle.main.infoDictionary!["CFBundleShortVersionString"]
         MobClick.setAppVersion(version as! String)
         MobClick.setEncryptEnabled(true)
-        //MobClick.setLogEnabled(true)
+        MobClick.setLogEnabled(true)
+         */
         if let options = launchOptions{
             dump(options[UIApplicationLaunchOptionsKey.remoteNotification])
         }
@@ -93,24 +106,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationWillEnterForeground(_ application: UIApplication) {
         // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
         // let _ = ThemeManager.init()
-        let interval = Date().timeIntervalSince1970 - time
-        if(isLaunched){
-            if(!isOn && interval >= 60){
-                if let controller = UIStoryboard(name: "Main", bundle: nil).instantiateInitialViewController() as? LaunchScreenViewController {
-                    if let window = self.window, let rootViewController = window.rootViewController {
-                        var currentController = rootViewController
-                        while let presentedController = currentController.presentedViewController {
-                            currentController = presentedController
-                        }
-                        if !((currentController as? UINavigationController)?.topViewController is QLPreviewController) {
-                            currentController.present(controller, animated: true, completion: nil)
-                        }
-                    }
-                }
-            }
-        } else {
-            isLaunched = true
-        }
     }
 
 
@@ -145,6 +140,26 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         }
         return true
     }
+
+    func startUnity() {
+        if !isUnityRunning {
+            isUnityRunning = true
+            currentUnityController!.applicationDidBecomeActive(application!)
+        }
+    }
+
+    func stopUnity() {
+        if isUnityRunning {
+            currentUnityController!.applicationWillResignActive(application!)
+            isUnityRunning = false
+        }
+    }
+
+    func resetUnity() {
+        unity_init(CommandLine.argc, CommandLine.unsafeArgv)
+        currentUnityController = UnityAppController()
+        currentUnityController!.application(application!, didFinishLaunchingWithOptions: nil)
+    }
 }
 
 

diff --git a/General/Base.lproj/Main.storyboard b/General/Base.lproj/Main.storyboard
diff --git a/General/GameCenterView.swift b/General/GameCenterView.swift
@@ -18,7 +18,7 @@ class GameCenterViewController:UITableViewController{
     var descriptions = [String]()
     var urls = [String]()
     var images = [String]()
-
+    var in_url:String? = nil
 
 
     func loadFromLocal(){
@@ -49,16 +49,19 @@ class GameCenterViewController:UITableViewController{
             Alamofire.request("https://api.nfls.io/game/list").responseJSON { response in
                 switch(response.result){
                 case .success(let json):
-
                     let info = ((json as! [String:AnyObject])["info"] as! [[String:Any]])
                     self.names.removeAll()
                     self.descriptions.removeAll()
                     self.urls.removeAll()
                     self.images.removeAll()
+                    var index:Int? = nil
                     for detail in info {
                         self.names.append(detail["name"] as! String)
                         self.descriptions.append(detail["description"] as! String)
                         self.urls.append(detail["url"] as! String)
+                        if self.urls.last == self.in_url {
+                            index = self.names.count - 1
+                        }
                         self.images.append(detail["icon"] as! String)
                     }
                     UserDefaults.standard.set(self.names, forKey: "game_names")
@@ -69,6 +72,13 @@ class GameCenterViewController:UITableViewController{
                     DispatchQueue.main.asyncAfter(deadline: .now() + 2.0, execute: {
                         self.tableView.reloadData()
                     })
+                    if let index = index {
+                        if self.urls[index] == "unity" {
+                            self.performSegue(withIdentifier: "showUnity", sender: index)
+                        } else {
+                            self.performSegue(withIdentifier: "showGame", sender: index)
+                        }
+                    }
                     break
                 default:
                     break
@@ -109,24 +119,31 @@ class GameCenterViewController:UITableViewController{
         cell.detailTextLabel!.font = UIFont(name: "Helvetica", size: 14)
         cell.imageView?.kf.setImage(with: URL(string: images[indexPath.row]), placeholder: nil, options: nil, progressBlock: nil, completionHandler: { (image, _, _, _) in
             DispatchQueue.main.async {
-                cell.imageView?.image = image!.kf.resize(to: CGSize(width: 75, height: 75))
+                if let image = image {
+                    cell.imageView?.image = image.kf.resize(to: CGSize(width: 75, height: 75))
+                }
             }
-
         })
 
         return cell
     }
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        self.performSegue(withIdentifier: "showGame", sender: indexPath.row)
+        if urls[indexPath.row] == "unity" {
+            self.performSegue(withIdentifier: "showUnity", sender: indexPath.row)
+        } else {
+            self.performSegue(withIdentifier: "showGame", sender: indexPath.row)
+        }
     }
 
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        let index = sender as! Int
-        let dest = segue.destination as! GameViewController
-        dest.location = urls[index]
-        dest.name = names[index]
-        dest.id = index + 1
+        if segue.destination is GameViewController {
+            let index = sender as! Int
+            let dest = segue.destination as! GameViewController
+            dest.location = urls[index]
+            dest.name = names[index]
+            dest.id = index + 1
+        }
     }
     override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 75

diff --git a/General/GameView.swift b/General/GameView.swift
@@ -137,11 +137,11 @@ class GameViewController:UIViewController,WKNavigationDelegate,WKUIDelegate,SKPr
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        MobClick.beginLogPageView("Gaming")
+        //MobClick.beginLogPageView("Gaming")
     }
 
     override func viewWillDisappear(_ animated: Bool) {
-        MobClick.endLogPageView("Gaming")
+        //MobClick.endLogPageView("Gaming")
 
         super.viewWillDisappear(animated)
     }

diff --git a/General/InAppSettings.bundle/Authors.plist b/General/InAppSettings.bundle/Authors.plist
@@ -164,22 +164,6 @@
 			<key>Key</key>
 			<string></string>
 		</dict>
-		<dict>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-			<key>Title</key>
-			<string>Secret Zone</string>
-			<key>Key</key>
-			<string></string>
-		</dict>
-		<dict>
-			<key>Type</key>
-			<string>PSTextFieldSpecifier</string>
-			<key>Title</key>
-			<string></string>
-			<key>Key</key>
-			<string>app.code</string>
-		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/General/InAppSettings.bundle/Root.plist b/General/InAppSettings.bundle/Root.plist
@@ -160,14 +160,6 @@
 			<key>File</key>
 			<string>Authors</string>
 		</dict>
-		<dict>
-			<key>Type</key>
-			<string>PSChildPaneSpecifier</string>
-			<key>Title</key>
-			<string>管理</string>
-			<key>File</key>
-			<string>Management</string>
-		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/General/Info.plist b/General/Info.plist
@@ -17,13 +17,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.6</string>
+	<string>1.2.7</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>2</string>
 	<key>CodeNameCN</key>
-	<string>ドライクリーク</string>
+	<string>決別</string>
 	<key>CodeNameEN</key>
-	<string>Arroyo</string>
+	<string>Farewell</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/General/NFLSers-iOS-Bridging-Header.h b/General/NFLSers-iOS-Bridging-Header.h
@@ -1,4 +1,5 @@
 //
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
+
 #import "UMMobClick/MobClick.h"
diff --git a/General/NewsView.swift b/General/NewsView.swift
@@ -40,7 +40,7 @@ class NewsViewController:UITableViewController,FrostedSidebarDelegate{
     ))
 
     required init?(coder aDecoder: NSCoder) {
-        let images = ["resources","game","photo","alumni","ic","forum","wiki","media","weather"]
+        let images = ["resources","game"/*,"photo"*/,"alumni","ic","forum","wiki","media","weather"]
         var barImages = [UIImage]()
         for image in images{
             barImages.append(UIImage(named: image+".png")!)
@@ -58,26 +58,24 @@ class NewsViewController:UITableViewController,FrostedSidebarDelegate{
             self.performSegue(withIdentifier: "showGame", sender: self)
         }
         self.bar.actionForIndex[2] = {
-            self.performSegue(withIdentifier: "showPhoto", sender: self)
-        }
-        self.bar.actionForIndex[3] = {
             self.performSegue(withIdentifier: "showAlumni", sender: self)
         }
-        self.bar.actionForIndex[4] = {
+        self.bar.actionForIndex[3] = {
             self.performSegue(withIdentifier: "showIC", sender: self)
         }
-        self.bar.actionForIndex[5] = {
+        self.bar.actionForIndex[4] = {
             self.performSegue(withIdentifier: "showForum", sender: self)
         }
-        self.bar.actionForIndex[6] = {
+        self.bar.actionForIndex[5] = {
             self.performSegue(withIdentifier: "showWiki", sender: self)
         }
-        self.bar.actionForIndex[7] = {
+        self.bar.actionForIndex[6] = {
             self.performSegue(withIdentifier: "showMedia", sender: self)
         }
-        self.bar.actionForIndex[8] = {
+        self.bar.actionForIndex[7] = {
             self.performSegue(withIdentifier: "showWeather", sender: self)
         }
+        //self.bar.actionForIndex.removeValue(forKey: 2)
 
         self.bar.delegate = self
 
@@ -122,7 +120,7 @@ class NewsViewController:UITableViewController,FrostedSidebarDelegate{
         view.addGestureRecognizer(swipeBack)
 
     }
-    
+
     @objc func refresh() {
         loadNews()
         debugPrint("refresh")
@@ -326,7 +324,7 @@ class NewsViewController:UITableViewController,FrostedSidebarDelegate{
                     }
                     self.showLogin()
                 } else {
-                    MobClick.profileSignIn(withPUID: (String(describing: (json as! [String:Int])["id"]!)))
+                    //MobClick.profileSignIn(withPUID: (String(describing: (json as! [String:Int])["id"]!)))
                     self.getAuthStatus()
                     self.getBadge()
                     self.requestMessage()
@@ -456,7 +454,7 @@ class NewsViewController:UITableViewController,FrostedSidebarDelegate{
             self.performSegue(withIdentifier: "showWeather", sender: self)
             break
         case "game":
-            self.performSegue(withIdentifier: "showGame", sender: self)
+            self.performSegue(withIdentifier: "showGame", sender: in_url)
             break
         default:
             if let url = realurl{
@@ -487,6 +485,11 @@ class NewsViewController:UITableViewController,FrostedSidebarDelegate{
             if(sender as? String != nil){
                 dest.in_url = sender as! String
             }
+        } else if (segue.identifier == "showGame") {
+            let dest = segue.destination as! GameCenterViewController
+            if(sender as? String != nil){
+                dest.in_url = sender as! String
+            }
         }
     }
 

diff --git a/General/ResourcesFiltringView.swift b/General/ResourcesFiltringView.swift
@@ -89,11 +89,11 @@ class ResourcesFiltringViewController:UIViewController, UITableViewDataSource, U
         listRequest()
     }
     override func viewWillAppear(_ animated: Bool) {
-        MobClick.beginLogPageView("Resources")
+        //MobClick.beginLogPageView("Resources")
         UIApplication.shared.isIdleTimerDisabled = false
     }
     override func viewWillDisappear(_ animated: Bool) {
-        MobClick.endLogPageView("Resources")
+        //MobClick.endLogPageView("Resources")
     }
     @objc func setting() {
         var mutipleSelectAction = UIAlertAction()
@@ -212,7 +212,7 @@ class ResourcesFiltringViewController:UIViewController, UITableViewDataSource, U
             response in
             switch response.result{
             case .success(let json):
-
+                self.files.removeAll()
                 let data = (json as! [String:AnyObject])["items"]! as! NSArray
                 for file in data{
                     var name = (file as! [String:Any])["href"] as! String
@@ -279,7 +279,7 @@ class ResourcesFiltringViewController:UIViewController, UITableViewDataSource, U
         }
     }
     func checkForYear(){
-        if(!UserDefaults.standard.bool(forKey: "ettings.resources.rank")){
+        if(!UserDefaults.standard.bool(forKey: "settings.resources.rank")){
             for file in files{
                 if(file.filename.contains("2016")){
                     files.reverse()