From 4089c8552d6c90fa70729e0b6c24c882243e1671 Mon Sep 17 00:00:00 2001
From: memory <547527489@qq.com>
Date: Thu, 15 Sep 2022 21:31:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=AC=AC=E4=B8=89=E6=96=B9?=
=?UTF-8?q?=E7=99=BB=E5=BD=95=E5=92=8C=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/build.gradle | 2 +-
.../com/yizhuan/erban/base/BaseLoginAct.java | 7 +-
.../yizhuan/erban/ui/widget/ShareDialog.java | 9 --
app/src/main/res/layout/dialog_share.xml | 86 ++-----------------
.../XChatConstants.java | 4 +-
5 files changed, 14 insertions(+), 94 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 93fb7a839..8eb13f172 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
compileSdkVersion 30
defaultConfig {
- applicationId "com.mango.yinyou"
+ applicationId "com.mango.moshen"
minSdkVersion 21
targetSdkVersion 29
versionCode Integer.valueOf(version_code)
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java b/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java
index 9eed57ccc..8089fb712 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java
@@ -104,9 +104,10 @@ public abstract class BaseLoginAct extends BaseActivity {
if (throwable == null) {
showTvDesc(loginTipsInfo.getTips());
- showTvLoginTip(loginTipsInfo.isShowWechat() || loginTipsInfo.isShowQq());
- showThirdPartLogin(loginTipsInfo.isShowWechat(), loginTipsInfo.isShowQq(), loginTipsInfo.isShowOneClick());
-
+ //showTvLoginTip(loginTipsInfo.isShowWechat() || loginTipsInfo.isShowQq());
+ //showThirdPartLogin(loginTipsInfo.isShowWechat(), loginTipsInfo.isShowQq(), loginTipsInfo.isShowOneClick());
+ showTvLoginTip(false);
+ showThirdPartLogin(false, false, loginTipsInfo.isShowOneClick());
} else {
showTvLoginTip(false);
showThirdPartLogin(false, false, false);
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java
index dec8c2e14..ff0d6b17a 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java
@@ -41,7 +41,6 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
private WindowManager windowManager;
private int width;
private TextView tvName;
- private TextView tvErban;
private TextView tvWeixin;
private TextView tvWeixinpy;
private TextView tvQq;
@@ -67,20 +66,17 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
setContentView(R.layout.dialog_share);
setCanceledOnTouchOutside(true);
tvName = (TextView) findViewById(R.id.tv_title);
- tvErban = findViewById(R.id.tv_erban);
tvWeixin = (TextView) findViewById(R.id.tv_weixin);
tvWeixinpy = (TextView) findViewById(R.id.tv_weixinpy);
tvQq = (TextView) findViewById(R.id.tv_qq);
tvQqZone = (TextView) findViewById(R.id.tv_qq_zone);
tvCancel = (TextView) findViewById(R.id.tv_cancel);
- tvErban.setOnClickListener(this);
tvWeixin.setOnClickListener(this);
tvWeixinpy.setOnClickListener(this);
tvQq.setOnClickListener(this);
tvQqZone.setOnClickListener(this);
tvCancel.setOnClickListener(this);
- findViewById(R.id.tv_qq_game).setOnClickListener(this);
FrameLayout bottomSheet = findViewById(R.id.design_bottom_sheet);
if (bottomSheet != null) {
BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
@@ -95,10 +91,6 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
params.height = WindowManager.LayoutParams.MATCH_PARENT;
getWindow().setAttributes(params);
- if (type == TYPE_SHARE_H5){
- tvErban.setVisibility(View.GONE);
- tvQq.setVisibility(View.GONE);
- }
}
public void setName(String name) {
@@ -139,7 +131,6 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
dismiss();
break;
case R.id.tv_qq:
- case R.id.tv_qq_game:
if (onShareDialogItemClick != null) {
onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(QQ.NAME));
}
diff --git a/app/src/main/res/layout/dialog_share.xml b/app/src/main/res/layout/dialog_share.xml
index f1fca8643..53ec9860a 100644
--- a/app/src/main/res/layout/dialog_share.xml
+++ b/app/src/main/res/layout/dialog_share.xml
@@ -17,14 +17,13 @@
+ android:orientation="vertical"
+ android:visibility="gone">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+