From b09c73532418ebc7b299ad24af6bfed30c1519c6 Mon Sep 17 00:00:00 2001 From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com> Date: Thu, 9 Nov 2023 14:09:30 +0800 Subject: [PATCH] change sth --- app/build.gradle | 5 +++-- app/src/com/ctf/games/release/Constants.kt | 1 + app/src/com/ctf/games/release/MainActivity.kt | 7 +++---- app/src/com/ctf/games/release/MainApplication.kt | 8 ++++---- app/src/com/ctf/games/release/dialog/QRCodeActivity.kt | 1 - 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f3f43ee..d316333 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,11 +78,12 @@ android { signingConfigs { debug { - storeFile file("${rootDir}/keys/release") + storeFile file("${rootDir}/keys/cf_play") storePassword '7654321' - keyAlias 'release' + keyAlias 'debug' keyPassword '7654321' } + //TODO:: release { storeFile file("${rootDir}/keys/release") storePassword "7654321" diff --git a/app/src/com/ctf/games/release/Constants.kt b/app/src/com/ctf/games/release/Constants.kt index 92e7ab5..a94ba4b 100644 --- a/app/src/com/ctf/games/release/Constants.kt +++ b/app/src/com/ctf/games/release/Constants.kt @@ -7,4 +7,5 @@ object Constants { const val APPLE_SCOPE = "name%20email" const val APPLE_AUTH_URL = "https://appleid.apple.com/auth/authorize" const val FUNID_PREFIX = "webpage_" + const val TIKTOK_CLIENT_KEY = "awqbuzh2qymmq8hs" } \ No newline at end of file diff --git a/app/src/com/ctf/games/release/MainActivity.kt b/app/src/com/ctf/games/release/MainActivity.kt index f825f43..ce0fc0e 100644 --- a/app/src/com/ctf/games/release/MainActivity.kt +++ b/app/src/com/ctf/games/release/MainActivity.kt @@ -49,7 +49,6 @@ import org.cocos2dx.lib.Cocos2dxHelper.Cocos2dxHelperListener import org.cocos2dx.lib.CocosJSHelper import org.json.JSONException import org.json.JSONObject -import java.util.Arrays import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -108,7 +107,7 @@ class MainActivity : UnityPlayerActivity(), Cocos2dxHelperListener { override fun onResume() { super.onResume() - val paramArr = arrayOfNulls(0) + val paramArr = arrayOf() JcSDK.callNativeJS("", "onGameResume", paramArr) } @@ -276,7 +275,7 @@ class MainActivity : UnityPlayerActivity(), Cocos2dxHelperListener { val accessToken = AccessToken.getCurrentAccessToken() if (!verifyFbAccessToken(accessToken)) { LoginManager.getInstance() - .logInWithReadPermissions(this, Arrays.asList("public_profile", "email")) + .logInWithReadPermissions(this, listOf("public_profile", "email")) } } @@ -335,7 +334,7 @@ class MainActivity : UnityPlayerActivity(), Cocos2dxHelperListener { } } - fun shareToTikTok(funId: String?, uriToImage: Uri?) { + private fun shareToTikTok(funId: String?, uriToImage: Uri?) { this.funId = funId grantUriPermission( getString(R.string.tiktok_package_1), diff --git a/app/src/com/ctf/games/release/MainApplication.kt b/app/src/com/ctf/games/release/MainApplication.kt index b8e3ce3..564ce94 100644 --- a/app/src/com/ctf/games/release/MainApplication.kt +++ b/app/src/com/ctf/games/release/MainApplication.kt @@ -4,20 +4,20 @@ import android.app.Application import android.content.SharedPreferences import com.bytedance.sdk.open.tiktok.TikTokOpenApiFactory import com.bytedance.sdk.open.tiktok.TikTokOpenConfig +import com.ctf.games.release.Constants.TIKTOK_CLIENT_KEY class MainApplication : Application() { var gameData: String? = null override fun onCreate() { super.onCreate() application = this - _pref = getSharedPreferences(Constants.PREF_NAME, 0) - val tiktokClientKey = "awqbuzh2qymmq8hs" - TikTokOpenApiFactory.init(TikTokOpenConfig(tiktokClientKey)) + pref = getSharedPreferences(Constants.PREF_NAME, 0) + TikTokOpenApiFactory.init(TikTokOpenConfig(TIKTOK_CLIENT_KEY)) } companion object { @JvmField var application: MainApplication? = null - var _pref: SharedPreferences? = null + var pref: SharedPreferences? = null } } \ No newline at end of file diff --git a/app/src/com/ctf/games/release/dialog/QRCodeActivity.kt b/app/src/com/ctf/games/release/dialog/QRCodeActivity.kt index 5037404..6f8a4da 100644 --- a/app/src/com/ctf/games/release/dialog/QRCodeActivity.kt +++ b/app/src/com/ctf/games/release/dialog/QRCodeActivity.kt @@ -6,7 +6,6 @@ import android.content.ClipboardManager import android.content.Context import android.graphics.Bitmap import android.os.Bundle -import android.view.View import android.widget.ImageView import android.widget.TextView import com.ctf.games.release.R