diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml index 04b0e9d..8f393a5 100644 --- a/app/AndroidManifest.xml +++ b/app/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="com.cege.games.release"> - diff --git a/app/src/com/fitchgc/jcwallet/Constants.java b/app/src/com/cege/games/release/Constants.java similarity index 71% rename from app/src/com/fitchgc/jcwallet/Constants.java rename to app/src/com/cege/games/release/Constants.java index 3bfcf83..bc7865e 100644 --- a/app/src/com/fitchgc/jcwallet/Constants.java +++ b/app/src/com/cege/games/release/Constants.java @@ -1,4 +1,4 @@ -package com.fitchgc.jcwallet; +package com.cege.games.release; public class Constants { public static final String PREF_NAME = "jcwallet"; diff --git a/app/src/com/fitchgc/jcwallet/MainActivity.java b/app/src/com/cege/games/release/MainActivity.java similarity index 98% rename from app/src/com/fitchgc/jcwallet/MainActivity.java rename to app/src/com/cege/games/release/MainActivity.java index 1a478b9..c8743b0 100644 --- a/app/src/com/fitchgc/jcwallet/MainActivity.java +++ b/app/src/com/cege/games/release/MainActivity.java @@ -1,4 +1,4 @@ -package com.fitchgc.jcwallet; +package com.cege.games.release; import android.Manifest; import android.app.Activity; @@ -16,8 +16,8 @@ import android.view.KeyEvent; import android.view.MotionEvent; import android.view.Window; -import com.fitchgc.jcwallet.activity.CustomCaptureActivity; -import com.fitchgc.jcwallet.dialog.QRCodeActivity; +import com.cege.games.release.activity.CustomCaptureActivity; +import com.cege.games.release.dialog.QRCodeActivity; import com.google.android.gms.auth.api.signin.GoogleSignIn; import com.google.android.gms.auth.api.signin.GoogleSignInAccount; import com.google.android.gms.auth.api.signin.GoogleSignInClient; @@ -199,6 +199,10 @@ public class MainActivity extends Activity } if (!next) { // JcSDK.csCallback(funId, "{errcode: 0, errmsg: 'cancel'}"); + if (requestCode == RC_SIGN_IN) { + Task task = GoogleSignIn.getSignedInAccountFromIntent(data); + handleSignInResult(task); + } if (requestCode == REQUEST_CODE_SCAN) { JcSDK.scanQrCb(funId, "activity result with code: " + resultCode, null); } diff --git a/app/src/com/fitchgc/jcwallet/MainApplication.java b/app/src/com/cege/games/release/MainApplication.java similarity index 91% rename from app/src/com/fitchgc/jcwallet/MainApplication.java rename to app/src/com/cege/games/release/MainApplication.java index bd31ee7..65a992d 100644 --- a/app/src/com/fitchgc/jcwallet/MainApplication.java +++ b/app/src/com/cege/games/release/MainApplication.java @@ -1,4 +1,4 @@ -package com.fitchgc.jcwallet; +package com.cege.games.release; import android.app.Application; import android.content.SharedPreferences; diff --git a/app/src/com/fitchgc/jcwallet/activity/CustomCaptureActivity.java b/app/src/com/cege/games/release/activity/CustomCaptureActivity.java similarity index 88% rename from app/src/com/fitchgc/jcwallet/activity/CustomCaptureActivity.java rename to app/src/com/cege/games/release/activity/CustomCaptureActivity.java index e327a5b..c4a2c76 100644 --- a/app/src/com/fitchgc/jcwallet/activity/CustomCaptureActivity.java +++ b/app/src/com/cege/games/release/activity/CustomCaptureActivity.java @@ -1,14 +1,14 @@ -package com.fitchgc.jcwallet.activity; +package com.cege.games.release.activity; import android.content.Intent; import android.os.Bundle; import android.widget.Button; import android.widget.TextView; -import com.fitchgc.jcwallet.R; +import com.cege.games.release.R; import com.king.zxing.CaptureActivity; -import static com.fitchgc.jcwallet.MainActivity.KEY_TITLE; +import static com.cege.games.release.MainActivity.KEY_TITLE; public class CustomCaptureActivity extends CaptureActivity { private static final String TAG = CustomCaptureActivity.class.getSimpleName(); diff --git a/app/src/com/fitchgc/jcwallet/dialog/BaseDialog.java b/app/src/com/cege/games/release/dialog/BaseDialog.java similarity index 91% rename from app/src/com/fitchgc/jcwallet/dialog/BaseDialog.java rename to app/src/com/cege/games/release/dialog/BaseDialog.java index 46c6e36..d96dc1b 100644 --- a/app/src/com/fitchgc/jcwallet/dialog/BaseDialog.java +++ b/app/src/com/cege/games/release/dialog/BaseDialog.java @@ -1,11 +1,11 @@ -package com.fitchgc.jcwallet.dialog; +package com.cege.games.release.dialog; import android.app.Dialog; import android.content.Context; import android.view.Window; import android.view.WindowManager; -import com.fitchgc.jcwallet.R; +import com.cege.games.release.R; public class BaseDialog extends Dialog { diff --git a/app/src/com/fitchgc/jcwallet/dialog/QRCodeActivity.java b/app/src/com/cege/games/release/dialog/QRCodeActivity.java similarity index 90% rename from app/src/com/fitchgc/jcwallet/dialog/QRCodeActivity.java rename to app/src/com/cege/games/release/dialog/QRCodeActivity.java index 394617b..f1ecb3b 100644 --- a/app/src/com/fitchgc/jcwallet/dialog/QRCodeActivity.java +++ b/app/src/com/cege/games/release/dialog/QRCodeActivity.java @@ -1,4 +1,4 @@ -package com.fitchgc.jcwallet.dialog; +package com.cege.games.release.dialog; import android.app.Dialog; import android.content.Context; @@ -7,8 +7,8 @@ import android.os.Bundle; import android.widget.ImageView; import android.widget.TextView; -import com.fitchgc.jcwallet.MainActivity; -import com.fitchgc.jcwallet.R; +import com.cege.games.release.MainActivity; +import com.cege.games.release.R; import com.king.zxing.util.CodeUtils; public class QRCodeActivity extends Dialog { diff --git a/app/src/com/jc/jcfw/JcSDK.java b/app/src/com/jc/jcfw/JcSDK.java index 81841dd..79583db 100644 --- a/app/src/com/jc/jcfw/JcSDK.java +++ b/app/src/com/jc/jcfw/JcSDK.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.net.Uri; import android.util.Log; -import com.fitchgc.jcwallet.MainActivity; +import com.cege.games.release.MainActivity; import org.cocos2dx.lib.CocosJSHelper; import org.json.JSONException; diff --git a/app/src/com/jc/jcfw/appauth/JConfiguration.java b/app/src/com/jc/jcfw/appauth/JConfiguration.java index 25c4d52..5aa11a0 100644 --- a/app/src/com/jc/jcfw/appauth/JConfiguration.java +++ b/app/src/com/jc/jcfw/appauth/JConfiguration.java @@ -7,7 +7,7 @@ import android.content.res.Resources; import android.net.Uri; import android.text.TextUtils; -import com.fitchgc.jcwallet.R; +import com.cege.games.release.R; import net.openid.appauth.connectivity.ConnectionBuilder; import net.openid.appauth.connectivity.DefaultConnectionBuilder;