Skip to content

android / dayu

Go to a project
Commit fa3b60dd by 罗翻
Options

fragment切换优化

parent 99077b03
Inline Side-by-side
Showing with 141 additions and 89 deletions
app/build.gradle
...@@ -90,7 +90,7 @@ dependencies { ...@@ -90,7 +90,7 @@ dependencies {
//mutidex //mutidex
compile 'com.android.support:multidex:1.0.2' compile 'com.android.support:multidex:1.0.2'
compile 'com.android.support:design:25.0.0' compile 'com.android.support:design:25.4.0'
//greendao数据库 //greendao数据库
compile 'org.greenrobot:greendao:3.2.0' compile 'org.greenrobot:greendao:3.2.0'
......
app/src/main/java/com/dayu/bigfish/InitializeActivity.java
...@@ -78,7 +78,7 @@ public class InitializeActivity extends AppCompatActivity { ...@@ -78,7 +78,7 @@ public class InitializeActivity extends AppCompatActivity {
} }
public void showPerMissionDialog() { public void showPerMissionDialog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.custom_dialog2, getString(R.string.please_open__permission) CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.please_open__permission)
, (dialog1, confirm) -> { , (dialog1, confirm) -> {
if (confirm) { if (confirm) {
Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
......
app/src/main/java/com/dayu/bigfish/base/BasePresenter.java
...@@ -145,7 +145,7 @@ public abstract class BasePresenter<V> { ...@@ -145,7 +145,7 @@ public abstract class BasePresenter<V> {
* 重新登录的提示框. * 重新登录的提示框.
*/ */
private void showLoginDialog() { private void showLoginDialog() {
mDialog = new CustomDialog(mActivity, R.style.custom_dialog2, getString(R.string.login_state_no) mDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.login_state_no)
, (dialog, confirm) -> { , (dialog, confirm) -> {
if (confirm) { if (confirm) {
UserManager.getInstance().clearUserInfo(mActivity); UserManager.getInstance().clearUserInfo(mActivity);
......
app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderPresenter.java
...@@ -40,6 +40,13 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter { ...@@ -40,6 +40,13 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
public void accept(Tab tab) throws Exception { public void accept(Tab tab) throws Exception {
((HomeOrderFragment) mView).setTabNum(tab, mIndex); ((HomeOrderFragment) mView).setTabNum(tab, mIndex);
} }
}, responeThrowable -> {
Tab tab = new Tab();
tab.setCanceled(0);
tab.setError(0);
tab.setPendingservice(0);
tab.setReservation(0);
((HomeOrderFragment) mView).setTabNum(tab, mIndex);
})); }));
} }
......
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderPresenter.java
...@@ -18,7 +18,6 @@ import com.dayu.bigfish.greendao.GreenDaoManager; ...@@ -18,7 +18,6 @@ import com.dayu.bigfish.greendao.GreenDaoManager;
import com.dayu.bigfish.greendao.OrderInfoDao; import com.dayu.bigfish.greendao.OrderInfoDao;
import com.dayu.bigfish.ui.SopWebViewActivity; import com.dayu.bigfish.ui.SopWebViewActivity;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.luck.picture.lib.tools.PictureFileUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.greendao.query.Query; import org.greenrobot.greendao.query.Query;
...@@ -154,7 +153,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -154,7 +153,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
} }
EventBus.getDefault().post(new OrderState(status, mPosition)); EventBus.getDefault().post(new OrderState(status, mPosition));
mOrderInfoDao.deleteByKey((long) orderId); mOrderInfoDao.deleteByKey((long) orderId);
PictureFileUtils.deleteCacheDirFile(mActivity); // PictureFileUtils.deleteCacheDirFile(mActivity);
mActivity.finish(); mActivity.finish();
} }
})); }));
...@@ -184,7 +183,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -184,7 +183,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(), mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice()); info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice());
mImages.clear(); mImages.clear();
PictureFileUtils.deleteCacheDirFile(mActivity); // PictureFileUtils.deleteCacheDirFile(mActivity);
} }
})); }));
} }
......
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
...@@ -62,50 +62,44 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -62,50 +62,44 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
mFragments = new Fragment[]{firstFragment, secondFragment, thirdFragment, fourFragment}; mFragments = new Fragment[]{firstFragment, secondFragment, thirdFragment, fourFragment};
mTabs = new TextView[]{mBind.tabFirst, mBind.tabSecond, mBind.tabThird, mBind.tabFour}; mTabs = new TextView[]{mBind.tabFirst, mBind.tabSecond, mBind.tabThird, mBind.tabFour};
addFragment(); addFragment();
showHideFragment(1, mPosition);
initListener(); initListener();
doAction(getIntent()); doAction(getIntent());
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
} }
private void initListener() { private void initListener() {
mBind.tabFirst.setOnClickListener(o -> { mBind.tabFirst.setOnClickListener(o -> showHideFragment(0, mPosition));
showHideFragment(0, mPosition); mBind.tabSecond.setOnClickListener(o -> showHideFragment(1, mPosition));
});
mBind.tabSecond.setOnClickListener(o -> {
showHideFragment(1, mPosition);
});
mBind.tabThird.setOnClickListener(o -> { mBind.tabThird.setOnClickListener(o -> {
showHideFragment(2, mPosition); showHideFragment(2, mPosition);
mBind.ivMessage.setVisibility(View.GONE); mBind.ivMessage.setVisibility(View.GONE);
}); });
mBind.tabFour.setOnClickListener(o -> { mBind.tabFour.setOnClickListener(o -> showHideFragment(3, mPosition));
showHideFragment(3, mPosition);
});
}
public void resetSelected(int position) {
for (int i = 0; i < mTabs.length; i++) {
mTabs[i].setSelected(false);
}
mTabs[position].setSelected(true);
} }
/**
* 添加fragment.
*/
private void addFragment() { private void addFragment() {
mFragmentManger = getSupportFragmentManager(); mFragmentManger = getSupportFragmentManager();
FragmentTransaction transaction = mFragmentManger.beginTransaction() FragmentTransaction transaction = mFragmentManger.beginTransaction()
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN); .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
for (int i = 0; i < mFragments.length; i++) { for (int i = 0; i < mFragments.length; i++) {
Fragment fragment = mFragments[i]; Fragment fragment = mFragments[i];
String toName = fragment.getClass().getName(); transaction.add(R.id.fl_container, fragment);
transaction.add(R.id.fl_container, fragment, toName);
if (i != 0) {
transaction.hide(fragment); transaction.hide(fragment);
} }
} transaction.show(mFragments[1]);
transaction.commit(); transaction.commit();
resetSelected(1);
} }
/**
* fragment切换.
*
* @param showPosition
* @param hidePosition
*/
private void showHideFragment(int showPosition, int hidePosition) { private void showHideFragment(int showPosition, int hidePosition) {
if (showPosition == hidePosition) return; if (showPosition == hidePosition) return;
mFragmentManger.beginTransaction() mFragmentManger.beginTransaction()
...@@ -116,6 +110,18 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -116,6 +110,18 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
mPosition = showPosition; mPosition = showPosition;
} }
/**
* 重置按钮状态.
* @param position
*/
public void resetSelected(int position) {
for (int i = 0; i < mTabs.length; i++) {
mTabs[i].setSelected(false);
}
mTabs[position].setSelected(true);
mPosition =position;
}
/** /**
* 消息小红点. * 消息小红点.
...@@ -138,7 +144,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -138,7 +144,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
* @param upgradePrompt 提示语 * @param upgradePrompt 提示语
*/ */
public void showUpdateDialog(String upgradePrompt, CustomDialog.OnCloseListener listener) { public void showUpdateDialog(String upgradePrompt, CustomDialog.OnCloseListener listener) {
CustomDialog dialog = new CustomDialog(mActivity, R.style.custom_dialog2, upgradePrompt, listener); CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, upgradePrompt, listener);
dialog.setTitle(getString(R.string.have_new_version)) dialog.setTitle(getString(R.string.have_new_version))
.setNegativeButton(getString(R.string.next_again)) .setNegativeButton(getString(R.string.next_again))
.setPositiveButton(getString(R.string.need_upglude)); .setPositiveButton(getString(R.string.need_upglude));
...@@ -158,6 +164,10 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -158,6 +164,10 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
notificationManager.notify(0, builder.build()); notificationManager.notify(0, builder.build());
} }
/**
* 处理intent传来的信息.
* @param intent
*/
private void doAction(Intent intent) { private void doAction(Intent intent) {
InformBean info = (InformBean) intent.getSerializableExtra(Constants.MESSAGE_INFO); InformBean info = (InformBean) intent.getSerializableExtra(Constants.MESSAGE_INFO);
if (info != null) { if (info != null) {
......
app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java
package com.dayu.bigfish.ui; package com.dayu.bigfish.ui;
import android.os.Bundle;
import android.support.design.widget.TabLayout; import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity; import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.bean.OrderDetail; import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.databinding.ActivityOrderDetailsBinding; import com.dayu.bigfish.databinding.ActivityOrderDetailsBinding;
import com.dayu.bigfish.presenter.orderdetail.OrderDetailContract; import com.dayu.bigfish.presenter.orderdetail.OrderDetailContract;
import com.dayu.bigfish.presenter.orderdetail.OrderDetailPresenter; import com.dayu.bigfish.presenter.orderdetail.OrderDetailPresenter;
import com.dayu.bigfish.ui.adapter.FragmentAdapter; import com.dayu.bigfish.ui.adapter.FragmentBaseAdapter;
import com.dayu.bigfish.ui.fragment.OrderDatailsServeFragment; import com.dayu.bigfish.ui.fragment.OrderDetaillsFragment;
import com.dayu.bigfish.ui.fragment.OrderDateilsFragment; import com.dayu.bigfish.ui.fragment.OrderDetailsServeFragment;
import com.dayu.bigfish.utils.TabLayoutUtils; import com.dayu.bigfish.utils.TabLayoutUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -26,10 +24,9 @@ import java.util.List; ...@@ -26,10 +24,9 @@ import java.util.List;
public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, ActivityOrderDetailsBinding> public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, ActivityOrderDetailsBinding>
implements OrderDetailContract.View { implements OrderDetailContract.View {
private List<Fragment> list; private FragmentBaseAdapter fragmentAdapter;
private FragmentAdapter fragmentAdapter; private OrderDetaillsFragment orderDatailsFragment;
private OrderDateilsFragment orderDatailsFragment; private OrderDetailsServeFragment orderDatailsServeFragment;
private OrderDatailsServeFragment orderDatailsServeFragment;
@Override @Override
...@@ -43,21 +40,17 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act ...@@ -43,21 +40,17 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act
} }
public void init(OrderDetail detail) { public void init(OrderDetail detail) {
Bundle bundle = new Bundle(); List<Fragment> fragments = new ArrayList<>();
bundle.putSerializable(Constants.ORDER_DETAIL, detail); List<String> titles = new ArrayList<>();
list = new ArrayList<>(); orderDatailsFragment = OrderDetaillsFragment.newInstance(detail);
orderDatailsFragment = new OrderDateilsFragment(); orderDatailsServeFragment = OrderDetailsServeFragment.newInstance(detail);
list.add(orderDatailsFragment); fragments.add(orderDatailsFragment);
orderDatailsServeFragment = new OrderDatailsServeFragment(); fragments.add(orderDatailsServeFragment);
list.add(orderDatailsServeFragment); titles.add(getString(R.string.order_detail));
orderDatailsFragment.setArguments(bundle); titles.add(getString(R.string.server_record));
orderDatailsServeFragment.setArguments(bundle); fragmentAdapter = FragmentBaseAdapter.newInstance(getSupportFragmentManager(), fragments, titles);
fragmentAdapter = new FragmentAdapter(getSupportFragmentManager(), list);
mBind.viewPager.setAdapter(fragmentAdapter); mBind.viewPager.setAdapter(fragmentAdapter);
mBind.tablayout.setupWithViewPager(mBind.viewPager); mBind.tablayout.setupWithViewPager(mBind.viewPager);
mBind.tablayout.removeAllTabs();
mBind.tablayout.addTab(mBind.tablayout.newTab().setText(getString(R.string.order_detail)));
mBind.tablayout.addTab(mBind.tablayout.newTab().setText(getString(R.string.server_record)));
mBind.tablayout.setTabMode(TabLayout.MODE_FIXED); mBind.tablayout.setTabMode(TabLayout.MODE_FIXED);
TabLayoutUtils.setIndicator(mBind.tablayout, 60, 60, R.color.cl_receiving_order_item_data, this); TabLayoutUtils.setIndicator(mBind.tablayout, 60, 60, R.color.cl_receiving_order_item_data, this);
} }
......
app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
...@@ -26,7 +26,7 @@ public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySett ...@@ -26,7 +26,7 @@ public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySett
@Override @Override
public void showCachDialog(CustomDialog.OnCloseListener listener) { public void showCachDialog(CustomDialog.OnCloseListener listener) {
CustomDialog dialog = new CustomDialog(mActivity, R.style.custom_dialog2, getString(R.string.sure_clear_data) CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.sure_clear_data)
, listener); , listener);
dialog.setTitle(getString(R.string.notice)) dialog.setTitle(getString(R.string.notice))
.setNegativeButton(getString(R.string.cancle)) .setNegativeButton(getString(R.string.cancle))
......
app/src/main/java/com/dayu/bigfish/ui/adapter/FragmentAdapter.java
...@@ -19,6 +19,7 @@ public class FragmentAdapter extends FragmentStatePagerAdapter { ...@@ -19,6 +19,7 @@ public class FragmentAdapter extends FragmentStatePagerAdapter {
this.list_fragemnts = list_fragemnts; this.list_fragemnts = list_fragemnts;
} }
@Override @Override
public int getCount() { public int getCount() {
return list_fragemnts.size(); return list_fragemnts.size();
...@@ -30,7 +31,13 @@ public class FragmentAdapter extends FragmentStatePagerAdapter { ...@@ -30,7 +31,13 @@ public class FragmentAdapter extends FragmentStatePagerAdapter {
return list_fragemnts.get(position); return list_fragemnts.get(position);
} }
@Override @Override
public void destroyItem(ViewGroup container, int position, Object object) { public void destroyItem(ViewGroup container, int position, Object object) {
} }
@Override
public CharSequence getPageTitle(int position) {
return super.getPageTitle(position);
}
} }
app/src/main/java/com/dayu/bigfish/ui/adapter/FragmentBaseAdapter.java
...@@ -7,7 +7,7 @@ import android.support.v4.app.FragmentStatePagerAdapter; ...@@ -7,7 +7,7 @@ import android.support.v4.app.FragmentStatePagerAdapter;
import java.util.List; import java.util.List;
/** /**
* Created by luofan on 17/12/24. * Created by baixiaokang on 16/5/8.
*/ */
public class FragmentBaseAdapter extends FragmentStatePagerAdapter { public class FragmentBaseAdapter extends FragmentStatePagerAdapter {
private List<Fragment> mFragments; private List<Fragment> mFragments;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeFirstTabFragment.java
...@@ -23,7 +23,6 @@ public class HomeFirstTabFragment extends BaseFragment<HomeFirstPresenter, Fragm ...@@ -23,7 +23,6 @@ public class HomeFirstTabFragment extends BaseFragment<HomeFirstPresenter, Fragm
@Override @Override
public void initView() { public void initView() {
} }
@Override @Override
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeMessageTabFragment.java
...@@ -30,17 +30,26 @@ public class HomeMessageTabFragment extends DataBindingFragment<FragmentMessageB ...@@ -30,17 +30,26 @@ public class HomeMessageTabFragment extends DataBindingFragment<FragmentMessageB
} }
@Override @Override
public int getLayoutId() {
return R.layout.fragment_message;
}
@Override
public void initView() { public void initView() {
List<String> mTitle = new ArrayList<>(); List<Integer> args = new ArrayList<>();
List<Integer> category = new ArrayList<>(); List<String> titles = new ArrayList<>();
mTitle.add(mActivity.getString(R.string.message_system)); titles.add(getString(R.string.message_system));
mTitle.add(mActivity.getString(R.string.message_dayu)); titles.add(getString(R.string.message_dayu));
category.add(1); args.add(1);
category.add(2); args.add(2);
Observable.fromIterable(category).map((Function<Integer, Fragment>) MessageFragment::newInstance).toList() Observable.fromIterable(args).map((Function<Integer, Fragment>) MessageFragment::newInstance).toList()
.map(fragments -> FragmentBaseAdapter.newInstance(getActivity().getSupportFragmentManager(), fragments, mTitle)) .map(fragments -> FragmentBaseAdapter.newInstance(getChildFragmentManager(), fragments, titles))
.subscribe(fragmentBaseAdapter -> mBind.vpMessage.setAdapter(fragmentBaseAdapter)); .subscribe(fragmentBaseAdapter -> {
mBind.vpMessage.setAdapter(fragmentBaseAdapter);
mBind.vpMessage.setOffscreenPageLimit(2);
mBind.tbMessage.setupWithViewPager(mBind.vpMessage); mBind.tbMessage.setupWithViewPager(mBind.vpMessage);
});
TabLayoutUtils.setIndicator(mBind.tbMessage, 60, 60, R.color.cl_receiving_order_item_data, getActivity()); TabLayoutUtils.setIndicator(mBind.tbMessage, 60, 60, R.color.cl_receiving_order_item_data, getActivity());
if (mIndex != -1) { if (mIndex != -1) {
mBind.vpMessage.setCurrentItem(mIndex); mBind.vpMessage.setCurrentItem(mIndex);
...@@ -48,11 +57,6 @@ public class HomeMessageTabFragment extends DataBindingFragment<FragmentMessageB ...@@ -48,11 +57,6 @@ public class HomeMessageTabFragment extends DataBindingFragment<FragmentMessageB
} }
} }
@Override
public int getLayoutId() {
return R.layout.fragment_message;
}
public void swtichFragment(int position) { public void swtichFragment(int position) {
if (mBind.tbMessage == null || mBind.tbMessage.getTabAt(position) == null) { if (mBind.tbMessage == null || mBind.tbMessage.getTabAt(position) == null) {
return; return;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeOrderFragment.java
...@@ -144,7 +144,6 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment ...@@ -144,7 +144,6 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
} }
}); });
setTabNum(null,0);
} }
...@@ -152,16 +151,16 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment ...@@ -152,16 +151,16 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
* 将网络请求到的数据展示到tab上 * 将网络请求到的数据展示到tab上
*/ */
public void setTabNum(Tab tab, int myTabIndex) { public void setTabNum(Tab tab, int myTabIndex) {
String[] tabNum = new String[]{tab.getReservation() + "", tab.getPendingservice() + "",
tab.getError() + "", tab.getCanceled() + ""};
if (isFirstAddTab) { if (isFirstAddTab) {
mBind.tbHome.removeAllTabs(); mBind.tbHome.removeAllTabs();
mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab("0", tabDesc[0]))); mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab(tabNum[0], tabDesc[0])));
mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab("0", tabDesc[1]))); mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab(tabNum[1], tabDesc[1])));
mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab("0", tabDesc[2]))); mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab(tabNum[2], tabDesc[2])));
mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab("0", tabDesc[3]))); mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab(tabNum[3], tabDesc[3])));
isFirstAddTab = false; isFirstAddTab = false;
} else { } else {
String[] tabNum = new String[]{tab.getReservation() + "", tab.getPendingservice() + "",
tab.getError() + "", tab.getCanceled() + ""};
for (int i = 0; i < mBind.tbHome.getTabCount(); i++) { for (int i = 0; i < mBind.tbHome.getTabCount(); i++) {
TextView tv = (TextView) mBind.tbHome.getTabAt(i).getCustomView().findViewById(R.id.tabtext); TextView tv = (TextView) mBind.tbHome.getTabAt(i).getCustomView().findViewById(R.id.tabtext);
TextView tvIcon = (TextView) mBind.tbHome.getTabAt(i).getCustomView().findViewById(R.id.tabicon); TextView tvIcon = (TextView) mBind.tbHome.getTabAt(i).getCustomView().findViewById(R.id.tabicon);
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomePersonFragment.java
...@@ -149,7 +149,7 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme ...@@ -149,7 +149,7 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
} }
private void showAlertDialog() { private void showAlertDialog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.custom_dialog2, mActivity.getString(R.string.not_set_account) CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, mActivity.getString(R.string.not_set_account)
, (dialog1, confirm) -> { , (dialog1, confirm) -> {
if (confirm) { if (confirm) {
Intent intent = new Intent(mActivity, WithdrawalsActivity.class); Intent intent = new Intent(mActivity, WithdrawalsActivity.class);
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDateilsFragment.java → app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDetaillsFragment.java
package com.dayu.bigfish.ui.fragment; package com.dayu.bigfish.ui.fragment;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.view.View; import android.view.View;
...@@ -17,12 +18,20 @@ import com.dayu.bigfish.utils.UIUtils; ...@@ -17,12 +18,20 @@ import com.dayu.bigfish.utils.UIUtils;
* on 2017/9/13. * on 2017/9/13.
*/ */
public class OrderDateilsFragment extends DataBindingFragment<FragmentOrderDatailsBinding> { public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderDatailsBinding> {
private boolean mFlag = true; private boolean mFlag = true;
private CoreAdapter mAdapter; private CoreAdapter mAdapter;
private OrderDetail mDetail; private OrderDetail mDetail;
public static OrderDetaillsFragment newInstance(OrderDetail detail) {
Bundle args = new Bundle();
args.putSerializable(Constants.ORDER_DETAIL,detail);
OrderDetaillsFragment fragment = new OrderDetaillsFragment();
fragment.setArguments(args);
return fragment;
}
@Override @Override
public void initView() { public void initView() {
mDetail = (OrderDetail) getArguments().getSerializable(Constants.ORDER_DETAIL); mDetail = (OrderDetail) getArguments().getSerializable(Constants.ORDER_DETAIL);
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDatailsServeFragment.java → app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDetailsServeFragment.java
package com.dayu.bigfish.ui.fragment; package com.dayu.bigfish.ui.fragment;
import android.os.Bundle;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.DataBindingFragment; import com.dayu.bigfish.base.DataBindingFragment;
...@@ -14,7 +16,15 @@ import java.text.ParseException; ...@@ -14,7 +16,15 @@ import java.text.ParseException;
* on 2017/9/13. * on 2017/9/13.
*/ */
public class OrderDatailsServeFragment extends DataBindingFragment<FragmentOrderServeBinding> { public class OrderDetailsServeFragment extends DataBindingFragment<FragmentOrderServeBinding> {
public static OrderDetailsServeFragment newInstance(OrderDetail detail) {
Bundle args = new Bundle();
args.putSerializable(Constants.ORDER_DETAIL, detail);
OrderDetailsServeFragment fragment = new OrderDetailsServeFragment();
fragment.setArguments(args);
return fragment;
}
@Override @Override
public int getLayoutId() { public int getLayoutId() {
......
app/src/main/java/com/dayu/bigfish/utils/BindingUtils.java
...@@ -76,6 +76,9 @@ public class BindingUtils { ...@@ -76,6 +76,9 @@ public class BindingUtils {
*/ */
@BindingAdapter({"setPresenter"}) @BindingAdapter({"setPresenter"})
public static void setPresenter(LRecyclerView view, BaseListPresenter presenter) { public static void setPresenter(LRecyclerView view, BaseListPresenter presenter) {
if (presenter == null) {
return;
}
view.setPresenter(presenter); view.setPresenter(presenter);
presenter.getSourceDatas().addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() { presenter.getSourceDatas().addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
@Override @Override
......
app/src/main/res/layout/fragment_message.xml
...@@ -40,18 +40,17 @@ ...@@ -40,18 +40,17 @@
android:background="@color/cl_white" android:background="@color/cl_white"
app:tabIndicatorColor="@color/cl_receiving_order_item_data" app:tabIndicatorColor="@color/cl_receiving_order_item_data"
app:tabMaxWidth="0dp" app:tabMaxWidth="0dp"
app:tabMode="fixed"
app:tabSelectedTextColor="@color/cl_receiving_order_item_data" app:tabSelectedTextColor="@color/cl_receiving_order_item_data"
app:tabTextAppearance="@style/TabLayoutTextStyle" app:tabTextAppearance="@style/TabLayoutTextStyle"
app:tabTextColor="@color/cl_tab_line" app:tabTextColor="@color/cl_tab_line" />
/>
<ImageView style="@style/card_line" /> <ImageView style="@style/line" />
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
android:id="@+id/vp_message" android:id="@+id/vp_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/cl_home_listview_bg" /> android:layout_marginTop="@dimen/dp_10"
android:background="@color/cl_white" />
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_personal_center.xml
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
<data> <data>
<import type="com.dayu.bigfish.presenter.homefourtab.HomePersonPresenter" />
<variable <variable
name="presenter" name="presenter"
type="com.dayu.bigfish.presenter.homefourtab.HomePersonPresenter" /> type="com.dayu.bigfish.presenter.homefourtab.HomePersonPresenter" />
......
app/src/main/res/values/styles.xml
...@@ -90,11 +90,6 @@ ...@@ -90,11 +90,6 @@
<item name="android:textSize">@dimen/sp_13.3</item> <item name="android:textSize">@dimen/sp_13.3</item>
</style> </style>
<style name="CustomDialog" parent="Theme.AppCompat.Dialog">
<item name="android:backgroundDimEnabled">false</item>
<item name="android:windowBackground">@android:color/transparent</item>
</style>
<style name="Dialog" parent="@android:style/Theme.Holo.Dialog"> <style name="Dialog" parent="@android:style/Theme.Holo.Dialog">
<item name="android:windowSoftInputMode">stateHidden|adjustResize</item> <item name="android:windowSoftInputMode">stateHidden|adjustResize</item>
<!-- 边框 --> <!-- 边框 -->
...@@ -110,4 +105,23 @@ ...@@ -110,4 +105,23 @@
<!-- 模糊 --> <!-- 模糊 -->
<item name="android:backgroundDimEnabled">false</item> <item name="android:backgroundDimEnabled">false</item>
</style> </style>
<style name="CustomDialog" parent="@android:style/Theme.Dialog">
<item name="android:windowSoftInputMode">stateHidden|adjustResize</item>
<item name="android:windowFrame">@null</item>
<!-- Dialog的windowFrame框为无 -->
<item name="android:windowIsFloating">true</item>
<!-- 是否漂现在activity上 -->
<item name="android:windowIsTranslucent">true</item>
<!-- 是否半透明 -->
<item name="android:windowNoTitle">true</item>
<item name="android:background">@null</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<!-- 去除黑色边框的关键设置项 -->
<item name="android:backgroundDimEnabled">true</item>
<!-- 屏幕背景是否变暗 -->
<item name="android:backgroundDimAmount">0.3</item>
</style>
</resources> </resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment