diff --git a/common/build.gradle b/common/build.gradle
index b547dd1e0..b00b2e9f6 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -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
diff --git a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
index ed0ddb8bc..a37d7d532 100644
--- a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
+++ b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
@@ -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) {
diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml
index 3bbb38eb7..bac1062b4 100644
--- a/common/src/main/res/values-en/strings.xml
+++ b/common/src/main/res/values-en/strings.xml
@@ -781,8 +781,8 @@
For the time being, it is only open to the anchor
- 391137926073929
- 64dbc61681a4492544be268eb1084c3e
+ 2011402032399020
+ 959584e054a33614996361f0044e5253
ui10vIggex2F043HnztYNuA3g
J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 676b0c183..1378ee9ef 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -794,8 +794,8 @@
暫時只對主播開放
- 391137926073929
- 64dbc61681a4492544be268eb1084c3e
+ 2011402032399020
+ 959584e054a33614996361f0044e5253
ui10vIggex2F043HnztYNuA3g
J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ
diff --git a/config.gradle b/config.gradle
index cac6a8ff7..52cf2350b 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,7 +4,7 @@ ext {
buildToolsVersion: "28.0.3",
minSdkVersion : 21,
targetSdkVersion : 30,
- versionCode : 202,
+ versionCode : 203,
versionName : "6.3.8"
]
manifestPlaceholders = [
diff --git a/dependencies.gradle b/dependencies.gradle
index c9f6e4287..591bdefa4 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -3,12 +3,12 @@ ext {
dependencies = [
"appcompat-androidx" : 'androidx.appcompat:appcompat:1.0.2',
"recyclerview-androidx": 'androidx.recyclerview:recyclerview:1.0.0',
- "design" : 'com.google.android.material:material:1.0.0',
+ "design" : 'com.google.android.material:material:1.0.0',
"cardview-androidx" : 'androidx.cardview:cardview:1.0.0',
- "multidex" : 'androidx.multidex:multidex:2.0.0',
- "okhttp" : 'com.squareup.okhttp3:okhttp:3.14.9',//okHttp网络请求
- "okgo" : 'com.lzy.net:okgo:3.0.4',//OkGo 是对okHttp的封装
- "okserver" : 'com.lzy.net:okserver:2.0.5',//OkGo上传下载扩展库
+ "multidex" : 'androidx.multidex:multidex:2.0.0',
+ "okhttp" : 'com.squareup.okhttp3:okhttp:3.14.9',//okHttp网络请求
+ "okgo" : 'com.lzy.net:okgo:3.0.4',//OkGo 是对okHttp的封装
+ "okserver" : 'com.lzy.net:okserver:2.0.5',//OkGo上传下载扩展库
"fastjson" : 'com.alibaba:fastjson:1.1.70.android',//fastJson解析json
"eventbus" : 'org.greenrobot:eventbus:3.0.0',//eventbus事件总线
"glide" : 'com.github.bumptech.glide:glide:4.9.0',//使用Glide加载图片
diff --git a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
index 03103c858..8212d6d02 100644
--- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
@@ -282,24 +282,25 @@ public class EntryActivity extends AppCompatActivity {
}
}
});
- MainNetManager.get(EntryActivity.this)
- .FaceBookUp(new com.yunbao.common.http.base.HttpCallback() {
- @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) {
-
-
- }
- });
+ LoginManager.getInstance().logInWithReadPermissions(EntryActivity.this, Arrays.asList("public_profile"));
+// MainNetManager.get(EntryActivity.this)
+// .FaceBookUp(new com.yunbao.common.http.base.HttpCallback() {
+// @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) {
+//
+//
+// }
+// });
}
});
diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
index 9035e078b..3fa5acd73 100644
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -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);
}
}