Skip to content

Commit aebaecc

Browse files
committed
适配IOS7,添加英文语言
1 parent c43cb9a commit aebaecc

File tree

6 files changed

+389
-21
lines changed

6 files changed

+389
-21
lines changed

iOS/iOS/shop.xcodeproj/project.xcworkspace/xcshareddata/shop.xccheckout

+11-16
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,36 @@
55
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
66
<false/>
77
<key>IDESourceControlProjectIdentifier</key>
8-
<string>39D727D7-AD1D-4811-9DAC-31155F05A3BB</string>
8+
<string>32E894CE-3D37-4797-BA21-FB31FD6A60B2</string>
99
<key>IDESourceControlProjectName</key>
1010
<string>shop</string>
1111
<key>IDESourceControlProjectOriginsDictionary</key>
1212
<dict>
13-
<key>BAAAC5D2-AFDA-46DA-A304-C22D65EA9438</key>
14-
<string>svn://geek-zoo.com/project/ecmobile</string>
13+
<key>2A075FB3-2CFB-4FAE-9317-8631FC222193</key>
14+
<string>https://github.com/GeekZooStudio/ECMobile_iOS.git</string>
1515
</dict>
1616
<key>IDESourceControlProjectPath</key>
17-
<string>branches/ECMobile_iOS_Opensource/shop.xcodeproj/project.xcworkspace</string>
17+
<string>iOS/shop.xcodeproj/project.xcworkspace</string>
1818
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
1919
<dict>
20-
<key>BAAAC5D2-AFDA-46DA-A304-C22D65EA9438</key>
21-
<string>../../../..</string>
22-
</dict>
23-
<key>IDESourceControlProjectRepositoryRootDictionary</key>
24-
<dict>
25-
<key>BAAAC5D2-AFDA-46DA-A304-C22D65EA9438</key>
26-
<string>svn://geek-zoo.com/project/ecmobile</string>
20+
<key>2A075FB3-2CFB-4FAE-9317-8631FC222193</key>
21+
<string>../../..</string>
2722
</dict>
2823
<key>IDESourceControlProjectURL</key>
29-
<string>svn://geek-zoo.com/project/ecmobile/branches/ECMobile_iOS_Opensource/shop.xcodeproj</string>
24+
<string>https://github.com/GeekZooStudio/ECMobile_iOS.git</string>
3025
<key>IDESourceControlProjectVersion</key>
3126
<integer>110</integer>
3227
<key>IDESourceControlProjectWCCIdentifier</key>
33-
<string>BAAAC5D2-AFDA-46DA-A304-C22D65EA9438</string>
28+
<string>2A075FB3-2CFB-4FAE-9317-8631FC222193</string>
3429
<key>IDESourceControlProjectWCConfigurations</key>
3530
<array>
3631
<dict>
3732
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
38-
<string>public.vcs.subversion</string>
33+
<string>public.vcs.git</string>
3934
<key>IDESourceControlWCCIdentifierKey</key>
40-
<string>BAAAC5D2-AFDA-46DA-A304-C22D65EA9438</string>
35+
<string>2A075FB3-2CFB-4FAE-9317-8631FC222193</string>
4136
<key>IDESourceControlWCCName</key>
42-
<string>ecmobile</string>
37+
<string>ECMobile_iOS</string>
4338
</dict>
4439
</array>
4540
</dict>

iOS/iOS/shop/view_iPhone/AppBoard_iPhone.m

+9-3
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,15 @@ - (void)unload
153153
else if ( [signal is:BeeUIBoard.LAYOUT_VIEWS] )
154154
{
155155
_tabbar.frame = CGRectMake( 0, _tabbarOriginY, self.viewBound.size.width, TAB_HEIGHT );
156-
157-
CGRect frame = CGRectMake( 0, 0, self.viewBound.size.width, self.viewBound.size.height );
158-
[BeeUIRouter sharedInstance].view.frame = frame;
156+
157+
if ( IOS7_OR_LATER )
158+
{
159+
[BeeUIRouter sharedInstance].view.frame = self.view.frame;
160+
}
161+
else
162+
{
163+
[BeeUIRouter sharedInstance].view.frame = self.viewBound;
164+
}
159165
}
160166
else if ( [signal is:BeeUIBoard.LOAD_DATAS] )
161167
{

0 commit comments

Comments
 (0)