首页UI修改,签名包名修改

This commit is contained in:
huangjian
2021-01-07 18:31:04 +08:00
parent 0cea1d3b5b
commit 6811dc63ae
46 changed files with 590 additions and 461 deletions

View File

@@ -17,10 +17,13 @@ import android.view.animation.LinearInterpolator;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nim.uikit.api.NimUIKit;
import com.netease.nim.uikit.api.model.contact.ContactEventListener;
import com.netease.nim.uikit.api.model.session.SessionCustomization;
@@ -168,6 +171,7 @@ import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent;
import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent;
import com.yizhuan.xchat_android_core.user.event.NeedBindPhoneEvent;
import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent;
import com.yizhuan.xchat_android_core.user.event.ShowMeEvent;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
@@ -180,6 +184,7 @@ import com.yizhuan.xchat_android_library.utils.pref.CommonPref;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.jetbrains.annotations.NotNull;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
@@ -210,6 +215,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
private LinearLayout llDragInfo;
private LivingIconView userLivingView;
private View viewClose;
private DrawerLayout drawerLayout;
private MainTabLayout mMainTabLayout;
@@ -246,11 +252,10 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
}
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
protected void onRestoreInstanceState(@NotNull Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
if (savedInstanceState != null) {
mCurrentMainPosition = savedInstanceState.getInt(Constants.KEY_MAIN_POSITION);
}
mCurrentMainPosition = savedInstanceState.getInt(Constants.KEY_MAIN_POSITION);
}
@Override
@@ -293,6 +298,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
initTeamSessionCustomization();
EventBus.getDefault().register(this);
otherModelInit();
initMe();
}
private void otherModelInit() {
@@ -505,8 +511,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
userLivingView.setColor(Color.WHITE);
mMainTabLayout.setOnTabClickListener(this);
drawerLayout = findViewById(R.id.drawer_layout);
}
@@ -621,6 +626,11 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
@Override
public void onBackPressed() {
if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
drawerLayout.closeDrawer(GravityCompat.START);
return;
}
try {
moveTaskToBack(false);
} catch (Exception e) {
@@ -832,12 +842,19 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
switchFragment(position);
}
private void initMe() {
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.fl_container, new MeFragment())
.commitAllowingStateLoss();
}
private void switchFragment(int position) {
FragmentManager fragmentManager = getSupportFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
Fragment squareFragment = fragmentManager.findFragmentByTag(SquareFragment.TAG);
Fragment contactFragment = fragmentManager.findFragmentByTag(ContactsListFragment.TAG);
Fragment meFragment = fragmentManager.findFragmentByTag(MeFragment.TAG);
//Fragment meFragment = fragmentManager.findFragmentByTag(MeFragment.TAG);
Fragment homeFragment = fragmentManager.findFragmentByTag(GameHomeFragment.TAG);
if (squareFragment != null && squareFragment.isVisible()) {
@@ -846,9 +863,9 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
if (contactFragment != null && contactFragment.isVisible()) {
fragmentTransaction.hide(contactFragment);
}
if (meFragment != null && meFragment.isVisible()) {
/* if (meFragment != null && meFragment.isVisible()) {
fragmentTransaction.hide(meFragment);
}
}*/
if (homeFragment != null && homeFragment.isVisible()) {
fragmentTransaction.hide(homeFragment);
}
@@ -873,13 +890,13 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
fragmentTransaction.add(R.id.main_fragment, contactFragment, ContactsListFragment.TAG);
}
fragmentTransaction.show(contactFragment);
} else if (position == MainTabLayout.MAIN_TAB_POS_ME) {
} /*else if (position == MainTabLayout.MAIN_TAB_POS_ME) {
if (meFragment == null) {
meFragment = new MeFragment();
fragmentTransaction.add(R.id.main_fragment, meFragment, MeFragment.TAG);
}
fragmentTransaction.show(meFragment);
}
}*/
if (!isDestroyed()) fragmentTransaction.commitAllowingStateLoss();
mCurrentMainPosition = position;
}
@@ -920,6 +937,11 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
RecallDialog.start(this);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onShowMe(ShowMeEvent event) {
if (drawerLayout != null) drawerLayout.openDrawer(GravityCompat.START);
}
public boolean isShowMsgTab() {
return mCurrentMainPosition == MainTabLayout.MAIN_TAB_POS_MSG;
}
@@ -1172,4 +1194,15 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
}
}
@Override
protected boolean needSteepStateBar() {
return true;
}
@Override
protected void setStatusBar() {
super.setStatusBar();
StatusBarUtil.transparencyBar(this);
StatusBarUtil.StatusBarLightMode(this);
}
}