Browse Source

Merge branch 'master' of https://git.yishihui.com/iOS/Introduce

wenweiwei 3 years ago
parent
commit
1bd9266535

+ 2 - 0
Introduce/PQConfig.plist

@@ -6,5 +6,7 @@
 	<string>ENVModeTest</string>
 	<key>ENChannel</key>
 	<string>Appstore</string>
+	<key>ENBuildTime</key>
+	<string>1990-01-01 00:00:00</string>
 </dict>
 </plist>

+ 1 - 0
Introduce/Record/INPhotoVideosController.swift

@@ -116,6 +116,7 @@ class INPhotoVideosController: BFBaseViewController {
             detailVc.isShowNextBtn = true
             detailVc.maxChoseNum = 20
             detailVc.isStuckPoint = true
+            detailVc.canChose = (self?.chosedAsset?.count ?? 0 < 20)
             detailVc.materialDetailClickHandle = { [weak self] isMaterialSelected, materialData in
                 if isMaterialSelected != materialData?.isSelected {
                     self?.photoMaterialVc.updateMaterials(isSelected:!(isMaterialSelected ?? false), materialData: materialData)

+ 15 - 0
Introduce/Record/INRecorderController.swift

@@ -68,6 +68,16 @@ class INRecorderController: BFBaseViewController {
         return l
     }()
     
+    //显示编译时间
+    lazy var buildTimeLabel:UILabel = {
+        let l = UILabel.init(frame: CGRect.init(x: 0, y: 120, width: cScreenWidth, height: 20))
+        l.text = "打包时间:" + PQENVUtil.shared.ENBuildTime
+        l.textColor = .white
+        l.font = UIFont.boldSystemFont(ofSize: 18)
+        l.textAlignment = .left
+        return l
+    }()
+ 
     lazy var protocolLab: TYAttributedLabel = {
         let protocolLab = TYAttributedLabel()
         protocolLab.highlightedLinkBackgroundColor = UIColor.clear
@@ -160,6 +170,10 @@ class INRecorderController: BFBaseViewController {
         view.backgroundColor = .black
         view.addSubview(bgView)
         
+        if(PQENVUtil.shared.channel == "Development"){
+            view.addSubview(buildTimeLabel)
+        }
+      
         view.addSubview(centerView)
         view.addSubview(bottomView)
         centerView.snp.makeConstraints { make in
@@ -174,6 +188,7 @@ class INRecorderController: BFBaseViewController {
             make.left.equalToSuperview().offset(5)
             make.width.height.equalTo(130)
         }
+        
         let l = UILabel()
         l.text = "选择视频/图片\n开始讲解"
         l.textColor = UIColor.hexColor(hexadecimal: "#8C9399")

+ 1 - 1
Introduce/Record/INVideoExportController.swift

@@ -594,7 +594,7 @@ class INVideoExportController: BFBaseViewController {
                 }
                 if isFinished {
                     DispatchQueue.main.async {
-                        cShowHUB(superView: nil, msg: "保存成功")
+                        cShowHUB(superView: nil, msg: "保存成功", style: 1)
                     }
                     if sself.saveAllBtn.isSelected {
                         sself.hasSaveAll = true