Skip to content

陈高翔 / DreamSleep-iOS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 342a122f 由 cgx
选项

修复正式环境黑夜模式出现crash

1 个父辈 7211d7d5
全部展开
内嵌 并排
正在显示 9 个修改的文件 包含 67 行增加 和 53 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
...@@ -2433,10 +2433,11 @@ ...@@ -2433,10 +2433,11 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
App_Display_Name = "小梦睡眠-Dev"; App_Display_Name = "小梦睡眠-Dev";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
...@@ -2514,10 +2515,11 @@ ...@@ -2514,10 +2515,11 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
App_Display_Name = "小梦睡眠-冥想解压助眠健康养生"; App_Display_Name = "小梦睡眠-冥想解压助眠健康养生";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
...@@ -2654,10 +2656,11 @@ ...@@ -2654,10 +2656,11 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
App_Display_Name = "小梦睡眠-Beta"; App_Display_Name = "小梦睡眠-Beta";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
......
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/Arc/DarwArcView.swift
...@@ -9,6 +9,14 @@ ...@@ -9,6 +9,14 @@
import UIKit import UIKit
///全局函数
func CCLog<T>(_ message: T, file: String = #file, funcName: String = #function, lineNum: Int = #line) {
#if DEBUG
let file = (file as NSString).lastPathComponent;
print("\(file):(\(lineNum))--\(message)");
#endif
}
extension String { extension String {
func widthWithConstrainedHeight(height: CGFloat, font: UIFont) -> CGFloat { func widthWithConstrainedHeight(height: CGFloat, font: UIFont) -> CGFloat {
let constraintRect = CGSize(width: CGFloat.greatestFiniteMagnitude, height: height) let constraintRect = CGSize(width: CGFloat.greatestFiniteMagnitude, height: height)
...@@ -84,7 +92,7 @@ class DarwArcView: UIView { ...@@ -84,7 +92,7 @@ class DarwArcView: UIView {
let startAngle = curPath.calculateAngle(point: total_start, origin: center) let startAngle = curPath.calculateAngle(point: total_start, origin: center)
// 计算结束角度 // 计算结束角度
let endAngle = curPath.calculateAngle(point: total_end, origin: center) let endAngle = curPath.calculateAngle(point: total_end, origin: center)
print("startAngle:\(startAngle), endAngele:\(endAngle)") //CCLog("startAngle:\(startAngle), endAngele:\(endAngle)")
// 确定当前等级角度 // 确定当前等级角度
let curLevelAngle = startAngle - 0.1 let curLevelAngle = startAngle - 0.1
// 确定下一等级角度 // 确定下一等级角度
......
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/View/SignTaskView.m
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
- (UILabel *)titleLab { - (UILabel *)titleLab {
if (!_titleLab) { if (!_titleLab) {
_titleLab = [UILabel labWithText:@"签到领积分，连续签到有额外奖励" font:SysFont(12.0) fit:YES]; _titleLab = [UILabel labWithText:@"签到领积分，连续签到有额外奖励" font:SysFont(12.0) fit:YES];
_titleLab.dk_textColorPicker = DKColorPickerWithColors(SmallTextColor, ColorFromHexA(0xFFFFFF, .3)); _titleLab.dk_textColorPicker = DKColorPickerWithColors(SmallTextColor, ColorFromHexA(0xFFFFFF, .3), DSWhite);
} }
return _titleLab; return _titleLab;
} }
......
DreamSleep/Podfile
...@@ -30,3 +30,4 @@ end ...@@ -30,3 +30,4 @@ end
# SDWebImage (5.12.5)（去掉） # SDWebImage (5.12.5)（去掉）
# FreeStreamer（4.0.0） # FreeStreamer（4.0.0）
# IQKeyboardManager（6.5.10） # IQKeyboardManager（6.5.10）
# JJException（0.2.12）
DreamSleep/Podfile.lock
...@@ -94,6 +94,6 @@ SPEC CHECKSUMS: ...@@ -94,6 +94,6 @@ SPEC CHECKSUMS:
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30 YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928 YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928
PODFILE CHECKSUM: 597c449d3caf07f7d1329c26f74f21892c777293 PODFILE CHECKSUM: e4359ec13a52ba4e49c7d0c1466b596eceaf7b77
COCOAPODS: 1.11.3 COCOAPODS: 1.11.3
DreamSleep/Pods/Manifest.lock
...@@ -94,6 +94,6 @@ SPEC CHECKSUMS: ...@@ -94,6 +94,6 @@ SPEC CHECKSUMS:
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30 YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928 YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928
PODFILE CHECKSUM: 597c449d3caf07f7d1329c26f74f21892c777293 PODFILE CHECKSUM: e4359ec13a52ba4e49c7d0c1466b596eceaf7b77
COCOAPODS: 1.11.3 COCOAPODS: 1.11.3
DreamSleep/Pods/Pods.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -4,81 +4,83 @@ ...@@ -4,81 +4,83 @@
<dict> <dict>
<key>SchemeUserState</key> <key>SchemeUserState</key>
<dict> <dict>
<key>AFNetworking.xcscheme_^#shared#^_</key> <key>AFNetworking.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>10</integer> <false/>
</dict> </dict>
<key>DKNightVersion.xcscheme_^#shared#^_</key> <key>DKNightVersion.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>7</integer> <false/>
</dict> </dict>
<key>DOUAudioStreamer.xcscheme_^#shared#^_</key> <key>DOUAudioStreamer.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>8</integer> <false/>
</dict> </dict>
<key>FreeStreamer.xcscheme_^#shared#^_</key> <key>FreeStreamer.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>6</integer> <false/>
</dict> </dict>
<key>IQKeyboardManager.xcscheme_^#shared#^_</key> <key>IQKeyboardManager.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>12</integer> <false/>
</dict> </dict>
<key>MBProgressHUD.xcscheme_^#shared#^_</key> <key>MBProgressHUD.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>11</integer> <false/>
</dict> </dict>
<key>MJRefresh.xcscheme_^#shared#^_</key> <key>MJRefresh.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>4</integer> <false/>
</dict> </dict>
<key>Masonry.xcscheme_^#shared#^_</key> <key>Masonry.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>18</integer> <false/>
</dict> </dict>
<key>Pods-DreamSleep.xcscheme_^#shared#^_</key> <key>Pods-DreamSleep.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>13</integer> <false/>
</dict> </dict>
<key>Reachability.xcscheme_^#shared#^_</key> <key>Reachability.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>15</integer> <false/>
</dict> </dict>
<key>YYCache.xcscheme_^#shared#^_</key> <key>YYCache.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>19</integer> <false/>
</dict> </dict>
<key>YYImage.xcscheme_^#shared#^_</key> <key>YYImage.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>5</integer> <false/>
</dict> </dict>
<key>YYModel.xcscheme_^#shared#^_</key> <key>YYModel.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>16</integer> <false/>
</dict> </dict>
<key>YYWebImage.xcscheme_^#shared#^_</key> <key>YYWebImage.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>14</integer> <false/>
</dict> </dict>
<key>lottie-ios.xcscheme_^#shared#^_</key> <key>lottie-ios.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>isShown</key>
<integer>9</integer> <false/>
</dict> </dict>
</dict> </dict>
<key>SuppressBuildableAutocreation</key>
<dict/>
</dict> </dict>
</plist> </plist>
DreamSleep/TapiOS/Unity-iPhone.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<key>UnityFramework.xcscheme_^#shared#^_</key> <key>UnityFramework.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>17</integer> <integer>20</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!