diff --git a/Data/js/main.js b/Data/js/main.js index 66a4134..7b66a74 100644 --- a/Data/js/main.js +++ b/Data/js/main.js @@ -60,17 +60,6 @@ function initThirdPartyWallet(funId, chain) { return jc.wallet.currentAccount(); }); } -/** - * current account for internal wallet - */ -function currentAccount(funId) { - try { - let data = jc.wallet.currentAccountData; - return JSON.stringify({ errcode: 0, data }); - } catch (err) { - return JSON.stringify({ errcode: 1, errmsg: err.message || err }); - } -} /** * all chain list we supported diff --git a/app/src/com/cege/games/release/MainActivity.java b/app/src/com/cege/games/release/MainActivity.java index 5525f5c..726374b 100644 --- a/app/src/com/cege/games/release/MainActivity.java +++ b/app/src/com/cege/games/release/MainActivity.java @@ -187,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); } @@ -434,13 +434,6 @@ public class MainActivity extends UnityPlayerActivity checkCameraPermissions(); } - public void loadRestoreKey(String fundId, String oid) { - this.funId = fundId; - this.oid = oid; - Log.i(TAG, "loadRestoreKey: " + oid); - checkImagePermissions(); - } - /** * start image scan */ @@ -901,15 +894,16 @@ public class MainActivity extends UnityPlayerActivity intent.putExtra("url", url); startActivity(intent); // picker video file and share to tiktok -// openFileSelector(); + // openFileSelector(); }); } + public void shareToTikTok(String funId, Uri uriToImage) { this.funId = funId; grantUriPermission("com.zhiliaoapp.musically", - uriToImage, Intent.FLAG_GRANT_READ_URI_PERMISSION); + uriToImage, Intent.FLAG_GRANT_READ_URI_PERMISSION); grantUriPermission("com.ss.android.ugc.trill", - uriToImage, Intent.FLAG_GRANT_READ_URI_PERMISSION); + uriToImage, Intent.FLAG_GRANT_READ_URI_PERMISSION); Log.i(TAG, "share to tiktok: " + uriToImage.toString()); if (tiktokOpenApi.isShareSupportFileProvider()) { Share.Request request = new Share.Request(); @@ -927,14 +921,14 @@ public class MainActivity extends UnityPlayerActivity tiktokOpenApi.share(request); } // share with Android ShareSheet -// runOnUiThread(() -> { -// Log.i(TAG, "share to tiktok: " + uriToImage); -// Intent shareIntent = new Intent(); -// shareIntent.setAction(Intent.ACTION_SEND); -// shareIntent.putExtra(Intent.EXTRA_STREAM, uriToImage); -// shareIntent.setType("video/*"); -// startActivity(Intent.createChooser(shareIntent, "share")); -// }); + // runOnUiThread(() -> { + // Log.i(TAG, "share to tiktok: " + uriToImage); + // Intent shareIntent = new Intent(); + // shareIntent.setAction(Intent.ACTION_SEND); + // shareIntent.putExtra(Intent.EXTRA_STREAM, uriToImage); + // shareIntent.setType("video/*"); + // startActivity(Intent.createChooser(shareIntent, "share")); + // }); } /** diff --git a/app/src/com/cege/games/release/dialog/QRCodeActivity.java b/app/src/com/cege/games/release/dialog/QRCodeActivity.java index 7923adb..85d5a5e 100644 --- a/app/src/com/cege/games/release/dialog/QRCodeActivity.java +++ b/app/src/com/cege/games/release/dialog/QRCodeActivity.java @@ -22,7 +22,7 @@ import androidx.annotation.NonNull; import pub.devrel.easypermissions.AfterPermissionGranted; import pub.devrel.easypermissions.EasyPermissions; -public class QRCodeActivity extends Dialog implements EasyPermissions.PermissionCallbacks{ +public class QRCodeActivity extends Dialog implements EasyPermissions.PermissionCallbacks { private final Context baseContent; private TextView titleLabel; @@ -30,10 +30,8 @@ public class QRCodeActivity extends Dialog implements EasyPermissions.Permission private String oid; private Bitmap bitmap; private Button localBtn; - private boolean imgSaved = false; public static final int RC_SAVE_QR = 0X111; - public QRCodeActivity(Context context) { super(context, R.style.DialogStyle); baseContent = context; @@ -54,37 +52,25 @@ public class QRCodeActivity extends Dialog implements EasyPermissions.Permission localBtn.setOnClickListener(v -> onClickSaveImg()); } - public void showQRCode(String content, String title, String _oid){ + public void showQRCode(String content, String title, String _oid) { oid = _oid; if (localBtn != null && oid != null && !"".equals(oid)) { localBtn.setVisibility(View.VISIBLE); } new Thread(() -> { - bitmap = CodeUtils.createQRCode(content,500, null); - MainActivity.app.runOnUiThread(()->{ + bitmap = CodeUtils.createQRCode(content, 500, null); + MainActivity.app.runOnUiThread(() -> { titleLabel.setText(title); ivCode.setImageBitmap(bitmap); }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - String uri = FileUtils.saveBitmap(baseContent, oid, bitmap); - MainActivity.app.runOnUiThread(()->{ - if (uri != null && !"".equals(uri)) { - MainActivity.app.showToast("Wallet restore key had save to System Album"); - titleLabel.setText("Wallet Restore Key"); - localBtn.setText("Close"); - imgSaved = true; - } else { - MainActivity.app.showToast("Wallet restore key save fail"); - } - }); - } }).start(); } + public void saveAndClose() { new Thread(() -> { String uri = FileUtils.saveBitmap(baseContent, oid, bitmap); - MainActivity.app.runOnUiThread(()->{ + MainActivity.app.runOnUiThread(() -> { if (uri != null && !"".equals(uri)) { MainActivity.app.showToast("Wallet restore key had save to System Album"); dismiss(); @@ -94,11 +80,8 @@ public class QRCodeActivity extends Dialog implements EasyPermissions.Permission }); }).start(); } - protected void onClickSaveImg(){ - if (imgSaved) { - dismiss(); - return; - } + + protected void onClickSaveImg() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { saveAndClose(); } else { @@ -122,13 +105,14 @@ public class QRCodeActivity extends Dialog implements EasyPermissions.Permission } @AfterPermissionGranted(RC_SAVE_QR) - private void checkCameraPermissions(){ - String[] perms = {Manifest.permission.WRITE_EXTERNAL_STORAGE}; + private void checkCameraPermissions() { + String[] perms = { Manifest.permission.WRITE_EXTERNAL_STORAGE }; if (EasyPermissions.hasPermissions(this.baseContent, perms)) { saveAndClose(); } else { // Do not have permissions, request them now - EasyPermissions.requestPermissions(MainActivity.app, "We need Write WRITE_EXTERNAL_STORAGE for backup Wallet Restore Key", + EasyPermissions.requestPermissions(MainActivity.app, + "We need Write WRITE_EXTERNAL_STORAGE for save QRCode to System Album", RC_SAVE_QR, perms); } } diff --git a/app/src/com/jc/jcfw/JcSDK.java b/app/src/com/jc/jcfw/JcSDK.java index 22e32e8..279e26f 100644 --- a/app/src/com/jc/jcfw/JcSDK.java +++ b/app/src/com/jc/jcfw/JcSDK.java @@ -14,6 +14,7 @@ import org.json.JSONObject; public class JcSDK { private static final String TAG = JcSDK.class.getSimpleName(); private static UnityCallback commonCB; + private static native int runJS(final String funId, final String methodName, final String params); public static void initCommonCB(UnityCallback callBack) { @@ -23,7 +24,7 @@ public class JcSDK { /** * @Deprecated - * 不使用该方法, 直接由unity调用cpp方法 + * 不使用该方法, 直接由unity调用cpp方法 * @param password */ public static void initWallet(String password) { @@ -34,6 +35,7 @@ public class JcSDK { /** * 回调至c# + * * @param funId * @param msg */ @@ -47,8 +49,10 @@ public class JcSDK { /** * check if metamask installed and jump to metamask + * * @param url - * sample: "https://metamask.app.link/wc?uri="+ExampleApplication.config.toWCUri(); + * sample: + * "https://metamask.app.link/wc?uri="+ExampleApplication.config.toWCUri(); */ public static void toWallet(String url) { @@ -67,15 +71,18 @@ public class JcSDK { MainActivity.app.startActivity(i); } } - public static void showQRCode(String funid, String content) { MainActivity.app.showQRCode(funid, content, "", "");} - public static void showWebPage(String funid, String url) { MainActivity.app.showPage(funid, url);} - public static void showRestoreQR(String funid, String content, String title, String oid) { MainActivity.app.showQRCode(funid, content, title, oid);} + + public static void showQRCode(String funid, String content) { + MainActivity.app.showQRCode(funid, content, "", ""); + } + + public static void showWebPage(String funid, String url) { + MainActivity.app.showPage(funid, url); + } + public static void scanQRCode(String funid, String title) { MainActivity.app.showQRScan(funid, title); } - public static void loadRestoreKey(String funid, String oid) { - MainActivity.app.loadRestoreKey(funid, oid); - } public static void signWithTiktok(String funid) { MainActivity.app.signWithTiktok(funid); @@ -85,7 +92,9 @@ public class JcSDK { MainActivity.app.signWithFacebook(funid); } - public static void shareWithFacebook(String content) { MainActivity.app.shareWithFacebook(content);} + public static void shareWithFacebook(String content) { + MainActivity.app.shareWithFacebook(content); + } public static void signWithTwitter(String funid) { MainActivity.app.signWithTwitter(funid); @@ -94,6 +103,7 @@ public class JcSDK { public static void signWithGoogle(String funid) { MainActivity.app.signWithGoogle(funid); } + public static void signWithApple(String funid) { MainActivity.app.signWithApple(funid); }