diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 20018297d..169daf51f 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/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; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java index 81779911b..41eb12490 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java +++ b/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: diff --git a/app/src/main/res/drawable-xhdpi/ic_login_phone.png b/app/src/main/res/drawable-xhdpi/ic_login_phone.png new file mode 100644 index 000000000..47703dd84 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_login_phone.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_login_qq.png b/app/src/main/res/drawable-xhdpi/ic_login_qq.png new file mode 100644 index 000000000..96d7a3f6d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_login_qq.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_login_wx.png b/app/src/main/res/drawable-xhdpi/ic_login_wx.png new file mode 100644 index 000000000..c47dfc17c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_login_wx.png differ diff --git a/app/src/main/res/drawable-xhdpi/qq_login.png b/app/src/main/res/drawable-xhdpi/qq_login.png deleted file mode 100644 index 3d2c1634f..000000000 Binary files a/app/src/main/res/drawable-xhdpi/qq_login.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/wx_login.png b/app/src/main/res/drawable-xhdpi/wx_login.png deleted file mode 100644 index 5c0a4a028..000000000 Binary files a/app/src/main/res/drawable-xhdpi/wx_login.png and /dev/null differ diff --git a/app/src/main/res/layout/fragment_game_home.xml b/app/src/main/res/layout/fragment_game_home.xml index f7e14cc0a..3d376e692 100644 --- a/app/src/main/res/layout/fragment_game_home.xml +++ b/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" > diff --git a/app/src/main/res/mipmap-xhdpi/bg_login.png b/app/src/main/res/mipmap-xhdpi/bg_login.png new file mode 100644 index 000000000..12aa5034f Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/bg_login.png differ diff --git a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java index f25e1a8e8..5d1bd1ef3 100644 --- a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java +++ b/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; diff --git a/app/src/module_quick_pass/res/drawable/bg_quick_pass.xml b/app/src/module_quick_pass/res/drawable/bg_quick_pass.xml index 93027e8e4..e0a60b646 100644 --- a/app/src/module_quick_pass/res/drawable/bg_quick_pass.xml +++ b/app/src/module_quick_pass/res/drawable/bg_quick_pass.xml @@ -1,9 +1,8 @@ - + - + \ No newline at end of file diff --git a/app/src/module_quick_pass/res/layout/act_quick_pass.xml b/app/src/module_quick_pass/res/layout/act_quick_pass.xml index 59a112a24..515271628 100644 --- a/app/src/module_quick_pass/res/layout/act_quick_pass.xml +++ b/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"> - - - +