修改登录页部分UI

app/src/main/java/com/yizhuan/erban/MainActivity.java

@@ -62,7 +62,7 @@ import com.yizhuan.erban.decoration.view.widgets.ShowCarGuideDialog;
 import com.yizhuan.erban.family.view.activity.FamilyHomeActivity;
 import com.yizhuan.erban.guide.GuideActivity;
 import com.yizhuan.erban.home.dialog.RecommendRoomForNewerDialog;
-
+import com.yizhuan.erban.home.fragment.CommunityNoticeAct;
 import com.yizhuan.erban.home.fragment.ContactsListFragment;
 
 import com.yizhuan.erban.home.fragment.FindTabFragment;

app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java

@@ -4,18 +4,8 @@ import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.text.TextUtils;
 import android.view.View;
 
-
-import com.bumptech.glide.load.DataSource;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.request.RequestListener;
-import com.bumptech.glide.request.target.Target;
-import com.bumptech.glide.request.target.ViewTarget;
-import com.netease.nim.uikit.support.glide.GlideApp;
-
 import com.yizhuan.erban.MainActivity;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.UIHelper;
@@ -75,9 +65,6 @@ public class MeFragment extends BaseFragment implements View.OnClickListener {
 
     private ObservableScrollView scrollView;
 
-    private ImageView ivOfficialMask;
-    private TextView tvOfficialMask;
-
     @Override
     public int getRootLayoutId() {
         return R.layout.fragment_me;
@@ -163,25 +150,6 @@ public class MeFragment extends BaseFragment implements View.OnClickListener {
             });
         }
 
-        if (mBinding.inOfficialMask != null) {
-            ivOfficialMask = mBinding.inOfficialMask.findViewById(R.id.iv_official_mask);
-            tvOfficialMask = mBinding.inOfficialMask.findViewById(R.id.tv_official_mask);
-        }
-
-    }
-
-    private void setOfficialMask(String name, String icon) {
-        if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(icon)) {
-            mBinding.inOfficialMask.setVisibility(View.VISIBLE);
-
-            if (tvOfficialMask != null && ivOfficialMask != null) {
-                tvOfficialMask.setText(name);
-                NobleUtil.loadResource(icon, ivOfficialMask);
-            }
-
-        } else {
-            mBinding.inOfficialMask.setVisibility(View.GONE);
-        }
     }
 
     private void onGetRelationShipEvent(RelationShipEvent event) {
@@ -208,7 +176,6 @@ public class MeFragment extends BaseFragment implements View.OnClickListener {
             mBinding.tvUserId.setText(String.format(Locale.getDefault(),
                     getString(R.string.text_user_id), String.valueOf(mUserInfo.getErbanNo())));
 
-
 //            int nobleExpire = mUserInfo.getRemainDay();
 //            if (nobleExpire > -1) {
 //                mBinding.tvNobleRemainTime.setVisibility(View.VISIBLE);
@@ -217,7 +184,6 @@ public class MeFragment extends BaseFragment implements View.OnClickListener {
 //            }
 //            mBinding.tvNobleRemainTime.setText(getString(R.string.noble_remain_time, nobleExpire));
 
-
             NobleInfo nobleInfo = mUserInfo.getNobleInfo();
             HeadWearInfo headWearInfo = mUserInfo.getUserHeadwear();
             if (headWearInfo != null) {
@@ -361,10 +327,8 @@ public class MeFragment extends BaseFragment implements View.OnClickListener {
                 startActivity(new Intent(getActivity(), PatriarchModeActivity.class));
                 break;
 
-
             case R.id.me_item_setting:
                 UIHelper.showSettingAct(mContext);
-
                 break;
 
 //            case R.id.me_item_charge:

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

@@ -89,6 +89,7 @@
                             app:layout_constraintTop_toBottomOf="@id/view_pager"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
+                            android:visibility="gone"
                             >
 
                             <com.jude.rollviewpager.RollPagerView
@@ -98,7 +99,6 @@
                                 android:layout_marginStart="@dimen/dp_20"
                                 android:layout_marginEnd="@dimen/dp_20"
                                 android:layout_marginTop="@dimen/dp_12"
-
                                 app:rollviewpager_hint_gravity="left"
                                 app:rollviewpager_hint_paddingBottom="8dp"
                                 />

app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java

@@ -11,6 +11,7 @@ import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.view.KeyEvent;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -71,7 +72,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
     private LinearLayout containerThirdPart;
     private View vDivider;
 
-    private TextView tvOtherLogin;
+    private ImageView phoneLogin;
 
     public static void start(Context context) {
         Intent intent = new Intent(context, QuickPassLoginAct.class);
@@ -106,14 +107,14 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
         tvLoginTip = findViewById(R.id.tv_login_tip);
         tvDesc = findViewById(R.id.tv_desc);
 
-        tvOtherLogin = findViewById(R.id.tv_other_login);
+        phoneLogin = findViewById(R.id.img_phone_login);
     }
 
     private void onSetListener() {
         wxLogin.setOnClickListener(this);
         qqLogin.setOnClickListener(this);
         tvLoginQuickPass.setOnClickListener(this);
-        tvOtherLogin.setOnClickListener(this);
+        phoneLogin.setOnClickListener(this);
     }
 
     @Override
@@ -158,8 +159,8 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
 
                 break;
 
-            case R.id.tv_other_login:
-                tvOtherLogin.setEnabled(false);
+            case R.id.img_phone_login:
+                phoneLogin.setEnabled(false);
                 StatisticManager.Instance().onEvent(
                         StatisticsProtocol.Event.EVENT_ONE_CLICK_LOGIN_CHANGE_ID, "一键登录-切换账号");
                 getDialogManager().showProgressDialog(QuickPassLoginAct.this);
@@ -275,7 +276,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         getDialogManager().dismissDialog();
-        tvOtherLogin.setEnabled(true);
+        phoneLogin.setEnabled(true);
 
         if (resultCode == RESULT_OK) {
             if (requestCode == quickPassRequestCode) {
@@ -306,8 +307,8 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
         if (qqLogin != null) {
             qqLogin.setEnabled(enable);
         }
-        if (tvOtherLogin != null) {
-            tvOtherLogin.setEnabled(enable);
+        if (phoneLogin != null) {
+            phoneLogin.setEnabled(enable);
         }
         canClick = enable;
 

app/src/module_quick_pass/res/drawable/bg_quick_pass.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="24dp"/>
+    <corners android:radius="10dp"/>
 
-    <gradient android:startColor="@color/color_1CE9E7"
-        android:endColor="@color/color_45F1E5"/>
+    <solid android:color="@color/white"/>
 
 </shape>

app/src/module_quick_pass/res/layout/act_quick_pass.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/white">
+    android:background="@mipmap/bg_login">
 
     <ImageView
         android:id="@+id/iv_logo_quick_pass"
@@ -32,12 +32,12 @@
 
     <TextView
         android:id="@+id/tv_login_quick_pass"
-        android:layout_width="280dp"
-        android:layout_height="48dp"
+        android:layout_width="225dp"
+        android:layout_height="45dp"
         android:gravity="center"
         android:text="本机号码一键登录"
-        android:textColor="@color/white"
-        android:textSize="@dimen/dp_16"
+        android:textColor="@color/color_7154EE"
+        android:textSize="@dimen/dp_15"
         android:layout_marginTop="40dp"
         android:background="@drawable/bg_quick_pass"
         app:layout_constraintStart_toStartOf="parent"
@@ -46,21 +46,6 @@
         tools:ignore="SpUsage"
         />
 
-    <TextView
-        android:id="@+id/tv_other_login"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:drawablePadding="6dp"
-        android:drawableEnd="@drawable/ic_full_arraw_right"
-        android:textSize="@dimen/dp_15"
-        android:textColor="@color/color_666666"
-        android:text="其他账号登录"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_login_quick_pass"
-        />
-
     <TextView
         android:id="@+id/tv_protocol"
         android:layout_width="wrap_content"
@@ -89,20 +74,25 @@
             android:id="@+id/img_wx_login"
             android:layout_width="33dp"
             android:layout_height="33dp"
-            android:src="@drawable/wx_login"
+            android:src="@drawable/ic_login_wx"
             android:visibility="gone"
             tools:visibility="visible" />
 
-        <View
-            android:id="@+id/v_divider_third_part"
-            android:layout_width="63.5dp"
-            android:layout_height="1dp"/>
+        <ImageView
+            android:id="@+id/img_phone_login"
+            android:layout_width="33dp"
+            android:layout_height="33dp"
+            android:layout_marginStart="@dimen/dp_45"
+            android:layout_marginEnd="@dimen/dp_45"
+            android:src="@drawable/ic_login_phone"
+
+            />
 
         <ImageView
             android:id="@+id/img_qq_login"
             android:layout_width="33dp"
             android:layout_height="33dp"
-            android:src="@drawable/qq_login"
+            android:src="@drawable/ic_login_qq"
             android:visibility="gone"
             tools:visibility="visible"/>