From 8c8c3dc08d4a934ac5082c9413765a2994f8de0f Mon Sep 17 00:00:00 2001
From: 杨锴 <841720330@qq.com>
Date: 星期二, 08 十月 2024 10:27:22 +0800
Subject: [PATCH] fix UI + StoreKit Config
---
XQMuse/Root/TreeGroup/Pngs/droop/static-level-7.png | 0
XQMuse/Root/Me/VC/NoticeCenterVC.swift | 5 +
XQMuse/Root/Me/MeVC.swift | 16 +++++
XQMuse/Root/Me/VC/NoticeCenterUserRepeaceDetailVC.swift | 1
XQMuse/Root/TreeGroup/Pngs/droop/static-level-8.png | 0
XQMuse/Root/Me/MeVC.xib | 39 ++++++------
XQMuse/Root/TreeGroup/Pngs/droop/static-level-9.png | 0
Pods/QMUIKit/QMUIKit/QMUICore/QMUIConfiguration.m | 2
XQMuse.xcodeproj/project.pbxproj | 12 ++++
XQMuse/Root/Other/View/NoticeBtn.swift | 44 ++++++++++++++
XQMuse/Root/Me/VC/NoticeCenterUserRepeaceDetailVC.xib | 13 ---
XQMuse/Root/Network/Services.swift | 7 ++
12 files changed, 107 insertions(+), 32 deletions(-)
diff --git a/Pods/QMUIKit/QMUIKit/QMUICore/QMUIConfiguration.m b/Pods/QMUIKit/QMUIKit/QMUICore/QMUIConfiguration.m
index 5c24569..09739de 100644
--- a/Pods/QMUIKit/QMUIKit/QMUICore/QMUIConfiguration.m
+++ b/Pods/QMUIKit/QMUIKit/QMUICore/QMUIConfiguration.m
@@ -98,7 +98,7 @@
numberOfClasses = objc_getClassList(NULL, 0);
classes = (__unsafe_unretained Class *)malloc(sizeof(Class) * numberOfClasses);
objc_getClassList(classes, numberOfClasses);
- NSAssert(NO, @"如果你看到这条提示，建议到 GitHub 上提 issue，让我们联系你查看项目的配置表使用情况，否则请注释掉这一行。");
+// NSAssert(NO, @"如果你看到这条提示，建议到 GitHub 上提 issue，让我们联系你查看项目的配置表使用情况，否则请注释掉这一行。");
}
for (NSInteger i = 0; i < numberOfClasses; i++) {
Class class = classesref ? (__bridge Class)classesref[i] : classes[i];
diff --git a/XQMuse.xcodeproj/project.pbxproj b/XQMuse.xcodeproj/project.pbxproj
index 8a952a2..da64511 100644
--- a/XQMuse.xcodeproj/project.pbxproj
+++ b/XQMuse.xcodeproj/project.pbxproj
@@ -9,6 +9,8 @@
/* Begin PBXBuildFile section */
1300BD3B2C6DFB1C000BCA5E /* VIPCenterVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1300BD3A2C6DFB1C000BCA5E /* VIPCenterVC.xib */; };
1300BD3C2C6DFB1C000BCA5E /* VIPCenterVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1300BD392C6DFB1C000BCA5E /* VIPCenterVC.swift */; };
+ 1304526A2CB4CA310049FB3A /* XQMuseStoreKit.storekit in Resources */ = {isa = PBXBuildFile; fileRef = 130452692CB4CA310049FB3A /* XQMuseStoreKit.storekit */; };
+ 1304526C2CB4CB210049FB3A /* StoreKitTestCertificate.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1304526B2CB4CB210049FB3A /* StoreKitTestCertificate.cer */; };
130602862C9178F60019ECDE /* TreeTeskExchangeSuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 130602852C9178F60019ECDE /* TreeTeskExchangeSuccessView.swift */; };
130602882C91790B0019ECDE /* TreeTeskExchangeSuccessView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 130602872C91790B0019ECDE /* TreeTeskExchangeSuccessView.xib */; };
1306028A2C917CD20019ECDE /* TreeTeskEnergyExchangeRecordVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 130602892C917CD20019ECDE /* TreeTeskEnergyExchangeRecordVC.swift */; };
@@ -267,6 +269,7 @@
13E160212C6CB8930027F781 /* CommentListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13E1601E2C6CB8930027F781 /* CommentListVC.swift */; };
13E4ECEE2C80778A0095AD04 /* PlanGuide_2_VC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13E4ECEC2C80778A0095AD04 /* PlanGuide_2_VC.swift */; };
13E4ECEF2C80778A0095AD04 /* PlanGuide_2_VC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13E4ECED2C80778A0095AD04 /* PlanGuide_2_VC.xib */; };
+ 13E7FAC22C9D1644009432D4 /* NoticeBtn.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13E7FAC12C9D1644009432D4 /* NoticeBtn.swift */; };
13EA70012C75F880005DF280 /* IdCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13EA70002C75F880005DF280 /* IdCardView.swift */; };
13EA70042C75FA16005DF280 /* WalletRechargeVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13EA70022C75FA16005DF280 /* WalletRechargeVC.swift */; };
13EA70052C75FA16005DF280 /* WalletRechargeVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13EA70032C75FA16005DF280 /* WalletRechargeVC.xib */; };
@@ -303,6 +306,8 @@
/* Begin PBXFileReference section */
1300BD392C6DFB1C000BCA5E /* VIPCenterVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VIPCenterVC.swift; sourceTree = "<group>"; };
1300BD3A2C6DFB1C000BCA5E /* VIPCenterVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VIPCenterVC.xib; sourceTree = "<group>"; };
+ 130452692CB4CA310049FB3A /* XQMuseStoreKit.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = XQMuseStoreKit.storekit; sourceTree = "<group>"; };
+ 1304526B2CB4CB210049FB3A /* StoreKitTestCertificate.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = StoreKitTestCertificate.cer; sourceTree = "<group>"; };
130602852C9178F60019ECDE /* TreeTeskExchangeSuccessView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TreeTeskExchangeSuccessView.swift; sourceTree = "<group>"; };
130602872C91790B0019ECDE /* TreeTeskExchangeSuccessView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TreeTeskExchangeSuccessView.xib; sourceTree = "<group>"; };
130602892C917CD20019ECDE /* TreeTeskEnergyExchangeRecordVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TreeTeskEnergyExchangeRecordVC.swift; sourceTree = "<group>"; };
@@ -563,6 +568,7 @@
13E1601F2C6CB8930027F781 /* CommentListVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CommentListVC.xib; sourceTree = "<group>"; };
13E4ECEC2C80778A0095AD04 /* PlanGuide_2_VC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlanGuide_2_VC.swift; sourceTree = "<group>"; };
13E4ECED2C80778A0095AD04 /* PlanGuide_2_VC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PlanGuide_2_VC.xib; sourceTree = "<group>"; };
+ 13E7FAC12C9D1644009432D4 /* NoticeBtn.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeBtn.swift; sourceTree = "<group>"; };
13EA70002C75F880005DF280 /* IdCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdCardView.swift; sourceTree = "<group>"; };
13EA70022C75FA16005DF280 /* WalletRechargeVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletRechargeVC.swift; sourceTree = "<group>"; };
13EA70032C75FA16005DF280 /* WalletRechargeVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WalletRechargeVC.xib; sourceTree = "<group>"; };
@@ -985,6 +991,8 @@
13985D892C69B2410046B6DC = {
isa = PBXGroup;
children = (
+ 130452692CB4CA310049FB3A /* XQMuseStoreKit.storekit */,
+ 1304526B2CB4CB210049FB3A /* StoreKitTestCertificate.cer */,
13985D942C69B2410046B6DC /* XQMuse */,
13985D932C69B2410046B6DC /* Products */,
59BB8FFC6411E59FAB177866 /* Pods */,
@@ -1237,6 +1245,7 @@
13EA70002C75F880005DF280 /* IdCardView.swift */,
132C7EF02C8FE3B900A4CA18 /* ChooseOptTitleView.swift */,
132C7EF22C8FE3BF00A4CA18 /* ChooseOptTitleView.xib */,
+ 13E7FAC12C9D1644009432D4 /* NoticeBtn.swift */,
);
path = View;
sourceTree = "<group>";
@@ -1360,6 +1369,7 @@
13A6594E2C6F641100F731FA /* CourseDetail_2_Inner_TCell.xib in Resources */,
13FF0B462C75C820008E26CF /* WalletVC.xib in Resources */,
130B765E2C6C4C33006371AF /* HomeItemListVC.xib in Resources */,
+ 1304526C2CB4CB210049FB3A /* StoreKitTestCertificate.cer in Resources */,
13C9DDD72C8EE8EB0008946B /* apngb-animated-level-9.png in Resources */,
13F24E3D2C75866100D2BA90 /* BindPhone_3_VC.xib in Resources */,
13CBC5D92C73532B00BC66C7 /* MeVC.xib in Resources */,
@@ -1439,6 +1449,7 @@
1300BD3B2C6DFB1C000BCA5E /* VIPCenterVC.xib in Resources */,
139466482C6B8E0200F6FB15 /* UpdatePhoneVC.xib in Resources */,
134A453A2C6E167D00538D78 /* CourseOfficalCommendTopCCell.xib in Resources */,
+ 1304526A2CB4CA310049FB3A /* XQMuseStoreKit.storekit in Resources */,
13BA27132C81B6DD006D4CD1 /* SourceHanSerifCN-Light.otf in Resources */,
132C7EF72C8FE9BB00A4CA18 /* ChooseOptTitleTCell.xib in Resources */,
13C9DDD82C8EE8EB0008946B /* apngb-animated-level-10.png in Resources */,
@@ -1666,6 +1677,7 @@
13334FD52C731C1B00914086 /* VideoView.swift in Sources */,
13FF0B452C75C820008E26CF /* WalletVC.swift in Sources */,
130ED7E72C6AEF5900D0736E /* Home_Style_4_TCell.swift in Sources */,
+ 13E7FAC22C9D1644009432D4 /* NoticeBtn.swift in Sources */,
1308C9B22C7DCDC80017A9FC /* SearchHotTCell.swift in Sources */,
130C070B2C76D8F200ADB098 /* SpendingDetailContentVC.swift in Sources */,
131CE0F92C91298E00D1234A /* TreeTeskListView.swift in Sources */,
diff --git a/XQMuse/Root/Me/MeVC.swift b/XQMuse/Root/Me/MeVC.swift
index e47d95f..c15ae74 100644
--- a/XQMuse/Root/Me/MeVC.swift
+++ b/XQMuse/Root/Me/MeVC.swift
@@ -9,6 +9,8 @@
import QMUIKit
import JQTools
+let Refreh_Notice_Noti = Notification.Name.init("Refreh_Notice_Noti")
+
class MeVC: BaseVC {
@IBOutlet weak var scrollView: UIScrollView!
@@ -26,6 +28,7 @@
@IBOutlet weak var label_sustainDay: UILabel!
@IBOutlet weak var label_today: UILabel!
@IBOutlet weak var image_medal: UIImageView!
+ @IBOutlet weak var btn_notice: NoticeBtn!
@IBOutlet weak var image_userAvatar: UIImageView!
@IBOutlet weak var label_userName: UILabel!
@@ -41,6 +44,7 @@
view_rank.addGestureRecognizer(tap)
getData()
+ queryNotice()
}
override func setUI() {
@@ -59,10 +63,22 @@
btn_share.imagePosition = .top
}
+ private func queryNotice(){
+ Services.queryNotice().subscribe(onNext: {data in
+ self.btn_notice.hasNotice(!(data.data ?? false))
+ }).disposed(by: disposeBag)
+ }
+
override func setRx() {
NotificationCenter.default.rx.notification(UpdateUserProfile_Noti, object: nil).take(until: self.rx.deallocated).subscribe(onNext: { _ in
self.getData()
}).disposed(by: disposeBag)
+
+ NotificationCenter.default.rx.notification(Refreh_Notice_Noti, object: nil).take(until: self.rx.deallocated).subscribe(onNext: { _ in
+ self.queryNotice()
+ }).disposed(by: disposeBag)
+
+
}
diff --git a/XQMuse/Root/Me/MeVC.xib b/XQMuse/Root/Me/MeVC.xib
index 46d4b99..0ab640c 100644
--- a/XQMuse/Root/Me/MeVC.xib
+++ b/XQMuse/Root/Me/MeVC.xib
@@ -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>
@@ -15,6 +15,7 @@
<outlet property="btn_collect" destination="ISF-ez-mrg" id="Evq-fr-yUk"/>
<outlet property="btn_customer" destination="9fM-W9-vHq" id="lDM-Ym-HRC"/>
<outlet property="btn_history" destination="css-Hl-o5F" id="hNT-9T-ggx"/>
+ <outlet property="btn_notice" destination="cNy-lc-dn6" id="iMB-5G-Hna"/>
<outlet property="btn_record" destination="ohz-jh-MYr" id="I71-ch-fvw"/>
<outlet property="btn_setting" destination="gCl-Xh-n2C" id="QuC-zj-2x4"/>
<outlet property="btn_share" destination="503-ii-Lw9" id="v1J-Bx-FQ7"/>
@@ -80,19 +81,19 @@
<rect key="frame" x="0.0" y="0.0" width="368" height="114.33333333333333"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="心泉·疗愈会员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cy9-se-bLv">
- <rect key="frame" x="19.333333333333329" y="23.666666666666671" width="150.66666666666669" height="26.333333333333329"/>
+ <rect key="frame" x="19.333333333333343" y="23.666666666666671" width="142" height="26.333333333333329"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="22"/>
<color key="textColor" red="0.039215686274509803" green="0.25882352941176467" blue="0.074509803921568626" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="升级为高级会员，解锁全部体验" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pJK-nH-NXm">
- <rect key="frame" x="19" y="85" width="143.33333333333334" height="12"/>
+ <rect key="frame" x="19" y="85" width="139.33333333333334" height="12"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" red="0.039215686270000001" green="0.25882352939999997" blue="0.074509803920000006" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="到期" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IcP-op-38A">
- <rect key="frame" x="335" y="86.666666666666657" width="14.333333333333314" height="8.6666666666666714"/>
+ <rect key="frame" x="335.33333333333331" y="86.666666666666657" width="14" height="8.6666666666666714"/>
<fontDescription key="fontDescription" type="system" pointSize="7"/>
<color key="textColor" red="0.039215686270000001" green="0.25882352939999997" blue="0.074509803920000006" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@@ -122,7 +123,7 @@
<rect key="frame" x="0.0" y="0.0" width="368" height="65"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="爱心榜单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tsY-eX-VkA">
- <rect key="frame" x="24.333333333333336" y="21.666666666666657" width="73.666666666666657" height="21.666666666666671"/>
+ <rect key="frame" x="24.333333333333336" y="21.666666666666657" width="71.666666666666657" height="21.666666666666671"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -150,7 +151,7 @@
<rect key="frame" x="0.0" y="82.666666666666657" width="368" height="495.33333333333337"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="疗愈学习记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gF4-HU-eSo">
- <rect key="frame" x="23.999999999999993" y="23" width="110.33333333333331" height="21.666666666666671"/>
+ <rect key="frame" x="23.999999999999993" y="23" width="107.33333333333331" height="21.666666666666671"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -167,13 +168,13 @@
<rect key="frame" x="70" y="92.666666666666686" width="228" height="171"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="累积练习天数" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1zm-h2-b9F">
- <rect key="frame" x="135" y="157.33333333333331" width="98" height="19.333333333333343"/>
+ <rect key="frame" x="136.33333333333334" y="157.33333333333331" width="95.333333333333343" height="19.333333333333343"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.082352941176470587" green="0.15294117647058825" blue="0.082352941176470587" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0天" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YPb-vk-RCa">
- <rect key="frame" x="136" y="192" width="96" height="45"/>
+ <rect key="frame" x="136.66666666666669" y="192" width="94.666666666666686" height="45"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="Ma8-cs-j54"/>
</constraints>
@@ -204,13 +205,13 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="连续练习天数" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wrx-Ep-1Ev">
- <rect key="frame" x="41.333333333333321" y="12.333333333333371" width="79.666666666666686" height="15.666666666666664"/>
+ <rect key="frame" x="42.333333333333321" y="12.333333333333371" width="77.666666666666686" height="15.666666666666664"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lJq-Or-aac">
- <rect key="frame" x="29.333333333333332" y="17" width="6.3333333333333321" height="6.6666666666666679"/>
+ <rect key="frame" x="30.333333333333325" y="17" width="6.3333333333333321" height="6.6666666666666679"/>
<color key="backgroundColor" red="0.6705882352941176" green="0.89803921568627454" blue="0.68627450980392157" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="6.5" id="ODt-X4-p9t"/>
@@ -224,13 +225,13 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="连续练习天数" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ihW-8E-Omi">
- <rect key="frame" x="204.33333333333334" y="12.333333333333371" width="79.666666666666657" height="15.666666666666664"/>
+ <rect key="frame" x="205.33333333333334" y="12.333333333333371" width="77.666666666666657" height="15.666666666666664"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tba-o9-bKq">
- <rect key="frame" x="192.33333333333334" y="17" width="6.3333333333333428" height="6.6666666666666679"/>
+ <rect key="frame" x="193.33333333333334" y="17" width="6.3333333333333428" height="6.6666666666666679"/>
<color key="backgroundColor" red="0.6705882353" green="0.8980392157" blue="0.68627450980000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="6.5" id="MST-0N-jSt"/>
@@ -270,16 +271,16 @@
<rect key="frame" x="21.333333333333343" y="386.66666666666663" width="325" height="50.333333333333314"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="疗愈等级" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z63-U0-xCY">
- <rect key="frame" x="4.6666666666666607" y="16.666666666666742" width="57.333333333333343" height="17"/>
+ <rect key="frame" x="4.6666666666666679" y="16.666666666666742" width="55.666666666666657" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.13725490196078433" green="0.13725490196078433" blue="0.13725490196078433" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_vip_level" translatesAutoresizingMaskIntoConstraints="NO" id="dut-7H-aMv">
- <rect key="frame" x="72" y="11.333333333333373" width="95.666666666666686" height="27.666666666666671"/>
+ <rect key="frame" x="70.333333333333314" y="11.333333333333373" width="95.666666666666686" height="27.666666666666671"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="查看详情" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="flg-Hv-HHC">
- <rect key="frame" x="265.66666666666669" y="18.666666666666742" width="45" height="13.333333333333336"/>
+ <rect key="frame" x="266.66666666666669" y="18.666666666666742" width="44" height="13.333333333333336"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" red="0.40392156862745099" green="0.40392156862745099" blue="0.40392156862745099" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@@ -340,7 +341,7 @@
<rect key="frame" x="0.0" y="595.66666666666663" width="368" height="193.33333333333337"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="常用功能" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vz2-Ss-p4F">
- <rect key="frame" x="25" y="27.666666666666629" width="73.666666666666671" height="21.666666666666671"/>
+ <rect key="frame" x="25" y="27.666666666666629" width="71.666666666666671" height="21.666666666666671"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
<color key="textColor" red="0.13725490200000001" green="0.13725490200000001" blue="0.13725490200000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@@ -435,7 +436,7 @@
<rect key="frame" x="0.0" y="806.66666666666663" width="368" height="193"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="其他功能" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3A8-V9-qVy">
- <rect key="frame" x="25" y="27.333333333333258" width="73.666666666666671" height="21.666666666666671"/>
+ <rect key="frame" x="25" y="27.333333333333258" width="71.666666666666671" height="21.666666666666671"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
<color key="textColor" red="0.13725490200000001" green="0.13725490200000001" blue="0.13725490200000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@@ -541,7 +542,7 @@
<action selector="userProfileAction:" destination="-1" eventType="touchUpInside" id="f8T-XY-tt1"/>
</connections>
</button>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cNy-lc-dn6">
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cNy-lc-dn6" customClass="NoticeBtn" customModule="XQMuse" customModuleProvider="target">
<rect key="frame" x="306" y="17.333333333333329" width="20.666666666666686" height="20.666666666666671"/>
<constraints>
<constraint firstAttribute="width" constant="20.5" id="X9n-5K-WLK"/>
diff --git a/XQMuse/Root/Me/VC/NoticeCenterUserRepeaceDetailVC.swift b/XQMuse/Root/Me/VC/NoticeCenterUserRepeaceDetailVC.swift
index 0abf1ad..942134a 100644
--- a/XQMuse/Root/Me/VC/NoticeCenterUserRepeaceDetailVC.swift
+++ b/XQMuse/Root/Me/VC/NoticeCenterUserRepeaceDetailVC.swift
@@ -11,7 +11,6 @@
@IBOutlet weak var image_avartar: UIImageView!
@IBOutlet weak var label_name: UILabel!
@IBOutlet weak var label_content: UILabel!
- @IBOutlet weak var btn_islike: UIButton!
@IBOutlet weak var image_reply_userAvartar: UIImageView!
@IBOutlet weak var label_reply_name: UILabel!
@IBOutlet weak var label_reply_content: UILabel!
diff --git a/XQMuse/Root/Me/VC/NoticeCenterUserRepeaceDetailVC.xib b/XQMuse/Root/Me/VC/NoticeCenterUserRepeaceDetailVC.xib
index 8bfd828..8de4bc0 100644
--- a/XQMuse/Root/Me/VC/NoticeCenterUserRepeaceDetailVC.xib
+++ b/XQMuse/Root/Me/VC/NoticeCenterUserRepeaceDetailVC.xib
@@ -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="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -11,7 +11,6 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NoticeCenterUserRepeaceDetailVC" customModule="XQMuse" customModuleProvider="target">
<connections>
- <outlet property="btn_islike" destination="D0U-is-fLy" id="Nol-JH-4e8"/>
<outlet property="image_avartar" destination="z1T-aN-oSN" id="EC2-yy-BZh"/>
<outlet property="image_reply_userAvartar" destination="BAp-Ga-8ex" id="90g-66-wf5"/>
<outlet property="label_content" destination="rDr-su-720" id="ual-Wr-y4F"/>
@@ -92,11 +91,6 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D0U-is-fLy">
- <rect key="frame" x="361" y="232.66666666666669" width="18" height="22"/>
- <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
- <state key="normal" image="btn_good_1"/>
- </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hpx-3J-7nI">
<rect key="frame" x="61" y="257.66666666666669" width="322" height="17"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
@@ -152,12 +146,10 @@
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
- <constraint firstItem="D0U-is-fLy" firstAttribute="centerY" secondItem="PoX-Mz-vPh" secondAttribute="centerY" id="0fO-yZ-xrH"/>
<constraint firstItem="rDr-su-720" firstAttribute="leading" secondItem="Q2t-Ag-qNp" secondAttribute="leading" constant="27" id="1Jg-8R-Bzk"/>
<constraint firstAttribute="trailing" secondItem="hpx-3J-7nI" secondAttribute="trailing" constant="10" id="2Um-do-D9T"/>
<constraint firstItem="Lsm-BX-nLi" firstAttribute="top" secondItem="96T-Ma-Y0w" secondAttribute="bottom" constant="7" id="40A-Aw-Grj"/>
<constraint firstItem="Z79-Yp-l1I" firstAttribute="top" secondItem="rDr-su-720" secondAttribute="bottom" constant="23" id="79u-Hg-Os0"/>
- <constraint firstAttribute="trailing" secondItem="D0U-is-fLy" secondAttribute="trailing" constant="14" id="7G4-Zy-UzB"/>
<constraint firstAttribute="height" constant="600" id="86I-Xh-n7p"/>
<constraint firstItem="ckR-f8-uGd" firstAttribute="leading" secondItem="Q2t-Ag-qNp" secondAttribute="leading" id="C94-SL-fn5"/>
<constraint firstAttribute="trailing" secondItem="rDr-su-720" secondAttribute="trailing" constant="27" id="CCx-jX-l8a"/>
@@ -207,7 +199,6 @@
</view>
</objects>
<resources>
- <image name="btn_good_1" width="18" height="18"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
diff --git a/XQMuse/Root/Me/VC/NoticeCenterVC.swift b/XQMuse/Root/Me/VC/NoticeCenterVC.swift
index db19b43..d07ccae 100644
--- a/XQMuse/Root/Me/VC/NoticeCenterVC.swift
+++ b/XQMuse/Root/Me/VC/NoticeCenterVC.swift
@@ -28,6 +28,11 @@
viewModel.beginRefresh()
}
+ override func viewDidDisappear(_ animated: Bool) {
+ super.viewDidDisappear(animated)
+ NotificationCenter.default.post(name: Refreh_Notice_Noti, object: nil)
+ }
+
override func setUI() {
super.setUI()
view.backgroundColor = UIColor(hexString: "#fafafa")
diff --git a/XQMuse/Root/Network/Services.swift b/XQMuse/Root/Network/Services.swift
index 53e0ad6..e85491a 100644
--- a/XQMuse/Root/Network/Services.swift
+++ b/XQMuse/Root/Network/Services.swift
@@ -617,6 +617,13 @@
return NetworkRequest.request(params: params, method: .post, progress: true)
}
+ class func queryNotice()->Observable<BaseResponse<Bool>>{
+ let params = ParamsAppender.build(url: All_Url)
+ .interface(url: "/user/client/user/notice-record/queryNotice")
+ .append(key: "apipost_id", value: "37771d0cf0e312")
+ return NetworkRequest.request(params: params, method: .post, progress: false)
+ }
+
diff --git a/XQMuse/Root/Other/View/NoticeBtn.swift b/XQMuse/Root/Other/View/NoticeBtn.swift
new file mode 100644
index 0000000..60d7125
--- /dev/null
+++ b/XQMuse/Root/Other/View/NoticeBtn.swift
@@ -0,0 +1,44 @@
+//
+// NoticeBtn.swift
+// XQMuse
+//
+// Created by 无故事王国 on 2024/9/20.
+//
+
+import UIKit
+
+class NoticeBtn: UIButton {
+
+ private let redView = UIView()
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ setUI()
+ }
+
+ required init?(coder: NSCoder) {
+ super.init(coder: coder)
+ }
+
+ override func awakeFromNib() {
+ super.awakeFromNib()
+ setUI()
+ }
+
+ private func setUI(){
+ redView.isHidden = true
+ redView.backgroundColor = UIColor(hexString: "#FF0025")
+ redView.jq_cornerRadius = 3
+ addSubview(redView)
+ redView.snp.makeConstraints { make in
+ make.top.equalToSuperview().offset(-1)
+ make.right.equalToSuperview().offset(1)
+ make.width.height.equalTo(6)
+ }
+ }
+
+ func hasNotice(_ s:Bool){
+ redView.isHidden = s
+ }
+
+}
diff --git a/XQMuse/Root/TreeGroup/Pngs/droop/static-level-7.png b/XQMuse/Root/TreeGroup/Pngs/droop/static-level-7.png
index d7f5db3..a7807bf 100644
--- a/XQMuse/Root/TreeGroup/Pngs/droop/static-level-7.png
+++ b/XQMuse/Root/TreeGroup/Pngs/droop/static-level-7.png
Binary files differ
diff --git a/XQMuse/Root/TreeGroup/Pngs/droop/static-level-8.png b/XQMuse/Root/TreeGroup/Pngs/droop/static-level-8.png
index b3ff39e..ec55992 100644
--- a/XQMuse/Root/TreeGroup/Pngs/droop/static-level-8.png
+++ b/XQMuse/Root/TreeGroup/Pngs/droop/static-level-8.png
Binary files differ
diff --git a/XQMuse/Root/TreeGroup/Pngs/droop/static-level-9.png b/XQMuse/Root/TreeGroup/Pngs/droop/static-level-9.png
index ce2a9a1..aa187f8 100644
--- a/XQMuse/Root/TreeGroup/Pngs/droop/static-level-9.png
+++ b/XQMuse/Root/TreeGroup/Pngs/droop/static-level-9.png
Binary files differ
--
Gitblit v1.7.1