diff --git a/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/JMKA.xcodeproj/project.pbxproj b/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/JMKA.xcodeproj/project.pbxproj index 1d0e54a..551c875 100755 --- a/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/JMKA.xcodeproj/project.pbxproj +++ b/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/JMKA.xcodeproj/project.pbxproj @@ -823,7 +823,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x/external/ios/libs"; - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.1; OTHER_LDFLAGS = ( "-ObjC", "$(inherited)", @@ -873,7 +873,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x/external/ios/libs"; - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.1; OTHER_LDFLAGS = ( "-ObjC", "$(inherited)", diff --git a/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/JMKA.xcodeproj/project.xcworkspace/xcuserdata/jianmiau.xcuserdatad/UserInterfaceState.xcuserstate b/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/JMKA.xcodeproj/project.xcworkspace/xcuserdata/jianmiau.xcuserdatad/UserInterfaceState.xcuserstate index cee44d4..1691682 100644 Binary files a/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/JMKA.xcodeproj/project.xcworkspace/xcuserdata/jianmiau.xcuserdatad/UserInterfaceState.xcuserstate and b/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/JMKA.xcodeproj/project.xcworkspace/xcuserdata/jianmiau.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.h b/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.h index 81a3098..762db31 100755 --- a/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.h +++ b/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.h @@ -35,7 +35,7 @@ + (void) JSBridge:(NSString *)value1 value2:(NSString *)value2; + (NSString*) getIntent; -+ (void) FirebaseGetToken; ++ (NSString*) GetFCMToken; + (void) TTS_Play:(NSString *) msg; @property(nonatomic, readonly) RootViewController* viewController; diff --git a/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm b/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm index 19af917..250af63 100755 --- a/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm +++ b/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm @@ -233,14 +233,10 @@ std::string IsStart = "0"; #pragma mark- FireBase -+ (void) FirebaseGetToken { ++ (NSString*) GetFCMToken { NSString *fcmToken = [Firebase_OC FcmToken]; - - // 呼叫JS的window.JSBridge std::string value = std::string([fcmToken UTF8String]); - std::string jsCallStr = cocos2d::StringUtils::format("Firebase_log(\"%s\");", value.c_str()); - se::Value *ret = new se::Value(); - se::ScriptEngine::getInstance()->evalString(jsCallStr.c_str() , -1 , ret); + return [NSString stringWithUTF8String:value.c_str()]; } #pragma mark- TTS diff --git a/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist b/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist index ff5f06f..a07042d 100755 --- a/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist +++ b/build-templates/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist @@ -3,9 +3,9 @@ CFBundleDevelopmentRegion - English + zh_TW CFBundleDisplayName - 建喵記帳 + 卡羅記帳 CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.0 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion