From f417db691b9efe39ab95c97ba1821acd51c75ddd Mon Sep 17 00:00:00 2001 From: zhl Date: Sat, 6 May 2023 11:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=80=E4=BA=9Bwarning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cege/games/release/MainActivity.java | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/app/src/com/cege/games/release/MainActivity.java b/app/src/com/cege/games/release/MainActivity.java index 951e641..5525f5c 100644 --- a/app/src/com/cege/games/release/MainActivity.java +++ b/app/src/com/cege/games/release/MainActivity.java @@ -1,5 +1,7 @@ package com.cege.games.release; +import static com.cege.games.release.dialog.QRCodeActivity.RC_SAVE_QR; + import android.Manifest; import android.content.Context; import android.content.Intent; @@ -15,6 +17,13 @@ import android.util.Log; import android.view.Window; import android.widget.Toast; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; +import androidx.browser.customtabs.CustomTabsIntent; +import androidx.core.app.ActivityOptionsCompat; + import com.bytedance.sdk.open.tiktok.TikTokOpenApiFactory; import com.bytedance.sdk.open.tiktok.api.TikTokOpenApi; import com.bytedance.sdk.open.tiktok.authorize.model.Authorization; @@ -29,7 +38,6 @@ import com.facebook.AccessToken; import com.facebook.CallbackManager; import com.facebook.FacebookCallback; import com.facebook.FacebookException; - import com.facebook.appevents.AppEventsLogger; import com.facebook.login.LoginManager; import com.facebook.login.LoginResult; @@ -77,7 +85,6 @@ import org.cocos2dx.lib.Cocos2dxHelper; import org.cocos2dx.lib.CocosJSHelper; import org.json.JSONException; -import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -87,17 +94,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicReference; -import androidx.annotation.MainThread; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.WorkerThread; -import androidx.browser.customtabs.CustomTabsIntent; -import androidx.core.app.ActivityOptionsCompat; import pub.devrel.easypermissions.AfterPermissionGranted; import pub.devrel.easypermissions.EasyPermissions; -import static com.cege.games.release.dialog.QRCodeActivity.RC_SAVE_QR; - public class MainActivity extends UnityPlayerActivity implements Cocos2dxHelper.Cocos2dxHelperListener, EasyPermissions.PermissionCallbacks { private static final String TAG = MainActivity.class.getSimpleName(); @@ -106,7 +105,6 @@ public class MainActivity extends UnityPlayerActivity private Toast toast; public static final String KEY_TITLE = "key_title"; - public static final String KEY_IS_QR_CODE = "key_code"; public static final String KEY_IS_CONTINUOUS = "key_continuous_scan"; // scan QRCode @@ -139,7 +137,6 @@ public class MainActivity extends UnityPlayerActivity private final AtomicReference mAuthRequest = new AtomicReference<>(); private final AtomicReference mAuthIntent = new AtomicReference<>(); private CountDownLatch mAuthIntentLatch = new CountDownLatch(1); - private static final String EXTRA_FAILED = "failed"; private TikTokOpenApi tiktokOpenApi; @@ -190,9 +187,9 @@ public class MainActivity extends UnityPlayerActivity initFacebookSDK(); // end of facebook login // ATTENTION: This was auto-generated to handle app links. - Intent appLinkIntent = getIntent(); - String appLinkAction = appLinkIntent.getAction(); - Uri appLinkData = appLinkIntent.getData(); +// Intent appLinkIntent = getIntent(); +// String appLinkAction = appLinkIntent.getAction(); +// Uri appLinkData = appLinkIntent.getData(); tiktokOpenApi = TikTokOpenApiFactory.create(this); } @@ -308,7 +305,7 @@ public class MainActivity extends UnityPlayerActivity /** begin of easypermissions */ @Override - public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults); // Forward results to EasyPermissions @@ -316,13 +313,13 @@ public class MainActivity extends UnityPlayerActivity } @Override - public void onPermissionsGranted(int requestCode, List list) { + public void onPermissionsGranted(int requestCode, @NonNull List list) { // Some permissions have been granted } @Override - public void onPermissionsDenied(int requestCode, List list) { + public void onPermissionsDenied(int requestCode, @NonNull List list) { // Some permissions have been denied if ((requestCode == RC_CAMERA || requestCode == RC_READ_PHOTO) && null != funId && !"".equals(funId)) { JcSDK.nativeCb(funId, "User cancel", null);