Skip to content

Commit c57ce4e

Browse files
author
[email protected]
committed
Merge branch 'master' of github.com:umeng/React_Native_Compent
2 parents e57876c + 1623e6b commit c57ce4e

File tree

18 files changed

+34
-30
lines changed

18 files changed

+34
-30
lines changed

‎components/UPush.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ export default class UserCenter extends Component {
2222
}
2323
addtag(){
2424
PushUtil.addTag(this.state.tag,(code, remain) =>{
25-
if (code == 0){
25+
if (code == 200){
2626
this.setState({result:remain});
2727
}
2828
})
2929
}
3030
deleteTag(){
3131
PushUtil.deleteTag(this.state.tag,(code, remain) =>{
32-
if (code == 0){
32+
if (code == 200){
3333
this.setState({result:remain});
3434
}
3535
})
3636
}
3737
listTag(){
3838
PushUtil.listTag((code,tagList) =>{
39-
if (code == 0){
39+
if (code == 200){
4040
var tags="tags:";
4141
console.log("xxxxxx length="+tagList.length)
4242
for(var i=0;i<tagList.length;i++){
@@ -49,21 +49,21 @@ export default class UserCenter extends Component {
4949
}
5050
addAlias(){
5151
PushUtil.addAlias(this.state.tag,"UMENG",(code) =>{
52-
if (code == 0){
52+
if (code == 200){
5353
this.setState({result:code});
5454
}
5555
})
5656
}
5757
addExclusiveAlias(){
5858
PushUtil.addExclusiveAlias(this.state.tag,"UMENG",(code) =>{
59-
if (code == 0){
59+
if (code == 200){
6060
this.setState({result:code});
6161
}
6262
})
6363
}
6464
deleteAlias(){
6565
PushUtil.deleteAlias(this.state.tag,"UMENG",(code) =>{
66-
if (code == 0){
66+
if (code == 200){
6767
this.setState({result:code});
6868
}
6969
})

‎components/UShare_auth.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ export default class UserCenter extends Component {
2323
qqauth(){
2424
ShareUtile.auth(0,(code,result,message) =>{
2525
this.setState({result:message});
26-
if (code == 0){
26+
if (code == 200){
2727
this.setState({result:result.uid});
2828
}
2929
});
3030
}
3131
sinaauth(){
3232
ShareUtile.auth(1,(code,result,message) =>{
3333
this.setState({result:message});
34-
if (code == 0){
34+
if (code == 200){
3535
this.setState({result:result.uid});
3636
}
3737
});
3838
}
3939
wxauth(){
4040
ShareUtile.auth(2,(code,result,message) =>{
4141
this.setState({result:message});
42-
if (code == 0){
42+
if (code == 200){
4343
this.setState({result:result.uid});
4444
}
4545
});

‎ios/UMComponent.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,6 +1416,8 @@
14161416
ALWAYS_SEARCH_USER_PATHS = YES;
14171417
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
14181418
CODE_SIGN_ENTITLEMENTS = UMComponent/UMComponent.entitlements;
1419+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1420+
CODE_SIGN_STYLE = Manual;
14191421
CURRENT_PROJECT_VERSION = 1;
14201422
DEAD_CODE_STRIPPING = NO;
14211423
DEVELOPMENT_TEAM = 486K7NX823;
@@ -1450,7 +1452,7 @@
14501452
);
14511453
PRODUCT_BUNDLE_IDENTIFIER = com.UmengPlus.UMDemo;
14521454
PRODUCT_NAME = UMComponent;
1453-
PROVISIONING_PROFILE = "e5c7e4a9-7546-45f7-973f-8d90a99f2fb5";
1455+
PROVISIONING_PROFILE = "12c70f3e-b466-4415-8844-09d3b58fb681";
14541456
PROVISIONING_PROFILE_SPECIFIER = UMengPlusDemo_dev;
14551457
VERSIONING_SYSTEM = "apple-generic";
14561458
};
@@ -1462,6 +1464,8 @@
14621464
ALWAYS_SEARCH_USER_PATHS = YES;
14631465
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
14641466
CODE_SIGN_ENTITLEMENTS = UMComponent/UMComponent.entitlements;
1467+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1468+
CODE_SIGN_STYLE = Manual;
14651469
CURRENT_PROJECT_VERSION = 1;
14661470
DEVELOPMENT_TEAM = 486K7NX823;
14671471
FRAMEWORK_SEARCH_PATHS = (
@@ -1495,7 +1499,7 @@
14951499
);
14961500
PRODUCT_BUNDLE_IDENTIFIER = com.UmengPlus.UMDemo;
14971501
PRODUCT_NAME = UMComponent;
1498-
PROVISIONING_PROFILE = "e5c7e4a9-7546-45f7-973f-8d90a99f2fb5";
1502+
PROVISIONING_PROFILE = "12c70f3e-b466-4415-8844-09d3b58fb681";
14991503
PROVISIONING_PROFILE_SPECIFIER = UMengPlusDemo_dev;
15001504
VERSIONING_SYSTEM = "apple-generic";
15011505
};

‎ios/UMComponent.xcodeproj/xcshareddata/xcschemes/UMComponent.xcscheme‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
buildConfiguration = "Debug"
5555
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5656
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
57+
language = ""
5758
shouldUseLaunchSchemeArgsEnv = "YES">
5859
<Testables>
5960
<TestableReference
@@ -80,9 +81,10 @@
8081
</AdditionalOptions>
8182
</TestAction>
8283
<LaunchAction
83-
buildConfiguration = "Debug"
84+
buildConfiguration = "Release"
8485
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
8586
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
87+
language = ""
8688
launchStyle = "0"
8789
useCustomWorkingDirectory = "NO"
8890
ignoresPersistentStateOnLaunch = "NO"

‎ios/UMComponent/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<key>CFBundleDevelopmentRegion</key>
66
<string>en</string>
77
<key>CFBundleDisplayName</key>
8-
<string>UMComponent</string>
8+
<string>React</string>
99
<key>CFBundleExecutable</key>
1010
<string>$(EXECUTABLE_NAME)</string>
1111
<key>CFBundleIdentifier</key>

‎ios/UMComponent/UMComponents/UMAnalytics.framework/5.3.3_374d1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎ios/UMComponent/UMComponents/UMAnalytics.framework/5.4.0_43100‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5.4.0_43100

‎ios/UMComponent/UMComponents/UMAnalytics.framework/Versions/A/UMAnalytics‎

23.5 KB
Binary file not shown.

‎ios/UMComponent/UMComponents/UMCommon.framework/Versions/A/Headers/UMConfigure.h‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131

3232
+ (NSString *)umidString;
3333

34-
/** 设置第三方框架的平台类型和平台版本
35-
@param wraperType wraperType需要传入的合法字符串native,cocos2dx,unity3d,react-native,phonegap,weex
36-
@param wrapperVersion 对应平台的版本号
37-
@return BOOL
38-
*/
39-
+(BOOL)setWraperType:(NSString*)wraperType wrapperVersion:(NSString*)wrapperVersion;
34+
4035

4136
@end

‎ios/UMComponent/UMComponents/UMCommon.framework/Versions/A/UMCommon‎

151 KB
Binary file not shown.

0 commit comments

Comments
 (0)