1.修改播放礼物特效代码
2:修改从房间进入其他页面出现不能回到房间的问题
This commit is contained in:
@@ -7,6 +7,7 @@ import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentStatePagerAdapter;
|
||||
import androidx.viewpager.widget.ViewPager;
|
||||
|
||||
import com.example.modulevocal.R;
|
||||
import com.example.modulevocal.conacts.RevenueConacts;
|
||||
@@ -45,9 +46,42 @@ public class RevenueActivity extends BaseMvpActivity<RevenuePresenter, ActivityR
|
||||
}
|
||||
|
||||
mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getSupportFragmentManager(), list,type));
|
||||
mBinding.viewPager.setOffscreenPageLimit(0);
|
||||
mBinding.slidingTabLayout.setViewPager(mBinding.viewPager);
|
||||
mBinding.slidingTabLayout.setCurrentTab(0);
|
||||
mBinding.viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
|
||||
@Override
|
||||
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPageSelected(int position) {
|
||||
// 当页面切换时,控制 tv_bb_qs 按钮的显示
|
||||
// 页面选中时,获取对应位置的 Fragment 并刷新数据
|
||||
// 当页面切换时,控制 tv_bb_qs 按钮的显示
|
||||
// 页面选中时,获取对应位置的 Fragment 并刷新数据
|
||||
Fragment fragment = ((MyFragmentPagerAdapter) mBinding.viewPager.getAdapter()).getRegisteredFragment(position);
|
||||
if (fragment instanceof RevenueFragment) {
|
||||
// 根据 position 获取对应的 MyBagBean
|
||||
MyBagBean model = list.get(position);
|
||||
String direction = model.getMyBagType(); // 直接使用 MyBagBean 中的类型
|
||||
int types=0;
|
||||
if (model.getMyBagTitle().contains("钻石")){
|
||||
types=2;
|
||||
}else {
|
||||
types=1;
|
||||
}
|
||||
// 调用 Fragment 的刷新方法并传递参数
|
||||
((RevenueFragment) fragment).refreshData(types, direction);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPageScrollStateChanged(int state) {
|
||||
|
||||
}
|
||||
});
|
||||
// mBinding.slidingTabLayout.setOnTabSelectListener(new ViewPager.OnPageChangeListener() {
|
||||
// @Override
|
||||
// public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
|
||||
|
||||
@@ -67,8 +67,10 @@ public class RevenueFragment extends BaseMvpFragment<RevenuePresenter, FragmentR
|
||||
}
|
||||
}
|
||||
|
||||
public void refreshData() {
|
||||
public void refreshData(int type, String direction) {
|
||||
isLoaded = false;
|
||||
this.type= String.valueOf(type);
|
||||
this.revenueType=direction;
|
||||
loadData();
|
||||
}
|
||||
|
||||
@@ -89,7 +91,7 @@ public class RevenueFragment extends BaseMvpFragment<RevenuePresenter, FragmentR
|
||||
mBinding.tv2.setText(sdf.format(startDate));
|
||||
Log.d("SelectedTime", "结束时间:" + sdf.format(endDate));
|
||||
mBinding.tv22.setText(sdf.format(endDate));
|
||||
MvpPre.getRevenueData("1","50",type,mBinding.tv2.getText().toString(),mBinding.tv22.getText().toString(),revenueType);
|
||||
MvpPre.getRevenueData("1","50",revenueType,mBinding.tv2.getText().toString(),mBinding.tv22.getText().toString(),type);
|
||||
});
|
||||
dialog.show(getParentFragmentManager(), "DoubleTimePicker");
|
||||
});
|
||||
@@ -109,7 +111,7 @@ public class RevenueFragment extends BaseMvpFragment<RevenuePresenter, FragmentR
|
||||
String endDate = mBinding.tv22.getText().toString();
|
||||
if ( startDate!=null && !startDate.equals("") ){
|
||||
if ( endDate!=null && !endDate.equals("") ){
|
||||
MvpPre.getRevenueData(page+"","50",revenueType,startDate,endDate,revenueType);
|
||||
MvpPre.getRevenueData(page+"","50",revenueType,startDate,endDate,type);
|
||||
}else {
|
||||
MvpPre.getRevenueData(page+"","50",revenueType,"",endDate,type);
|
||||
}
|
||||
@@ -129,7 +131,7 @@ public class RevenueFragment extends BaseMvpFragment<RevenuePresenter, FragmentR
|
||||
String endDate = mBinding.tv22.getText().toString();
|
||||
if ( startDate!=null && !startDate.equals("") ){
|
||||
if ( endDate!=null && !endDate.equals("") ){
|
||||
MvpPre.getRevenueData(page+"","50",revenueType,startDate,endDate,revenueType);
|
||||
MvpPre.getRevenueData(page+"","50",revenueType,startDate,endDate,type);
|
||||
}else {
|
||||
MvpPre.getRevenueData(page+"","50",revenueType,"",endDate,type);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user