XQMuse/Assets.xcassets/Placeholder/bt_private .imageset/Contents.json
File was deleted XQMuse/Assets.xcassets/Placeholder/bt_private .imageset/bt_private @2x.pngBinary files differ
XQMuse/Assets.xcassets/Placeholder/bt_private .imageset/bt_private @3x.pngBinary files differ
XQMuse/Root/.DS_StoreBinary files differ
XQMuse/Root/Course/VC/CourseDetialOfflineVC.swift
@@ -183,10 +183,7 @@ var v = min(scrollView.contentOffset.y / JQ_NavBarHeight, 1) if view_video.isHidden{v = 1.0;return} navigationController?.navigationBar.standardAppearance.backgroundColor = .white.withAlphaComponent(v) print("--->\(v)") if v > 0{ (navigationItem.leftBarButtonItem?.customView as? UIButton)?.setImage(UIImage(named: "btn_back")?.withTintColor(.black.withAlphaComponent(v)), for: .normal) XQMuse/Root/Course/VC/CourseDetialOfflineVC.xib
@@ -28,11 +28,11 @@ <rect key="frame" x="0.0" y="0.0" width="393" height="852"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4KE-wb-44W"> <rect key="frame" x="0.0" y="0.0" width="393" height="852"/> <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4KE-wb-44W"> <rect key="frame" x="0.0" y="0.0" width="393" height="818"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lz1-9S-TY8"> <rect key="frame" x="0.0" y="0.0" width="393" height="805"/> <rect key="frame" x="0.0" y="0.0" width="393" height="715"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="T9q-i3-qB2"> <rect key="frame" x="0.0" y="0.0" width="393" height="414"/> @@ -100,7 +100,7 @@ </subviews> </stackView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SHG-A0-P8Y"> <rect key="frame" x="0.0" y="414" width="393" height="391"/> <rect key="frame" x="0.0" y="414" width="393" height="301"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7hg-kN-gqy"> <rect key="frame" x="22" y="39" width="30" height="18"/> @@ -112,9 +112,9 @@ <nil key="highlightedColor"/> </label> <wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UmN-R4-VrQ"> <rect key="frame" x="0.0" y="76.333333333333314" width="393" height="100"/> <rect key="frame" x="0.0" y="76.333333333333314" width="393" height="10"/> <constraints> <constraint firstAttribute="height" constant="100" id="daa-AS-pyV"/> <constraint firstAttribute="height" constant="10" id="daa-AS-pyV"/> </constraints> <wkWebViewConfiguration key="configuration"> <audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/> @@ -122,7 +122,7 @@ </wkWebViewConfiguration> </wkWebView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i03-rW-DQq"> <rect key="frame" x="137.66666666666666" y="211.33333333333337" width="117.66666666666666" height="144.66666666666663"/> <rect key="frame" x="137.66666666666666" y="121.33333333333336" width="117.66666666666666" height="144.66666666666663"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zlO-OX-u5S"> <rect key="frame" x="10" y="10" width="97.666666666666671" height="97.666666666666671"/> @@ -188,9 +188,9 @@ <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstAttribute="trailing" secondItem="4KE-wb-44W" secondAttribute="trailing" id="LXY-D6-QCg"/> <constraint firstAttribute="bottomMargin" secondItem="4KE-wb-44W" secondAttribute="bottom" id="al3-Bq-xo1"/> <constraint firstItem="4KE-wb-44W" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="ihN-jr-zqy"/> <constraint firstItem="4KE-wb-44W" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="r2w-8v-ZZG"/> <constraint firstAttribute="bottom" secondItem="4KE-wb-44W" secondAttribute="bottom" id="x0Q-YS-Trw"/> </constraints> <point key="canvasLocation" x="-22.137404580152669" y="20.422535211267608"/> </view> XQMuse/Root/Home/CCell/HomeRelaxBanner_2_1_CCell.xib
@@ -100,10 +100,10 @@ <rect key="frame" x="8" y="7" width="34" height="18"/> </imageView> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YMY-eC-fwJ"> <rect key="frame" x="6.9999999999999982" y="6" width="24.333333333333329" height="19.666666666666668"/> <rect key="frame" x="6.9999999999999982" y="20" width="24.333333333333329" height="19.666666666666671"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PHh-bn-ZWL"> <rect key="frame" x="7" y="0.0" width="10.333333333333336" height="19.666666666666668"/> <rect key="frame" x="7.0000000000000009" y="0.0" width="10.333333333333336" height="19.666666666666668"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -138,7 +138,7 @@ <constraint firstItem="988-87-RLf" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="8" id="lIk-og-l06"/> <constraint firstAttribute="trailing" secondItem="nyj-tV-0t4" secondAttribute="trailing" id="oZN-uZ-l0V"/> <constraint firstAttribute="bottom" secondItem="VwD-36-ent" secondAttribute="bottom" id="p7n-UX-5N7"/> <constraint firstItem="YMY-eC-fwJ" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="6" id="qK5-n4-Tp6"/> <constraint firstItem="YMY-eC-fwJ" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="20" id="qK5-n4-Tp6"/> </constraints> <size key="customSize" width="160" height="196"/> <connections> XQMuse/Root/Home/HomeVC.swift
@@ -65,6 +65,7 @@ if needPopToTree{ navigationController?.tabBarController?.selectedIndex = 2 needPopToTree = false } if AudioPlayer.getSharedInstance().scenePlayer?.timeControlStatus == .paused && UserDefaultSettingViewModel.getSetting()?.bgm != nil{ @@ -77,7 +78,7 @@ titleItems.removeAll() timer = Timer.scheduledTimer(timeInterval: 60, target: self, selector: #selector(autoUpdate), userInfo: nil, repeats: true) timer = Timer.scheduledTimer(timeInterval: 30, target: self, selector: #selector(autoUpdate), userInfo: nil, repeats: true) RunLoop.current.add(timer!, forMode: .default) titleItems.append(TitleItem(title: "每日疗愈", subTitle: "Daily Meditation")) @@ -271,10 +272,12 @@ }).disposed(by: disposeBag) //BUDID:17184 let m = MeditationModel() m.id = 0 self.viewModel.privateTodyModels = [m] if !(UserViewModel.getLoginInfo()?.accessToken.isEmpty ?? true){ // if !(UserViewModel.getLoginInfo()?.accessToken.isEmpty ?? true){ Services.getPersonalityPlan().subscribe(onNext: { data in if let m = data.data{ if m.count > 0{ @@ -283,9 +286,9 @@ self.tableView.reloadRows(at: [IndexPath(row: 1, section: 0)], with: .none) } }).disposed(by: disposeBag) }else{ self.tableView.reloadData() } // }else{ // self.tableView.reloadData() // } Services.getMeditationAndCateList().subscribe(onNext: { data in if let m = data.data{ @@ -333,11 +336,17 @@ @objc func autoUpdate(){ print("--->") Services.getTopdayMedita().subscribe(onNext: { data in self.viewModel.todyModel = data.data self.tableView.reloadRows(at: [IndexPath(row: 0, section: 0)], with: .none) }).disposed(by: disposeBag) guard !(viewModel.todyModel?.endPlayTime.isEmpty ?? true) else {return} let todayEndDay = Date().jq_format("yyyy-MM-dd") + " \(viewModel.todyModel!.endPlayTime)" let endDayInterval = Date.jq_StringToTimeInterval(todayEndDay,"yyyy-MM-dd HH:mm:ss") if Date().timeIntervalSince1970 > endDayInterval{ Services.getTopdayMedita().subscribe(onNext: { data in self.viewModel.todyModel = data.data self.tableView.reloadRows(at: [IndexPath(row: 0, section: 0)], with: .none) }).disposed(by: disposeBag) } } @objc func searchAction(){ @@ -430,8 +439,6 @@ cell.img_cover.image = UIImage(named: "bg_today") cell.view_data.isHidden = true } print("--->\(cell)") cell.setplaying() return cell XQMuse/Root/Me/MeVC.swift
@@ -121,7 +121,7 @@ private func setUserUI(model:UserInfoModel){ self.image_userAvatar.sd_setImage(with: URL(string: model.avatar)) self.label_userName.text = model.nickname self.label_phone.text = model.cellPhone self.label_phone.text = model.cellPhone.jq_blotOutPhone() self.label_totalDay.attributedText = AttributedStringbuilder.build().add(string: "\(model.cumulative)", withFont: Def_PingFang(fontSize: 60), withColor: UIColor(hexString: "#353535")!).add(string: "天", withFont: Def_PingFang(fontSize: 16), withColor: UIColor(hexString: "#353535")!).mutableAttributedString
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -27,14 +27,14 @@ <constraint firstAttribute="width" constant="47" id="aWb-4v-Kei"/> </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cob-eJ-7In"> <rect key="frame" x="74.666666666666671" y="27.333333333333329" width="38.333333333333329" height="18"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="---" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cob-eJ-7In"> <rect key="frame" x="74.666666666666686" y="27.333333333333329" width="237" height="18"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/> <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TdQ-J6-aEO"> <rect key="frame" x="120" y="32.666666666666671" width="7.3333333333333286" height="7.3333333333333357"/> <rect key="frame" x="318.66666666666669" y="32.666666666666671" width="7.3333333333333144" height="7.3333333333333357"/> <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="7.5" id="WzQ-9I-rrI"/> @@ -53,8 +53,11 @@ <color key="textColor" red="0.41960784313725491" green="0.41960784313725491" blue="0.41960784313725491" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="00:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tsl-3O-mZM"> <rect key="frame" x="371" y="29.333333333333332" width="35" height="14.333333333333332"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" text="00:00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tsl-3O-mZM"> <rect key="frame" x="336" y="29.333333333333332" width="70" height="14.333333333333332"/> <constraints> <constraint firstAttribute="width" constant="70" id="BSL-fx-Idb"/> </constraints> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/> <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -63,6 +66,7 @@ <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstItem="cob-eJ-7In" firstAttribute="leading" secondItem="RM7-YK-5IB" secondAttribute="trailing" constant="14" id="5pF-H0-Gn8"/> <constraint firstItem="Tsl-3O-mZM" firstAttribute="leading" secondItem="TdQ-J6-aEO" secondAttribute="trailing" constant="10" id="KA8-tl-744"/> <constraint firstItem="TdQ-J6-aEO" firstAttribute="centerY" secondItem="cob-eJ-7In" secondAttribute="centerY" id="P6m-ju-aI3"/> <constraint firstAttribute="trailing" secondItem="Mbc-nK-0T7" secondAttribute="trailing" constant="17.5" id="VSV-se-Nxb"/> <constraint firstItem="Mbc-nK-0T7" firstAttribute="leading" secondItem="RM7-YK-5IB" secondAttribute="trailing" constant="14" id="Xpr-Kr-fiw"/> XQMuse/Root/Other/View/VideoView.swift
@@ -49,13 +49,16 @@ player.url = Url if needFirstImage{ URL.jq_splitVideoFileUrlFps(splitFileUrl: Url, fps: 30) {[weak self] state, images in if let first = images.first{ DispatchQueue.main.async { self?.addPlaceHoderView(firstFPSImage: first) } } if let imageV = Url.jq_getVideoThumbnail(){ self.addPlaceHoderView(firstFPSImage:imageV) } // URL.jq_splitVideoFileUrlFps(splitFileUrl: Url, fps: 1) {[weak self] state, images in // if let first = images.first{ // DispatchQueue.main.async { // self?.addPlaceHoderView(firstFPSImage: first) // } // } // } } if autoPlay{ XQMuse/Root/Plans/PlanGuide_2_VC.swift
@@ -92,16 +92,16 @@ btn_deny.jq_borderWidth = 1 btn_OnceInAWel.jq_borderWidth = 1 UIView.animate(withDuration: 0.3, delay: 0.5) { UIView.animate(withDuration: 0.1, delay: 0.1) { self.label_question.alpha = 1 } UIView.animate(withDuration: 0.3, delay: 0.7) { UIView.animate(withDuration: 0.1, delay: 0.11) { self.btn_sure.alpha = 1 } UIView.animate(withDuration: 0.3, delay: 0.9) { UIView.animate(withDuration: 0.1, delay: 0.12) { self.btn_deny.alpha = 1 } UIView.animate(withDuration: 0.3, delay: 1.2) { UIView.animate(withDuration: 0.1, delay: 0.13) { self.btn_OnceInAWel.alpha = 1 } } @@ -131,20 +131,20 @@ btn_deny.jq_borderWidth = btn_deny.isSelected ? 0:1 btn_OnceInAWel.jq_borderWidth = btn_OnceInAWel.isSelected ? 0:1 UIView.animate(withDuration: 0.3, delay: 0.5) { UIView.animate(withDuration: 0.2, delay: 0.2) { self.label_question.alpha = 0 } UIView.animate(withDuration: 0.3, delay: 0.7) { UIView.animate(withDuration: 0.2, delay: 0.25) { self.btn_sure.alpha = 0 } UIView.animate(withDuration: 0.3, delay: 0.9) { UIView.animate(withDuration: 0.2, delay: 0.3) { self.btn_deny.alpha = 0 } UIView.animate(withDuration: 0.3, delay: 1.2) { UIView.animate(withDuration: 0.2, delay: 0.35) { self.btn_OnceInAWel.alpha = 0 } DispatchQueue.main.asyncAfter(delay: 1.5) { DispatchQueue.main.asyncAfter(delay: 0.8) { if self.questionIndex == self.questions.count - 1{ PlanGuidePromptSupplyView.show { text in if text != nil{ XQMuse/Root/TreeGroup/Pngs/apngb-animated_sun.pngXQMuse/Root/TreeGroup/mov/bg.movBinary files differ
XQMuse/Root/TreeGroup/mov/bg_movie.movBinary files differ
