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

feat:去掉facebook-SDK

Browse Source
This commit is contained in:
Max
2023-11-15 19:21:09 +08:00
parent c474cd5824
commit 8157edc05c
12 changed files with 159 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/AndroidManifest.xml
View File

@@ -1063,30 +1063,6 @@
android:name=".service.DaemonService"
android:enabled="true" />
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id" />
<meta-data
android:name="com.facebook.sdk.ClientToken"
android:value="@string/facebook_client_token" />
<activity
android:name="com.facebook.FacebookActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name" />
<activity
android:name="com.facebook.CustomTabActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="@string/fb_login_protocol_scheme" />
</intent-filter>
</activity>
<activity android:name=".avroom.room_album.RoomAlbumActivity" />
</application>

146
app/src/main/java/com/yizhuan/habu/ui/login/LoginActivity.java
View File

@@ -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<LoginResult>() {
@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<LoginResult>() {
// @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<String>() {
@Override
public void onSubscribe(Disposable d) {
}
@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);
}
});
}
});
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<String>() {
// @Override
// public void onSubscribe(Disposable d) {
//
// }
//
// @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);
// }
// });
// }
// });
//
// 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);
}

19
app/src/main/java/com/yizhuan/habu/ui/widget/ShareDialog.java
View File

@@ -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<String, Object> 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<String, Object> map = new HashMap<>(2);

88
app/src/main/res/layout/activity_login.xml
View File

@@ -84,53 +84,53 @@
app:layout_constraintEnd_toEndOf="@+id/cs_google"
app:layout_constraintTop_toTopOf="@+id/cs_google"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cs_facebook"
android:layout_width="match_parent"
android:layout_height="46dp"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:layout_marginTop="@dimen/dp_16"
android:background="@drawable/shape_login_btn_bg"
app:layout_constraintTop_toBottomOf="@+id/cs_google">
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cs_facebook"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="46dp"-->
<!-- android:layout_marginStart="40dp"-->
<!-- android:layout_marginEnd="40dp"-->
<!-- android:layout_marginTop="@dimen/dp_16"-->
<!-- android:background="@drawable/shape_login_btn_bg"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/cs_google">-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_facebook"
android:layout_width="match_parent"
android:layout_height="46dp"
android:gravity="center"
android:text="@string/login_facebook"
android:textColor="@color/color_6D6B89"
android:textSize="16sp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<!-- <androidx.appcompat.widget.AppCompatTextView-->
<!-- android:id="@+id/tv_facebook"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="46dp"-->
<!-- android:gravity="center"-->
<!-- android:text="@string/login_facebook"-->
<!-- android:textColor="@color/color_6D6B89"-->
<!-- android:textSize="16sp"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"/>-->
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/ic_login_facebook"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_28"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:src="@drawable/ic_login_facebook"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="@dimen/dp_28"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"/>-->
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_facebook_last_login"
android:text="@string/last_login"
android:textSize="@dimen/sp_12"
android:textColor="@color/color_F5F6FA"
android:gravity="center"
android:background="@drawable/bg_last_login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="-10dp"
android:layout_marginTop="-10dp"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintEnd_toEndOf="@+id/cs_facebook"
app:layout_constraintTop_toTopOf="@+id/cs_facebook"/>
<!-- <androidx.appcompat.widget.AppCompatTextView-->
<!-- android:id="@+id/tv_facebook_last_login"-->
<!-- android:text="@string/last_login"-->
<!-- android:textSize="@dimen/sp_12"-->
<!-- android:textColor="@color/color_F5F6FA"-->
<!-- android:gravity="center"-->
<!-- android:background="@drawable/bg_last_login"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginEnd="-10dp"-->
<!-- android:layout_marginTop="-10dp"-->
<!-- android:visibility="gone"-->
<!-- tools:visibility="visible"-->
<!-- app:layout_constraintEnd_toEndOf="@+id/cs_facebook"-->
<!-- app:layout_constraintTop_toTopOf="@+id/cs_facebook"/>-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cs_line"
@@ -140,7 +140,7 @@
android:layout_marginEnd="40dp"
android:layout_marginTop="@dimen/dp_16"
android:background="@drawable/shape_login_btn_bg"
app:layout_constraintTop_toBottomOf="@+id/cs_facebook">
app:layout_constraintTop_toBottomOf="@+id/cs_google">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_line"

26
app/src/main/res/layout/dialog_share.xml
View File

@@ -73,19 +73,19 @@
android:textSize="@dimen/font_medium"
app:drawableTopCompat="@drawable/icon_line" />
<TextView
android:id="@+id/tv_facebook"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_17"
android:layout_marginBottom="19dp"
android:layout_weight="1"
android:drawablePadding="9dp"
android:gravity="center"
android:text="@string/share_facebook"
android:textColor="@color/color_999999"
android:textSize="@dimen/font_medium"
app:drawableTopCompat="@drawable/icon_facebook" />
<!-- <TextView-->
<!-- android:id="@+id/tv_facebook"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="@dimen/dp_17"-->
<!-- android:layout_marginBottom="19dp"-->
<!-- android:layout_weight="1"-->
<!-- android:drawablePadding="9dp"-->
<!-- android:gravity="center"-->
<!-- android:text="@string/share_facebook"-->
<!-- android:textColor="@color/color_999999"-->
<!-- android:textSize="@dimen/font_medium"-->
<!-- app:drawableTopCompat="@drawable/icon_facebook" />-->
<TextView
android:id="@+id/tv_share_link"

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

@@ -5105,9 +5105,6 @@
<string name="contract_statement">簽約流水</string>
<string name="welcome_to_app">Welcome to Habu Live！</string>
<string name="facebook_app_id">2899088310346434</string>
<string name="fb_login_protocol_scheme">fb2899088310346434</string>
<string name="facebook_client_token"></string>
<string name="account_login">賬號登錄</string>
<string name="code_login">短信登錄</string>
<string name="please_input_app_account">請輸入Habu Live賬號</string>

1
core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java
View File

@@ -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;

37
core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
View File

@@ -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(

4
library/build.gradle
View File

@@ -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'

3
library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java
View File

@@ -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;
}

7
mob.gradle
View File

@@ -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"

2
tmpmob/ShareSDK/assets/ShareSDK.xml
View File

@@ -6,7 +6,7 @@
<QZone Enable="false" />
<Renren Enable="false" />
<KaiXin Enable="false" />
<Facebook ShareByAppClient="true" Enable="true" ConsumerKey="2899088310346434" ConsumerSecret="329a52326acbbf043f8a18a28a0c9570" RedirectUrl="https://mob.com" />
<Facebook Enable="false" />
<Twitter Enable="false" />
<Evernote Enable="false" />
<FourSquare Enable="false" />