no message

ShorthandMaster.xcodeproj/project.pbxproj

@@ -920,20 +920,22 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 6244YAV33V;
+				DEVELOPMENT_TEAM = 8F4PP38DC3;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/ShorthandMaster/PrefixHeader.pch";
 				INFOPLIST_FILE = ShorthandMaster/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = SH.ShorthandMaster;
+				MARKETING_VERSION = 1.0.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ShorthandMaster.www;
 				PRODUCT_NAME = "速记大师";
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ShorthandMaster/ShorthandMaster-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "ShorthandMaster-Swift.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -943,20 +945,22 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 6244YAV33V;
+				DEVELOPMENT_TEAM = 8F4PP38DC3;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/ShorthandMaster/PrefixHeader.pch";
 				INFOPLIST_FILE = ShorthandMaster/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = SH.ShorthandMaster;
+				MARKETING_VERSION = 1.0.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ShorthandMaster.www;
 				PRODUCT_NAME = "速记大师";
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ShorthandMaster/ShorthandMaster-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "ShorthandMaster-Swift.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};

ShorthandMaster/Assets.xcassets/AppIcon.appiconset/Contents.json

 {
   "images" : [
     {
+      "filename" : "appicon-8.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "appicon-7.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
+      "filename" : "appicon-6.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "appicon-5.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
+      "filename" : "appicon-4.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "appicon-3.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
+      "filename" : "appicon-2.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
+      "filename" : "appicon-1.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
+      "filename" : "appicon-17.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
+      "filename" : "appicon-16.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "appicon-15.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
+      "filename" : "appicon-14.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "appicon-13.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
+      "filename" : "appicon-12.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "appicon-11.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
+      "filename" : "appicon-10.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
+      "filename" : "appicon-9.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
+      "filename" : "appicon.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"

ShorthandMaster/Assets.xcassets/Nav/Contents.json

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ShorthandMaster/Assets.xcassets/Nav/nav_back.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "路径@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "路径@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ShorthandMaster/Base/SHBaseViewController.swift

@@ -22,18 +22,24 @@ class SHBaseViewController: UIViewController {
          
         view.backgroundColor = .white
         automaticallyAdjustsScrollViewInsets = false
-        
-        navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
-        
+                
         self.navigationController?.navigationBar.isTranslucent = true
         self.tabBarController?.tabBar.isTranslucent = true
         self.edgesForExtendedLayout = .bottom
+        
+        navigationItem.leftBarButtonItem = UIBarButtonItem.init(image: UIImage.init(named: "nav_back"), style: .plain, target: self, action: #selector(goback))
+            
+//        UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
     }
     
     @objc public func setupUI(){
         
     }
     
+    @objc public func goback(){
+        self.navigationController?.popViewController(animated: true)
+    }
+    
     deinit {
         logWarning("\(#file) deinit")
     }

ShorthandMaster/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>

ShorthandMaster/Mine/SHMineViewController.swift

@@ -48,16 +48,18 @@ class SHMineViewController: SHBaseViewController {
     }
     
     func getUserInfo(){
-        loginStatusLab.text = SHUserAccountManager.shared.userInfo!.phoneNo.length == 0 ? SHUserAccountManager.shared.userInfo!.phoneNo : " "
-        userNameLab.text = "用户ID:" + SHUserAccountManager.shared.userInfo!.uid
-        if SHUserAccountManager.shared.userInfo?.isMember == true{
-            lockBtn.isHidden = true
-            lockLab.text = "功能已解锁"
-            lockDetailsLab.text = "解锁全部功能"
-        }else {
-            lockBtn.isHidden = false
-            lockLab.text = "功能未解锁"
-            lockDetailsLab.text = "解锁使用更多服务"
+        if let userInfo = SHUserAccountManager.shared.userInfo {
+            loginStatusLab.text = userInfo.phoneNo.length == 0 ? userInfo.phoneNo : " "
+            userNameLab.text = "用户ID:" + userInfo.uid
+            if userInfo.isMember == true{
+                lockBtn.isHidden = true
+                lockLab.text = "功能已解锁"
+                lockDetailsLab.text = "解锁全部功能"
+            }else {
+                lockBtn.isHidden = false
+                lockLab.text = "功能未解锁"
+                lockDetailsLab.text = "解锁使用更多服务"
+            }
         }
     }
     

ShorthandMaster/Record/Record.storyboard

@@ -16,7 +16,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rxv-bX-pim">
+                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rxv-bX-pim">
                                 <rect key="frame" x="0.0" y="44" width="414" height="818"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="点击下方按钮开始会议记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e3a-rx-wr2">
@@ -99,6 +99,22 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eQg-Jj-T12">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="862"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="点击下方按钮开始会议记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JlT-EC-bWg">
+                                        <rect key="frame" x="84.5" y="419" width="245" height="24"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                                        <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstItem="JlT-EC-bWg" firstAttribute="centerX" secondItem="eQg-Jj-T12" secondAttribute="centerX" id="0wG-Wa-Y9k"/>
+                                    <constraint firstItem="JlT-EC-bWg" firstAttribute="centerY" secondItem="eQg-Jj-T12" secondAttribute="centerY" id="dVX-Ya-vaG"/>
+                                </constraints>
+                            </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Fqf-Ut-95k">
                                 <rect key="frame" x="0.0" y="44" width="414" height="818"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
@@ -161,8 +177,12 @@
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
+                            <constraint firstItem="eQg-Jj-T12" firstAttribute="leading" secondItem="DUU-FR-ISH" secondAttribute="leading" id="0ce-Ts-2mL"/>
                             <constraint firstItem="Fqf-Ut-95k" firstAttribute="leading" secondItem="DUU-FR-ISH" secondAttribute="leading" id="49u-LG-QQe"/>
                             <constraint firstItem="hcc-3O-zgx" firstAttribute="centerY" secondItem="Iqb-8q-lkf" secondAttribute="centerY" multiplier="1.7" id="641-XT-zpb"/>
+                            <constraint firstItem="eQg-Jj-T12" firstAttribute="trailing" secondItem="DUU-FR-ISH" secondAttribute="trailing" id="BEc-ex-saa"/>
+                            <constraint firstItem="eQg-Jj-T12" firstAttribute="top" secondItem="Iqb-8q-lkf" secondAttribute="top" id="OKQ-yA-G0p"/>
+                            <constraint firstItem="DUU-FR-ISH" firstAttribute="bottom" secondItem="eQg-Jj-T12" secondAttribute="bottom" id="SJH-Ke-fuC"/>
                             <constraint firstItem="Fqf-Ut-95k" firstAttribute="top" secondItem="DUU-FR-ISH" secondAttribute="top" id="Y0T-Gz-EAD"/>
                             <constraint firstItem="DUU-FR-ISH" firstAttribute="trailing" secondItem="Fqf-Ut-95k" secondAttribute="trailing" id="aj8-fl-bCj"/>
                             <constraint firstItem="hcc-3O-zgx" firstAttribute="centerX" secondItem="Iqb-8q-lkf" secondAttribute="centerX" id="rZl-92-1Fz"/>
@@ -171,6 +191,8 @@
                         <viewLayoutGuide key="safeArea" id="DUU-FR-ISH"/>
                     </view>
                     <connections>
+                        <outlet property="maskView" destination="eQg-Jj-T12" id="6Xy-ya-q57"/>
+                        <outlet property="recorderBtn" destination="hcc-3O-zgx" id="Pol-y7-PSw"/>
                         <outlet property="tableView" destination="Fqf-Ut-95k" id="toH-8q-k9e"/>
                     </connections>
                 </viewController>

ShorthandMaster/Record/SHRecordListViewController.swift

@@ -11,6 +11,8 @@ import UIKit
 class SHRecordListViewController: SHBaseViewController {
     
     @IBOutlet weak var tableView: UITableView?
+    @IBOutlet var maskView: UIView!
+    @IBOutlet var recorderBtn: UIButton!
     var dataSources: Array<SHRecordModel> = []
     
     override func viewWillAppear(_ animated: Bool) {
@@ -37,6 +39,13 @@ class SHRecordListViewController: SHBaseViewController {
                 dataSources.append(model)
             }
         }
+        
+        if dataSources.count == 0 {
+            self.view.bringSubviewToFront(maskView)
+            self.view.bringSubviewToFront(recorderBtn)
+        }else {
+            self.view.sendSubviewToBack(maskView)
+        }
     }
     
     func removeModel(_ indexPath: IndexPath){

ShorthandMaster/Record/SHRecordShowViewController.swift

@@ -71,6 +71,12 @@ class SHRecordShowViewController: SHBaseViewController {
         prepareRecognition()
     }
     
+    deinit {
+        player?.pause()
+        playerTimer?.invalidate()
+        confirmCilck()
+    }
+    
     func prepareRecognition(){
         
         let documentsFile = (NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true).first)!.appending(model!.pathFile)
@@ -103,7 +109,7 @@ class SHRecordShowViewController: SHBaseViewController {
     
     override func setupUI(){
         
-        self.navigationItem.leftBarButtonItem = UIBarButtonItem.init(image: UIImage.init(named: "record_nav_user"), style: .plain, target: self, action: #selector(userCilck))
+//        self.navigationItem.leftBarButtonItem = UIBarButtonItem.init(image: UIImage.init(named: "record_nav_user"), style: .plain, target: self, action: #selector(userCilck))
         
 //        self.navigationItem.rightBarButtonItem = UIBarButtonItem.init(image: UIImage.init(named: "record_nav_confirm"), style: .plain, target: self, action: #selector(confirmCilck))
         
@@ -211,6 +217,8 @@ class SHRecordShowViewController: SHBaseViewController {
 //        if player?.isPlaying == false{
         recordTextView?.attributedText = self.textView_text(model!.txt)
 //        }
+        recognitionTask = nil
+        recognitionRequest = nil
     }
     
     @IBAction func playBtn(_ sender:UIButton){
@@ -330,8 +338,4 @@ class SHRecordShowViewController: SHBaseViewController {
         let timeString  = String(format: "%02lu:%02lu", minutes, second)
         return timeString
     }
-    
-    deinit {
-        playerTimer?.invalidate()
-    }
 }

ShorthandMaster/Record/SHRecordViewController.swift

@@ -84,7 +84,7 @@ class SHRecordViewController: SHBaseViewController {
         self.view.bringSubviewToFront(maskView)
         self.view.bringSubviewToFront(recorderBtn)
         
-        self.navigationItem.leftBarButtonItem = UIBarButtonItem.init(image: UIImage.init(named: "record_nav_user"), style: .plain, target: self, action: #selector(userCilck))
+//        self.navigationItem.leftBarButtonItem = UIBarButtonItem.init(image: UIImage.init(named: "record_nav_user"), style: .plain, target: self, action: #selector(userCilck))
         
         self.view.layoutIfNeeded()
         self.view.layoutSubviews()
@@ -99,6 +99,8 @@ class SHRecordViewController: SHBaseViewController {
         SHLocationManager.shared.locationStatusService { (address) in
             self.currentAddress = address
         }
+        
+        setNavTitleAndConfirmBtn()
     }
     
     func setNavTitleAndConfirmBtn(){
@@ -151,6 +153,9 @@ class SHRecordViewController: SHBaseViewController {
                     self.save = false
                     self.recorder = self.getRecorder()
                 }
+                DispatchQueue.main.asyncAfter(deadline: .now()+0.5) {
+                    self.navigationController?.popViewController(animated: true)
+                }
             }
         }
     }
@@ -190,7 +195,7 @@ class SHRecordViewController: SHBaseViewController {
     
     @objc @IBAction func recordBtnClick(_ sender:UIButton){
         
-        setNavTitleAndConfirmBtn()
+//        setNavTitleAndConfirmBtn()
         
         sender.setImage(UIImage.init(named: "record_pause"), for: .normal)
         sender.isSelected = !sender.isSelected

ShorthandMaster/Share/Network/CMNetworkManager.swift

@@ -268,8 +268,8 @@ private extension CMNetworkManager {
         params["model"]    = UIDevice.current.model
         params["vc"]       = UIDevice.appVersion
         params["platform"] = "ios"
-        params["pkg"]      = "com.cleanerteam.cleanmaster"
-        params["appLs"]    = "8428c6c2ce7b8b68"
+        params["pkg"]      = Bundle.main.bundleIdentifier
+        params["appLs"]    = "2eb3fbed00dc4752"
         params["source"]   = "AppStore"
         params["module"]   = "behavior"
         params["device"]   = SwiftKeyChain.getKeyChainUUID()