声部选择显示异常。（部分机型上宽度UICollectionViewFlowLayout 宽度无法除尽导致异常）

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -1804,6 +1804,7 @@
 		BC2DFF5628BE143A0056105A /* HomeTempLiveCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeTempLiveCell.xib; sourceTree = "<group>"; };
 		BC2DFF5A28C097D60056105A /* talentAnimation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = talentAnimation.json; sourceTree = "<group>"; };
 		BC2DFF5C28C097DC0056105A /* styleAnimation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = styleAnimation.json; sourceTree = "<group>"; };
+		BC3818192A40262200B74F26 /* KSDomain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KSDomain.h; sourceTree = "<group>"; };
 		BC3A4EA928DAC0CD001C4428 /* ShareLiveDisplayView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareLiveDisplayView.h; sourceTree = "<group>"; };
 		BC3A4EAA28DAC0CD001C4428 /* ShareLiveDisplayView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareLiveDisplayView.m; sourceTree = "<group>"; };
 		BC3A4EAC28DAC0D6001C4428 /* ShareLiveDisplayView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ShareLiveDisplayView.xib; sourceTree = "<group>"; };
@@ -3823,6 +3824,7 @@
 				2779346B27E324A10010E277 /* UserKeyHeader.h */,
 				2779346C27E324A10010E277 /* Common.h */,
 				2779346D27E324A10010E277 /* PrefixHeader.pch */,
+				BC3818192A40262200B74F26 /* KSDomain.h */,
 			);
 			path = Define;
 			sourceTree = "<group>";

KulexiuForStudent/KulexiuForStudent/Common/Define/KSDomain.h

@@ -0,0 +1,44 @@
+//
+//  KSDomain.h
+//  KulexiuForStudent
+//
+//  Created by 王智 on 2023/6/19.
+//
+
+#ifndef KSDomain_h
+#define KSDomain_h
+
+//#ifdef DEBUG
+
+//#define hostURL (@"https://dev.colexiu.com")
+//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://dev.colexiu.com/student")
+//#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"0vnjpoad0jbdz")
+//#define SUBMIT_UUID (YES)
+
+// 预生产环境
+
+//#define hostURL (@"https://ponline.colexiu.com")
+//#define SEALCLASSHOST (@"https://ponline.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://ponline.colexiu.com/student")
+//#define SOCKET_URL (@"wss://ponline.colexiu.com/audioAnalysis")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"0vnjpoad0jbdz")
+//#define SUBMIT_UUID (NO)
+
+//#else
+
+#define hostURL (@"https://online.colexiu.com")
+#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
+#define WEBHOST (@"https://online.colexiu.com/student")
+#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
+#define JSPUSH_ENVIRONMENT (YES)
+#define RCIM_KEY (@"e5t4ouvpe42pa")
+#define SUBMIT_UUID (YES)
+
+//#endif
+
+
+#endif /* KSDomain_h */

KulexiuForStudent/KulexiuForStudent/Common/Define/PrefixHeader.pch

@@ -136,37 +136,6 @@ shouldPrevent = NO; \
 // Include any system framework and library headers here that should be included in all compilation units.
 // You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
 
-
-//#ifdef DEBUG
-
-//#define hostURL (@"https://dev.colexiu.com")
-//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://dev.colexiu.com/student")
-//#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
-//#define JSPUSH_ENVIRONMENT (NO)
-//#define RCIM_KEY (@"0vnjpoad0jbdz")
-//#define SUBMIT_UUID (YES)
-
-// 预生产环境
-
-//#define hostURL (@"https://ponline.colexiu.com")
-//#define SEALCLASSHOST (@"https://ponline.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://ponline.colexiu.com/student")
-//#define SOCKET_URL (@"wss://ponline.colexiu.com/audioAnalysis")
-//#define JSPUSH_ENVIRONMENT (NO)
-//#define RCIM_KEY (@"0vnjpoad0jbdz")
-//#define SUBMIT_UUID (NO)
-
-//#else
-
-#define hostURL (@"https://online.colexiu.com")
-#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
-#define WEBHOST (@"https://online.colexiu.com/student")
-#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
-#define JSPUSH_ENVIRONMENT (YES)
-#define RCIM_KEY (@"e5t4ouvpe42pa")
-#define SUBMIT_UUID (YES)
-
-//#endif
+#import "KSDomain.h"
 
 #endif /* PrefixHeader_pch */

KulexiuForStudent/KulexiuForStudent/Module/Login/Controller/InstrumentChooseViewController.m

@@ -219,7 +219,7 @@
 - (UICollectionView *)collectionView {
     if (!_collectionView) {
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        CGFloat width = (NSInteger)((KPortraitWidth - 15 * 2 - 20) / 3.0f);
+        CGFloat width = (NSInteger)((KPortraitWidth - 15 * 2 - 20) / 3);
         CGFloat height = width;
         layout.itemSize = CGSizeMake(width, height);
         layout.headerReferenceSize = CGSizeMake(KPortraitWidth - 30, 40);