Skip to content

pidan / FuSiLive

Go to a project
Commit 8a3815a4 by pierce
Options

Merge branch 'feature/私讯+座驾体系' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私讯+座驾体系

parents 5bd3290b 3d1f69f5
Inline Side-by-side
Showing with 8 additions and 11 deletions
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key> <key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>73</integer> <integer>72</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>74</integer> <integer>76</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key> <key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>72</integer> <integer>73</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>76</integer> <integer>75</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key> <key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>78</integer> <integer>74</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>77</integer> <integer>78</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/ImAnchor/FUSImAnchorViewController.m
...@@ -143,10 +143,7 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){ ...@@ -143,10 +143,7 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
-(void)fus_createItems{ -(void)fus_createItems{
// NSArray *section1 = @[@(FUSImAnchorItemTypeLiveTask), @(FUSImAnchorItemTypePopular)]; // NSArray *section1 = @[@(FUSImAnchorItemTypeLiveTask), @(FUSImAnchorItemTypePopular)];
NSArray *section1 = @[@(FUSImAnchorItemTypeLiveReward)]; NSArray *section1 = @[@(FUSImAnchorItemTypeLiveReward), @(FUSImAnchorItemTypeLiveRecord)];
if ([FUSSwiftCacheDataShare share].oc_myZoneInfo.showLiveRecords == 1) {
section1 = @[@(FUSImAnchorItemTypeLiveReward), @(FUSImAnchorItemTypeLiveRecord)];
}
NSArray *section2 = @[@(FUSImAnchorItemTypeLiveTime), @(FUSImAnchorItemTypeTotalFire)]; NSArray *section2 = @[@(FUSImAnchorItemTypeLiveTime), @(FUSImAnchorItemTypeTotalFire)];
if (FUSConfig.sharedInstanced.devConfigs.appStatus) { if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
section2 = @[@(FUSImAnchorItemTypeLiveTime)]; section2 = @[@(FUSImAnchorItemTypeLiveTime)];
......
Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -392,7 +392,7 @@ ...@@ -392,7 +392,7 @@
<key>SSZipArchive.xcscheme_^#shared#^_</key> <key>SSZipArchive.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>75</integer> <integer>77</integer>
</dict> </dict>
<key>SnapKit-SnapKit_Privacy.xcscheme</key> <key>SnapKit-SnapKit_Privacy.xcscheme</key>
<dict> <dict>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment