添加了语音播报功能并修复了之前版本存在的bug

NathanYu1124 · Mar 22, 2020 · f15e63c · f15e63c
1 parent 0db6495
commit f15e63c
Show file tree

Hide file tree

Showing 39 changed files with 118 additions and 273 deletions.
diff --git a/Imgs/mainView.png b/Imgs/mainView.png
diff --git a/PLR_Vision.xcodeproj/project.pbxproj b/PLR_Vision.xcodeproj/project.pbxproj
@@ -2578,7 +2578,7 @@
 					"@loader_path/../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/OpenCV";
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.inkinc.PLR-Vision";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "PLR_Vision/Others/PLR_Vision-Bridging-Header.h";
@@ -2611,7 +2611,7 @@
 					"@loader_path/../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/OpenCV";
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.inkinc.PLR-Vision";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "PLR_Vision/Others/PLR_Vision-Bridging-Header.h";

diff --git a/PLR_Vision/Assets.xcassets/1.imageset/1.jpg b/PLR_Vision/Assets.xcassets/1.imageset/1.jpg
diff --git a/PLR_Vision/Assets.xcassets/StatusBarButtonImage.imageset/Contents.json b/PLR_Vision/Assets.xcassets/StatusBarButtonImage.imageset/Contents.json
diff --git a/...ision/Assets.xcassets/StatusBarButtonImage.imageset/StatusBarButtonImage@2x.png b/...ision/Assets.xcassets/StatusBarButtonImage.imageset/StatusBarButtonImage@2x.png
diff --git a/PLR_Vision/Assets.xcassets/back-arrow.imageset/back-arrow.png b/PLR_Vision/Assets.xcassets/back-arrow.imageset/back-arrow.png
diff --git a/PLR_Vision/Assets.xcassets/chinese_flag.imageset/Contents.json b/PLR_Vision/Assets.xcassets/chinese_flag.imageset/Contents.json
diff --git a/PLR_Vision/Assets.xcassets/chinese_flag.imageset/chinese_flag.png b/PLR_Vision/Assets.xcassets/chinese_flag.imageset/chinese_flag.png
diff --git a/PLR_Vision/Assets.xcassets/choseScan.imageset/Contents.json b/PLR_Vision/Assets.xcassets/choseScan.imageset/Contents.json
diff --git a/PLR_Vision/Assets.xcassets/choseScan.imageset/choseScan.png b/PLR_Vision/Assets.xcassets/choseScan.imageset/choseScan.png
diff --git a/PLR_Vision/Assets.xcassets/more.imageset/more.png b/PLR_Vision/Assets.xcassets/more.imageset/more.png
diff --git a/PLR_Vision/Assets.xcassets/more_red.imageset/Contents.json b/PLR_Vision/Assets.xcassets/more_red.imageset/Contents.json
diff --git a/PLR_Vision/Assets.xcassets/more_red.imageset/more_red.png b/PLR_Vision/Assets.xcassets/more_red.imageset/more_red.png
diff --git a/PLR_Vision/Assets.xcassets/nextArrow.imageset/Contents.json b/PLR_Vision/Assets.xcassets/nextArrow.imageset/Contents.json
diff --git a/PLR_Vision/Assets.xcassets/nextArrow.imageset/nextArrow.png b/PLR_Vision/Assets.xcassets/nextArrow.imageset/nextArrow.png
diff --git a/PLR_Vision/Assets.xcassets/plate_blue.imageset/Contents.json b/PLR_Vision/Assets.xcassets/plate_blue.imageset/Contents.json
diff --git a/PLR_Vision/Assets.xcassets/plate_blue.imageset/plate_blue.png b/PLR_Vision/Assets.xcassets/plate_blue.imageset/plate_blue.png
diff --git a/PLR_Vision/Assets.xcassets/plate_yellow.imageset/Contents.json b/PLR_Vision/Assets.xcassets/plate_yellow.imageset/Contents.json
diff --git a/PLR_Vision/Assets.xcassets/plate_yellow.imageset/plate_yellow.png b/PLR_Vision/Assets.xcassets/plate_yellow.imageset/plate_yellow.png
diff --git a/PLR_Vision/Assets.xcassets/preArrow.imageset/Contents.json b/PLR_Vision/Assets.xcassets/preArrow.imageset/Contents.json
diff --git a/PLR_Vision/Assets.xcassets/preArrow.imageset/preArrow.png b/PLR_Vision/Assets.xcassets/preArrow.imageset/preArrow.png
diff --git a/.../Assets.xcassets/1.imageset/Contents.json → ...ets.xcassets/radio.imageset/Contents.json b/.../Assets.xcassets/1.imageset/Contents.json → ...ets.xcassets/radio.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "1.jpg",
+      "filename" : "radio.png",
       "scale" : "1x"
     },
     {

diff --git a/PLR_Vision/Assets.xcassets/radio.imageset/radio.png b/PLR_Vision/Assets.xcassets/radio.imageset/radio.png
diff --git a/...cassets/back-arrow.imageset/Contents.json → .../radio_highlighted.imageset/Contents.json b/...cassets/back-arrow.imageset/Contents.json → .../radio_highlighted.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "back-arrow.png",
+      "filename" : "sound-waves.png",
       "scale" : "1x"
     },
     {

diff --git a/PLR_Vision/Assets.xcassets/radio_highlighted.imageset/sound-waves.png b/PLR_Vision/Assets.xcassets/radio_highlighted.imageset/sound-waves.png
diff --git a/PLR_Vision/Assets.xcassets/smartScan.imageset/Contents.json b/PLR_Vision/Assets.xcassets/smartScan.imageset/Contents.json
diff --git a/PLR_Vision/Assets.xcassets/smartScan.imageset/smartScan.png b/PLR_Vision/Assets.xcassets/smartScan.imageset/smartScan.png
diff --git a/PLR_Vision/Assets.xcassets/videoPlay.imageset/Contents.json b/PLR_Vision/Assets.xcassets/videoPlay.imageset/Contents.json
diff --git a/PLR_Vision/Assets.xcassets/videoPlay.imageset/videoPlay.png b/PLR_Vision/Assets.xcassets/videoPlay.imageset/videoPlay.png
diff --git a/PLR_Vision/Assets.xcassets/videobg.imageset/Contents.json b/PLR_Vision/Assets.xcassets/videobg.imageset/Contents.json
diff --git a/PLR_Vision/Assets.xcassets/videobg.imageset/videobg.png b/PLR_Vision/Assets.xcassets/videobg.imageset/videobg.png
diff --git a/...sets.xcassets/more.imageset/Contents.json → ...ts.xcassets/wave_1.imageset/Contents.json b/...sets.xcassets/more.imageset/Contents.json → ...ts.xcassets/wave_1.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "more.png",
+      "filename" : "wave_1.png",
       "scale" : "1x"
     },
     {

diff --git a/PLR_Vision/Assets.xcassets/wave_1.imageset/wave_1.png b/PLR_Vision/Assets.xcassets/wave_1.imageset/wave_1.png
diff --git a/PLR_Vision/Controller/AboutViewController.swift b/PLR_Vision/Controller/AboutViewController.swift
@@ -18,7 +18,7 @@ class AboutViewController: NSViewController {
 
         view.wantsLayer = true
         // CGColor(red: 249 / 255, green: 241 / 255, blue: 233 / 255, alpha: 0.6)
-        view.layer?.backgroundColor = CGColor(red: 0 / 255, green: 0 / 255, blue: 0 / 255, alpha: 0.8)
+        view.layer?.backgroundColor = CGColor.clear
 
         detailView.wantsLayer = true
         detailView.layer?.backgroundColor = L_Yellow
@@ -32,25 +32,25 @@ class AboutViewController: NSViewController {
 
     // 项目地址
     @IBAction func showProjectPage(_ sender: NSButton) {
-        let url = URL(fileURLWithPath: "https://github.com/NathanYu1124/PLR_Vision")
+        let url = URL(string: "https://github.com/NathanYu1124/PLR_Vision")!
         NSWorkspace.shared.open(url)
     }
 
     // 关于我们
     @IBAction func showUsPage(_ sender: NSButton) {
-        let url = URL(fileURLWithPath: "https://github.com/NathanYu1124/PLR_Vision")
+        let url = URL(string: "https://github.com/NathanYu1124/PLR_Vision")!
         NSWorkspace.shared.open(url)
     }
 
     // 帮助支持
     @IBAction func showHelpPage(_ sender: NSButton) {
-        let url = URL(fileURLWithPath: "https://github.com/NathanYu1124/PLR_Vision")
+        let url = URL(string: "https://github.com/NathanYu1124/PLR_Vision")!
         NSWorkspace.shared.open(url)
     }
 
     // 更新日志
     @IBAction func showLogPage(_ sender: NSButton) {
-        let url = URL(fileURLWithPath: "https://github.com/NathanYu1124/PLR_Vision/releases")
+        let url = URL(string: "https://github.com/NathanYu1124/PLR_Vision/releases")!
         NSWorkspace.shared.open(url)
     }
 }