moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]facebook登录修改

Browse Source
This commit is contained in:
wushaocheng
2023-08-29 18:19:10 +08:00
parent 282036bb20
commit f794fe960f
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java
View File

@@ -112,6 +112,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
* 获取Facebook个人信息
*/
public void getFbLoginInfo(AccessToken accessToken) {
getDialogManager().showProgressDialog(this);
GraphRequest request = GraphRequest.newMeRequest(accessToken, (object, response) -> {
if (object != null) {
AuthModel.get().facebookLogin(object)
@@ -124,15 +125,18 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
@Override
public void onSuccess(String result) {
getDialogManager().dismissDialog();
reportLoginResult(IReportConstants.ONE, IReportConstants.ONE, "");
HashMap<String, Object> map = new HashMap<>(2);
map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_facebook));
ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
SPUtils.putString(SpConstants.LOGIN_TYPE, SpConstants.FACEBOOK);
}
@Override
public void onError(Throwable e) {
getDialogManager().dismissDialog();
reportLoginResult(IReportConstants.ONE, IReportConstants.ZERO, e.getMessage());
dealWithLoginError(e);
}
@@ -255,16 +259,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
SingleToastUtil.showToast(ResUtil.getString(com.yizhuan.xchat_android_core.R.string.xchat_android_core_auth_authmodel_03));
return;
}
LoginManager.getInstance().logOut();
reportLoginType(IReportConstants.ONE);
LoginManager.getInstance().logInWithReadPermissions(this, Arrays.asList("public_profile"));
// //判断当前token，如果不为空，则已经获取过权限，否则读取权限走registerCallback回调
// AccessToken accessToken = AccessToken.getCurrentAccessToken();
// Profile profile = Profile.getCurrentProfile();
// if (accessToken == null || accessToken.isExpired() || profile == null) {
// LoginManager.getInstance().logInWithReadPermissions(this, List.of("public_profile"));
// } else {
// getFbLoginInfo(accessToken);
// }
break;
case R.id.cs_line:
reportLoginType(IReportConstants.TWO);
@@ -401,6 +398,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
@Override
protected void onDestroy() {
super.onDestroy();
getDialogManager().dismissDialog();
LoginManager.getInstance().unregisterCallback(callbackManager);
EventBus.getDefault().unregister(this);
}

6
app/src/main/res/values/strings.xml
View File

@@ -5102,9 +5102,9 @@
<string name="contract_statement">簽約流水</string>
<string name="Welcome_to_piko">Welcome to Piko！</string>
<string name="facebook_app_id">1266232494209868</string>
<string name="fb_login_protocol_scheme">fb1266232494209868</string>
<string name="facebook_client_token">189d1a90712cc61cedded4cf1372cb21</string>
<string name="facebook_app_id">257255447149586</string>
<string name="fb_login_protocol_scheme">fb257255447149586</string>
<string name="facebook_client_token">2486dc8156a5723de478742aac7fd41c</string>
<string name="account_login">賬號登錄</string>
<string name="code_login">短信登錄</string>
<string name="please_input_piko_account">請輸入Piko賬號</string>

4
gradle.properties
View File

@@ -29,8 +29,8 @@ COMPILE_SDK_VERSION=32
MIN_SDK_VERSION=21
TARGET_SDK_VERSION=32
version_name=1.10.1
version_code=1001
version_name=1.10.2
version_code=1002
#systemProp.https.proxyHost=127.0.0.1
#systemProp.https.proxyPort=4780