From 8157edc05cc41f1bb94406dc59c039de5c84084e Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 15 Nov 2023 19:21:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=8E=BB=E6=8E=89facebook-SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 24 --- .../yizhuan/habu/ui/login/LoginActivity.java | 146 +++++++++--------- .../yizhuan/habu/ui/widget/ShareDialog.java | 19 ++- app/src/main/res/layout/activity_login.xml | 88 +++++------ app/src/main/res/layout/dialog_share.xml | 26 ++-- app/src/main/res/values/strings.xml | 3 - .../xchat_android_core/auth/IAuthModel.java | 1 - .../xchat_android_core/share/ShareModel.java | 37 ++--- library/build.gradle | 4 +- .../utils/AppMetaDataUtil.java | 3 +- mob.gradle | 7 - tmpmob/ShareSDK/assets/ShareSDK.xml | 2 +- 12 files changed, 159 insertions(+), 201 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3dd288954..323629a85 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1063,30 +1063,6 @@ android:name=".service.DaemonService" android:enabled="true" /> - - - - - - - - - - - - - - - diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/LoginActivity.java b/app/src/main/java/com/yizhuan/habu/ui/login/LoginActivity.java index dc401aa48..772efd935 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/LoginActivity.java +++ b/app/src/main/java/com/yizhuan/habu/ui/login/LoginActivity.java @@ -15,14 +15,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; - -import com.facebook.AccessToken; -import com.facebook.CallbackManager; -import com.facebook.FacebookCallback; -import com.facebook.FacebookException; -import com.facebook.GraphRequest; -import com.facebook.login.LoginManager; -import com.facebook.login.LoginResult; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.common.util.log.LogUtil; import com.yizhuan.habu.upgrade.AppUpgradeHelper; @@ -67,7 +59,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener protected CheckBox tvProtocol; private TextView tvProtocolHint; - private CallbackManager callbackManager; +// private CallbackManager callbackManager; public static void start(Context context) { Intent intent = new Intent(context, LoginActivity.class); @@ -88,66 +80,66 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN); ReportManager.get().reportEvent(IReportConstants.LOGIN_SHOW, map); - callbackManager = CallbackManager.Factory.create(); - LoginManager.getInstance().registerCallback(callbackManager, new FacebookCallback() { - @Override - public void onSuccess(LoginResult loginResult) { - getFbLoginInfo(loginResult.getAccessToken()); - } - - @Override - public void onCancel() { - LogUtil.i(TAG, "Meta login canceled"); - } - - @Override - public void onError(FacebookException error) { - LogUtil.e(TAG, "Meta login failed error:" + error.getMessage()); - } - }); +// callbackManager = CallbackManager.Factory.create(); +// LoginManager.getInstance().registerCallback(callbackManager, new FacebookCallback() { +// @Override +// public void onSuccess(LoginResult loginResult) { +// getFbLoginInfo(loginResult.getAccessToken()); +// } +// +// @Override +// public void onCancel() { +// LogUtil.i(TAG, "Meta login canceled"); +// } +// +// @Override +// public void onError(FacebookException error) { +// LogUtil.e(TAG, "Meta login failed error:" + error.getMessage()); +// } +// }); } - /** - * 获取Facebook个人信息 - */ - public void getFbLoginInfo(AccessToken accessToken) { - getDialogManager().showProgressDialog(this); - GraphRequest request = GraphRequest.newMeRequest(accessToken, (object, response) -> { - if (object != null) { - AuthModel.get().facebookLogin(object) - .compose(bindUntilEvent(ActivityEvent.DESTROY)) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(String result) { - getDialogManager().dismissDialog(); - reportLoginResult(IReportConstants.ONE, IReportConstants.ONE, ""); -// HashMap 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); - } - }); - } - }); - - Bundle parameters = new Bundle(); - parameters.putString("fields", "id,name,gender,picture"); - request.setParameters(parameters); - request.executeAsync(); - } +// /** +// * 获取Facebook个人信息 +// */ +// public void getFbLoginInfo(AccessToken accessToken) { +// getDialogManager().showProgressDialog(this); +// GraphRequest request = GraphRequest.newMeRequest(accessToken, (object, response) -> { +// if (object != null) { +// AuthModel.get().facebookLogin(object) +// .compose(bindUntilEvent(ActivityEvent.DESTROY)) +// .subscribe(new SingleObserver() { +// @Override +// public void onSubscribe(Disposable d) { +// +// } +// +// @Override +// public void onSuccess(String result) { +// getDialogManager().dismissDialog(); +// reportLoginResult(IReportConstants.ONE, IReportConstants.ONE, ""); +//// HashMap 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); +// } +// }); +// } +// }); +// +// Bundle parameters = new Bundle(); +// parameters.putString("fields", "id,name,gender,picture"); +// request.setParameters(parameters); +// request.executeAsync(); +// } private void onFindViews() { tvProtocol = findViewById(R.id.tv_protocol); @@ -253,14 +245,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener switch (v.getId()) { case R.id.cs_facebook: - //是否安装客户端 - if (!DeviceUtils.isAppInstalled(this, PackageNameConstants.FACEBOOK_NAME)) { - 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")); +// //是否安装客户端 +// if (!DeviceUtils.isAppInstalled(this, PackageNameConstants.FACEBOOK_NAME)) { +// 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")); break; case R.id.cs_line: reportLoginType(IReportConstants.TWO); @@ -336,7 +328,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - callbackManager.onActivityResult(requestCode, resultCode, data); +// callbackManager.onActivityResult(requestCode, resultCode, data); } /** @@ -398,7 +390,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener protected void onDestroy() { super.onDestroy(); getDialogManager().dismissDialog(); - LoginManager.getInstance().unregisterCallback(callbackManager); +// LoginManager.getInstance().unregisterCallback(callbackManager); EventBus.getDefault().unregister(this); } diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/ShareDialog.java b/app/src/main/java/com/yizhuan/habu/ui/widget/ShareDialog.java index e65e8e50d..230b1654a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/ShareDialog.java +++ b/app/src/main/java/com/yizhuan/habu/ui/widget/ShareDialog.java @@ -17,7 +17,6 @@ import com.yizhuan.xchat_android_library.utils.SingleToastUtil; import java.util.HashMap; -import cn.sharesdk.facebook.Facebook; import cn.sharesdk.framework.Platform; import cn.sharesdk.framework.ShareSDK; import cn.sharesdk.google.GooglePlus; @@ -40,7 +39,7 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen private TextView tvErban; private TextView tv_share_link; private TextView tvLine; - private TextView tvFaceBook; +// private TextView tvFaceBook; private TextView tvCancel; private OnShareDialogItemClick onShareDialogItemClick; private int type = TYPE_SHARE_NORMAL; @@ -63,14 +62,14 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen tvErban = findViewById(R.id.tv_erban); tv_share_link = (TextView) findViewById(R.id.tv_share_link); tvLine = (TextView) findViewById(R.id.tv_line); - tvFaceBook = (TextView) findViewById(R.id.tv_facebook); +// tvFaceBook = (TextView) findViewById(R.id.tv_facebook); tvCancel = (TextView) findViewById(R.id.tv_cancel); tvErban.setOnClickListener(this); tv_share_link.setOnClickListener(this); tvLine.setOnClickListener(this); tvCancel.setOnClickListener(this); - tvFaceBook.setOnClickListener(this); +// tvFaceBook.setOnClickListener(this); WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); Display d = windowManager.getDefaultDisplay(); DisplayMetrics realDisplayMetrics = new DisplayMetrics(); @@ -114,15 +113,15 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen } dismiss(); break; - case R.id.tv_facebook: - if (onShareDialogItemClick != null) { +// case R.id.tv_facebook: +// if (onShareDialogItemClick != null) { // HashMap map = new HashMap<>(2); // map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_facebook)); // ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map); - onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(Facebook.NAME)); - } - dismiss(); - break; +// onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(Facebook.NAME)); +// } +// dismiss(); +// break; case R.id.tv_share_link: if (onShareDialogItemClick != null) { // HashMap map = new HashMap<>(2); diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index d90b65ecb..8d54cc8dd 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -84,53 +84,53 @@ app:layout_constraintEnd_toEndOf="@+id/cs_google" app:layout_constraintTop_toTopOf="@+id/cs_google"/> - + + + + + + + + + - + + + + + + + + + + - + + + + + + + + - + - + + + + + + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@+id/cs_google"> - + + + + + + + + + + + + + 簽約流水 Welcome to Habu Live！ - 2899088310346434 - fb2899088310346434 - 賬號登錄 短信登錄 請輸入Habu Live賬號 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java index 69b0c166b..61e3e5317 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java @@ -1,6 +1,5 @@ package com.yizhuan.xchat_android_core.auth; -import com.facebook.CallbackManager; import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo; import com.yizhuan.xchat_android_core.base.IModel; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java index 7259bcb1e..17fa9149a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java @@ -32,7 +32,6 @@ import com.yizhuan.xchat_android_library.utils.SingleToastUtil; import java.net.URLEncoder; import java.util.HashMap; -import cn.sharesdk.facebook.Facebook; import cn.sharesdk.framework.Platform; import cn.sharesdk.framework.PlatformActionListener; import cn.sharesdk.google.GooglePlus; @@ -89,15 +88,16 @@ public class ShareModel extends BaseModel implements IShareModel { } else { siteUrl += "?" + params; } - //facebook - if (platform.getName().equals(Facebook.NAME)) { - sp.setTitle(webViewInfo.getTitle()); - sp.setText(webViewInfo.getDesc()); - sp.setUrl(siteUrl); - sp.setShareType(Platform.SHARE_WEBPAGE); - } +// //facebook +// if (platform.getName().equals(Facebook.NAME)) { +// sp.setTitle(webViewInfo.getTitle()); +// sp.setText(webViewInfo.getDesc()); +// sp.setUrl(siteUrl); +// sp.setShareType(Platform.SHARE_WEBPAGE); +// } //line - else if (platform.getName().equals(Line.NAME)) { +// else + if (platform.getName().equals(Line.NAME)) { sp.setText(webViewInfo.getDesc() + "[" + webViewInfo.getLink() + "]"); } @@ -177,14 +177,15 @@ public class ShareModel extends BaseModel implements IShareModel { sp.setImageUrl(room_avatar); //facebook - if (platform.getName().equals(Facebook.NAME)) { - sp.setTitle(XChatConstants.SHARE_ROOM_TITLE); - sp.setText(XChatConstants.SHARE_ROOM_TEXT); - sp.setUrl(siteUrl); - sp.setShareType(Platform.SHARE_WEBPAGE); - } +// if (platform.getName().equals(Facebook.NAME)) { +// sp.setTitle(XChatConstants.SHARE_ROOM_TITLE); +// sp.setText(XChatConstants.SHARE_ROOM_TEXT); +// sp.setUrl(siteUrl); +// sp.setShareType(Platform.SHARE_WEBPAGE); +// } //line - else if (platform.getName().equals(Line.NAME)) { +// else + if (platform.getName().equals(Line.NAME)) { sp.setText(XChatConstants.SHARE_ROOM_TEXT + "[" + siteUrl + "]"); } @@ -231,8 +232,8 @@ public class ShareModel extends BaseModel implements IShareModel { shareType = 1; } else if (platform.getName().equals(Line.NAME)) { shareType = 2; - } else if (platform.getName().equals(Facebook.NAME)) { - shareType = 3; +// } else if (platform.getName().equals(Facebook.NAME)) { +// shareType = 3; } api.getShareRedPacket( diff --git a/library/build.gradle b/library/build.gradle index c29605115..d8febeb68 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -145,8 +145,8 @@ dependencies { api 'com.umeng.sdk:utdid:1.1.5.3' - api 'com.facebook.android:facebook-android-sdk:16.2.0' - api 'com.facebook.android:facebook-login:16.2.0' +// api 'com.facebook.android:facebook-android-sdk:16.2.0' +// api 'com.facebook.android:facebook-login:16.2.0' // 网络请求chrome数据调试 api 'com.facebook.stetho:stetho:1.5.1' diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java index d86b7cda7..7e46a87ab 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java @@ -5,6 +5,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.text.TextUtils; +import com.yizhuan.xchat_android_library.common.Constants; import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import com.yizhuan.xchat_android_library.utils.log.MLog; @@ -26,7 +27,7 @@ public class AppMetaDataUtil { */ public static String getChannelID() { String channelID = BasicConfig.INSTANCE.getChannel(); - channelID = TextUtils.isEmpty(channelID) ? "google" : channelID; + channelID = TextUtils.isEmpty(channelID) ? Constants.GOOGLE : channelID; return channelID; } diff --git a/mob.gradle b/mob.gradle index fbe03700e..4f197d6ef 100644 --- a/mob.gradle +++ b/mob.gradle @@ -13,13 +13,6 @@ MobSDK { //平台配置信息 gui false devInfo { - Facebook { - appKey "2899088310346434" - appSecret "329a52326acbbf043f8a18a28a0c9570" - callbackUri "https://mob.com" - shareByAppClient true - enable true - } GooglePlus { appId "280420698373-najdbkk7ju8lg8f6gg4bnll8nf7l0i2c.apps.googleusercontent.com" diff --git a/tmpmob/ShareSDK/assets/ShareSDK.xml b/tmpmob/ShareSDK/assets/ShareSDK.xml index 8a9846055..fe3df5d24 100644 --- a/tmpmob/ShareSDK/assets/ShareSDK.xml +++ b/tmpmob/ShareSDK/assets/ShareSDK.xml @@ -6,7 +6,7 @@ - +