yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
18142669586 2022-08-10 14:25:56 +08:00
parent 28cd3e5798
commit dfe1cb4500
8 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/build.gradle
View File

@ -158,7 +158,7 @@ dependencies {
//融云小视频模块
api 'cn.rongcloud.sdk:sight:5.1.2'
api 'com.facebook.android:facebook-login:8.2.0'
api 'com.facebook.android:facebook-android-sdk:[5,6)'
implementation 'com.facebook.android:facebook-android-sdk:[8,9)'
api('com.twitter.sdk.android:twitter-core:3.1.1@aar') {
transitive = true

2
common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
View File

@ -21,6 +21,7 @@ import com.yunbao.common.utils.L;
import com.yunbao.common.utils.MD5Util;
import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.VersionUtil;
import com.yunbao.common.utils.WordUtil;
import org.greenrobot.eventbus.EventBus;
@ -164,6 +165,7 @@ public class CommonHttpUtil {
//或者仅仅使用 locale = Locale.getDefault(); 不需要考虑接口 deprecated(弃用)问题
HttpClient.getInstance().get("Home.getConfig", CommonHttpConsts.GET_CONFIG)
.params("langue", lang)
.params("version", VersionUtil.getVersion())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

4
common/src/main/res/values-en/strings.xml
View File

@ -781,8 +781,8 @@
<string name="only_open_anchor">For the time being, it is only open to the anchor</string>
<string name="facebook_app_id">391137926073929</string>
<string name="facebook_client_token">64dbc61681a4492544be268eb1084c3e</string>
<string name="facebook_app_id">2011402032399020</string>
<string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>

4
common/src/main/res/values/strings.xml
View File

@ -794,8 +794,8 @@
<string name="only_open_anchor">暫時只對主播開放</string>
<string name="facebook_app_id">391137926073929</string>
<string name="facebook_client_token">64dbc61681a4492544be268eb1084c3e</string>
<string name="facebook_app_id">2011402032399020</string>
<string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>

2
config.gradle
View File

@ -4,7 +4,7 @@ ext {
buildToolsVersion: "28.0.3",
minSdkVersion : 21,
targetSdkVersion : 30,
versionCode : 202,
versionCode : 203,
versionName : "6.3.8"
]
manifestPlaceholders = [

35
main/src/main/java/com/yunbao/main/activity/EntryActivity.java
View File

@ -282,24 +282,25 @@ public class EntryActivity extends AppCompatActivity {
}
}
});
MainNetManager.get(EntryActivity.this)
.FaceBookUp(new com.yunbao.common.http.base.HttpCallback<FaceBookUpModel>() {
@Override
public void onSuccess(FaceBookUpModel data) {
if(data.getType().equals("0")){
LoginManager.getInstance().logInWithReadPermissions(EntryActivity.this, Arrays.asList("public_profile"));
}else{
WebViewActivity.forward(EntryActivity.this, data.getLink()+"?");
}
}
@Override
public void onError(String error) {
}
});
// MainNetManager.get(EntryActivity.this)
// .FaceBookUp(new com.yunbao.common.http.base.HttpCallback<FaceBookUpModel>() {
// @Override
// public void onSuccess(FaceBookUpModel data) {
// if(data.getType().equals("1")){
// LoginManager.getInstance().logInWithReadPermissions(EntryActivity.this, Arrays.asList("public_profile"));
// }else{
// WebViewActivity.forward(EntryActivity.this, data.getLink()+"?");
// }
//
// }
//
// @Override
// public void onError(String error) {
//
//
// }
// });
}
});

7
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@ -19,6 +19,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
@ -1147,6 +1148,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
fragment1.show(getSupportFragmentManager(), "InstructorOperationDialog");
}
if (isShowHomeIcon) {
LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) floatBanner.getLayoutParams();
lp.bottomMargin = DpUtil.dp2px(50);
floatBanner.setLayoutParams(lp);
waitingTip.setVisibility(View.VISIBLE);
//跳转消息中心
waitingTip.setOnClickListener(new View.OnClickListener() {
@ -1160,6 +1164,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
}
});
} else {
LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) floatBanner.getLayoutParams();
lp.bottomMargin = DpUtil.dp2px(10);
floatBanner.setLayoutParams(lp);
waitingTip.setVisibility(View.GONE);
}
}