UI调整,放出第三方登录

app/src/main/java/com/nnbc123/app/base/BaseLoginAct.java

@@ -20,13 +20,13 @@ import com.netease.nim.uikit.StatusBarUtil;
 import com.nnbc123.app.R;
 import com.nnbc123.app.common.widget.OriginalDrawStatusClickSpan;
 import com.nnbc123.app.ui.webview.CommonWebViewActivity;
-import com.nnbc123.xchat_android_constants.XChatConstants;
 import com.nnbc123.core.UriProvider;
 import com.nnbc123.core.auth.AuthModel;
 import com.nnbc123.core.bean.LoginTipsInfo;
 import com.nnbc123.core.market_verify.MarketVerifyModel;
 import com.nnbc123.core.statistic.StatisticManager;
 import com.nnbc123.core.statistic.protocol.StatisticsProtocol;
+import com.nnbc123.xchat_android_constants.XChatConstants;
 
 import io.reactivex.SingleObserver;
 import io.reactivex.disposables.Disposable;
@@ -101,10 +101,8 @@ public abstract class BaseLoginAct extends BaseActivity {
                     public void accept(LoginTipsInfo loginTipsInfo, Throwable throwable) throws Exception {
                         if (throwable == null) {
                             showTvDesc(loginTipsInfo.getTips());
-                            showTvLoginTip(false);
-                            showThirdPartLogin(false, false, true);
-                            //showTvLoginTip(loginTipsInfo.isShowWechat() || loginTipsInfo.isShowQq());
-                            //showThirdPartLogin(loginTipsInfo.isShowWechat(), loginTipsInfo.isShowQq(), loginTipsInfo.isShowOneClick());
+                            showTvLoginTip(loginTipsInfo.isShowWechat() || loginTipsInfo.isShowQq());
+                            showThirdPartLogin(loginTipsInfo.isShowWechat(), loginTipsInfo.isShowQq(), loginTipsInfo.isShowOneClick());
                         } else {
                             showTvLoginTip(false);
                             showThirdPartLogin(false, false, false);

app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt

@@ -194,7 +194,7 @@ class MeFragment : BaseFragment(), View.OnClickListener {
                 if (pagePos == 0) {
                     if (pagerList[pagePos].size <= 4) {
                         mBinding.viewPagerEntrance.updateLayoutParams {
-                            height = ScreenUtil.dip2px(73f)
+                            height = ScreenUtil.dip2px(80f)
                         }
                     } else {
                         mBinding.viewPagerEntrance.updateLayoutParams {

app/src/main/res/drawable/shape_room_new_friends_bg.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
+
     <solid android:color="#ffffffff" />
-    <corners
-        android:bottomLeftRadius="12dp"
-        android:bottomRightRadius="12dp"
-        android:topLeftRadius="12dp"
-        android:topRightRadius="12dp" />
+
+    <corners android:radius="14dp" />
+
 </shape>
 

app/src/main/res/layout/activity_charge.xml

@@ -31,7 +31,7 @@
         android:layout_below="@id/title_bar"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/dp_30"
-        android:drawableStart="@mipmap/ic_charge_diamond"
+        android:drawableStart="@drawable/ic_charge_diamond"
         android:drawablePadding="@dimen/dp_4"
         android:text="我的钻石"
         android:textColor="@color/text_normal_282828"

app/src/main/res/layout/activity_login_password.xml

@@ -42,7 +42,6 @@
         android:layout_marginTop="56dp"
         android:layout_marginEnd="@dimen/dp_15"
         android:text="验证码登录"
-        android:visibility="gone"
         android:textColor="@color/text_title_282828"
         android:textSize="@dimen/sp_15"
         android:textStyle="bold"

app/src/main/res/layout/fragment_user_info_gift.xml

@@ -11,6 +11,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_gift"
+            android:layout_marginTop="6dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingStart="12dp"

app/src/module_community/java/com/nnbc123/app/community/square/SquareDynamicFragment.java

@@ -128,7 +128,7 @@ public class SquareDynamicFragment extends BaseFragment {
                 getDialogManager().showCommonPopupDialog(list, "取消");
             } else if (view.getId() == R.id.ll_share) {
                 new ShareDynamicHelper(getActivity()).share(bean);
-            } else if (view.getId() == R.id.fl_live) {
+            } else if (view.getId() == R.id.iv_avatar) {
                 if (bean.getInRoomUid() == null) {
                     return;
                 }

app/src/module_community/java/com/nnbc123/app/community/square/adapter/NewSquareDynamicAdapter.kt

@@ -39,7 +39,7 @@ class NewSquareDynamicAdapter :
         } else {
             liveView.stop()
         }
-        helper.addOnClickListener(R.id.fl_live)
+        helper.addOnClickListener(R.id.iv_avatar)
         //点赞
         setLikeCount(helper, item.likeCount, item.isLike)
         val llLike: LinearLayout = helper.getView(R.id.ll_like)

app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickPassLoginAct.java

@@ -132,8 +132,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
             case R.id.img_phone_login:
                 StatisticManager.Instance().onEvent(
                         StatisticsProtocol.EVENT_ONE_CLICK_LOGIN_CHANGE_ID, "一键登录-切换账号");
-                //LoginPhoneActivity.start(QuickPassLoginAct.this);
-                LoginPasswordActivity.start(this);
+                LoginPhoneActivity.start(QuickPassLoginAct.this);
                 break;
         }
 
@@ -167,8 +166,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
                 toast("一键登录失败，请使用其他方式登录");
                 getDialogManager().dismissDialog();
                 //跳转到手机登录页
-                LoginPasswordActivity.start(QuickPassLoginAct.this);
-                //LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
+                LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
             }
         });
     }
@@ -214,8 +212,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
             @Override
             public void onGetTokenError(String s, String s1) {
                 toast("一键登录失败，请使用其他登录方式");
-                LoginPasswordActivity.start(QuickPassLoginAct.this);
-               // LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
+                LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
                 setClickEnable(true);
             }
 
@@ -264,12 +261,10 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
                     spannableString, "我知道了", true, null);
         } else if (e instanceof IOException) {
             toast("网络异常,请检查您的网络再试~");
-            LoginPasswordActivity.start(QuickPassLoginAct.this);
-            //LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
+            LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
         } else {
             toast(e.getMessage());
-            LoginPasswordActivity.start(QuickPassLoginAct.this);
-            //LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
+            LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
         }
     }