Skip to content

android / dayu

Go to a project
Commit 1389d2fa by 罗翻
Options

错误码统一处理

parent 493bfb94
Inline Side-by-side
Showing with 170 additions and 155 deletions
app/build.gradle
......@@ -21,7 +21,7 @@ android {
minSdkVersion 16
targetSdkVersion 23
versionCode 5
versionName "1.1.1"
versionName "1.1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
}
......
app/src/main/java/com/dayu/bigfish/Constants.java
......@@ -107,6 +107,8 @@ public class Constants {
public final static String ORDER_STATE = "order_state";
public final static String DUMP_INDEX = "dump_index";
public final static String SECOND_INDEX = "dump_second_index";
//环信message
public final static String HX_MESSAGE = "hx_message";
//订单状态
......
app/src/main/java/com/dayu/bigfish/api/APIException.java
......@@ -11,20 +11,22 @@ import java.net.ConnectException;
import retrofit2.HttpException;
import static com.dayu.bigfish.api.APIException.ERROR.SERVER_ERROR;
/**
* Created by luofan on 2017/11/15.
*/
public class APIException {
private static final int UNAUTHORIZED = 401;
private static final int FORBIDDEN = 403;
private static final int NOT_FOUND = 404;
private static final int REQUEST_TIMEOUT = 408;
private static final int INTERNAL_SERVER_ERROR = 500;
private static final int BAD_GATEWAY = 502;
private static final int SERVICE_UNAVAILABLE = 503;
private static final int GATEWAY_TIMEOUT = 504;
public static final int UNAUTHORIZED = 401;
public static final int FORBIDDEN = 403;
public static final int NOT_FOUND = 404;
public static final int REQUEST_TIMEOUT = 408;
public static final int INTERNAL_SERVER_ERROR = 500;
public static final int BAD_GATEWAY = 502;
public static final int SERVICE_UNAVAILABLE = 503;
public static final int GATEWAY_TIMEOUT = 504;
public static ResponeThrowable APIException(Throwable e) {
ResponeThrowable ex;
......@@ -34,14 +36,19 @@ public class APIException {
switch (httpException.code()) {
case FORBIDDEN:
ex.message = "token失效";
ex.code = 403;
//token失效，重新登录.
ex.code = FORBIDDEN;
break;
case UNAUTHORIZED:
case NOT_FOUND:
case REQUEST_TIMEOUT:
ex.message = "连接服务器超时";
ex.code = REQUEST_TIMEOUT;
break;
case GATEWAY_TIMEOUT:
case INTERNAL_SERVER_ERROR:
ex.message = "连接服务器失败";
ex.code = INTERNAL_SERVER_ERROR;
break;
case BAD_GATEWAY:
case SERVICE_UNAVAILABLE:
default:
......@@ -51,7 +58,7 @@ public class APIException {
return ex;
} else if (e instanceof ServerException) {
ServerException resultException = (ServerException) e;
ex = new ResponeThrowable(resultException, resultException.code);
ex = new ResponeThrowable(resultException, SERVER_ERROR);
ex.message = resultException.message;
return ex;
} else if (e instanceof JsonParseException
......@@ -89,6 +96,10 @@ public class APIException {
*/
class ERROR {
/**
* 接口返回错误
*/
public static final int SERVER_ERROR = 999;
/**
* 未知错误
*/
public static final int UNKNOWN = 1000;
......
app/src/main/java/com/dayu/bigfish/api/Api.java
......@@ -127,7 +127,7 @@ public class Api {
}
} else {
if (!e.isDisposed()) {
e.onError(new ServerException(response.getCode(), response.getMsg()));
e.onError(new ServerException(response.getSubCode(), response.getMsg()));
}
return;
}
......
app/src/main/java/com/dayu/bigfish/api/DownloadService.java
......@@ -6,15 +6,9 @@ import android.content.Context;
import android.content.Intent;
import android.support.v4.app.NotificationCompat;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.event.DownloadBean;
import com.dayu.bigfish.ui.listener.onDownloadListener;
import com.dayu.bigfish.utils.managers.DownloadManager;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import io.reactivex.disposables.CompositeDisposable;
/**
......@@ -49,7 +43,6 @@ public class DownloadService extends IntentService {
@Override
public void onCreate() {
super.onCreate();
EventBus.getDefault().register(this);
}
@Override
......@@ -57,15 +50,6 @@ public class DownloadService extends IntentService {
if (intent != null) {
String action = intent.getAction();
if (ACTION_DOWNLOAD.equals(action)) {
notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
builder = new NotificationCompat.Builder(this)
.setSmallIcon(R.mipmap.wechatimg)
.setContentTitle("开始下载")
.setAutoCancel(true)
.setContentText("版本更新");
notificationManager.notify(0, builder.build());
String url = intent.getStringExtra(DOWNLOAD_URL);
String apkPath = intent.getStringExtra(APK_PATH);
handleUpdate(url, apkPath);
......@@ -77,19 +61,9 @@ public class DownloadService extends IntentService {
DownloadManager.download(this, url, apkPath, cd, mListener);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onDownloadEvent(DownloadBean event) {
int progress = (int) Math.round(event.getBytesReaded() / (double) event.getTotal() * 100);
builder.setContentInfo(String.valueOf(progress) + "%").setProgress(100, progress, false);
notificationManager.notify(0, builder.build());
if (progress == 100)
notificationManager.cancel(0);
}
@Override
public void onDestroy() {
super.onDestroy();
EventBus.getDefault().unregister(this);
}
}
app/src/main/java/com/dayu/bigfish/api/ServerException.java
......@@ -2,24 +2,26 @@ package com.dayu.bigfish.api;
/**
* Created by luofan on 2017/11/15.
* 错误码统一处理类.
*/
public class ServerException extends Exception {
public int code;
public String code;
public String message;
public ServerException(int code, String message) {
public ServerException(String code, String message) {
this.code = code;
this.message = message;
processCode(code);
}
private void processCode(int code) {
private void processCode(String code) {
switch (code) {
case 1:
message = "获取数据失败";
case "ORDER0001":
message = "该订单不存在";
break;
default:
message = "获取数据失败";
break;
}
}
......
app/src/main/java/com/dayu/bigfish/base/BasePresenter.java
......@@ -126,7 +126,7 @@ public abstract class BasePresenter<V> {
APIException.ResponeThrowable exception = APIException.APIException(e);
int code = exception.code;
String message = exception.message;
if (code == 403) {
if (code == APIException.FORBIDDEN) {
showLoginDialog();
return;
}
......
app/src/main/java/com/dayu/bigfish/bean/event/OrderState.java
package com.dayu.bigfish.bean.event;
/**
* 修改预约时间
* 刷新待服务列表条目.
* on 2017/9/20.
*/
......
app/src/main/java/com/dayu/bigfish/bean/event/RefreshApoiment.java
package com.dayu.bigfish.bean.event;
/**
* 刷新各tab状态的数量
* 刷新待预约列表.
* on 2017/10/11.
*/
......
app/src/main/java/com/dayu/bigfish/bean/event/RefreshReceivingNum.java
......@@ -3,7 +3,7 @@ package com.dayu.bigfish.bean.event;
import java.io.Serializable;
/**
* 刷新待接单数量和刷新待预约列表.
* 刷新待接单数量.
* on 2017/10/11.
*/
......
app/src/main/java/com/dayu/bigfish/presenter/ordertab/OrderTabContract.java → app/src/main/java/com/dayu/bigfish/presenter/AppointmentOrder/AppointmentContract.java
package com.dayu.bigfish.presenter.ordertab;
package com.dayu.bigfish.presenter.AppointmentOrder;
import com.dayu.bigfish.base.BasePageBean;
......@@ -9,7 +9,7 @@ import com.dayu.bigfish.bean.Order;
/**
* Created by luo on 2016/8/4.
*/
public interface OrderTabContract {
public interface AppointmentContract {
interface View extends BaseView {
void getWatingOrderSuccess(BasePageBean<Order> data);
......
app/src/main/java/com/dayu/bigfish/presenter/ordertab/OrderTabPresenter.java → app/src/main/java/com/dayu/bigfish/presenter/AppointmentOrder/AppointmentPresenter.java
package com.dayu.bigfish.presenter.ordertab;
package com.dayu.bigfish.presenter.AppointmentOrder;
import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
......@@ -11,7 +11,7 @@ import io.reactivex.functions.Consumer;
* Created by luofan on 2017/11/8.
*/
@InstanceFactory
public class OrderTabPresenter extends OrderTabContract.Presenter {
public class AppointmentPresenter extends AppointmentContract.Presenter {
@Override
public void onAttached() {
......
app/src/main/java/com/dayu/bigfish/presenter/ordererrortab/OrderErrorTabContract.java → app/src/main/java/com/dayu/bigfish/presenter/errororder/ErrorOrderContract.java
package com.dayu.bigfish.presenter.ordererrortab;
package com.dayu.bigfish.presenter.errororder;
import com.dayu.bigfish.base.BasePresenter;
......@@ -10,7 +10,7 @@ import java.util.List;
/**
* Created by luo on 2016/8/4.
*/
public interface OrderErrorTabContract {
public interface ErrorOrderContract {
interface View extends BaseView {
void getErrorOrderSuccess(List<ErrorOrder> data);
......
app/src/main/java/com/dayu/bigfish/presenter/ordererrortab/OrderErrorTabPresenter.java → app/src/main/java/com/dayu/bigfish/presenter/errororder/ErrorOrderPresenter.java
package com.dayu.bigfish.presenter.ordererrortab;
package com.dayu.bigfish.presenter.errororder;
import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
......@@ -12,7 +12,7 @@ import io.reactivex.functions.Consumer;
* Created by luofan on 2017/11/8.
*/
@InstanceFactory
public class OrderErrorTabPresenter extends OrderErrorTabContract.Presenter {
public class ErrorOrderPresenter extends ErrorOrderContract.Presenter {
@Override
public void onAttached() {
......
app/src/main/java/com/dayu/bigfish/presenter/homethiirdtab/HomeThirdContract.java → app/src/main/java/com/dayu/bigfish/presenter/homemessage/HomeMessageContract.java
package com.dayu.bigfish.presenter.homethiirdtab;
package com.dayu.bigfish.presenter.homemessage;
import com.dayu.bigfish.base.BasePresenter;
......@@ -7,7 +7,7 @@ import com.dayu.bigfish.base.BaseView;
/**
* Created by luo on 2016/8/4.
*/
public interface HomeThirdContract {
public interface HomeMessageContract {
interface View extends BaseView {
}
......
app/src/main/java/com/dayu/bigfish/presenter/homethiirdtab/HomeThirdPresenter.java → app/src/main/java/com/dayu/bigfish/presenter/homemessage/HomeMessagePresenter.java
package com.dayu.bigfish.presenter.homethiirdtab;
package com.dayu.bigfish.presenter.homemessage;
import com.app.annotation.apt.InstanceFactory;
......@@ -7,7 +7,7 @@ import com.app.annotation.apt.InstanceFactory;
* Created by luofan on 2017/11/8.
*/
@InstanceFactory
public class HomeThirdPresenter extends HomeThirdContract.Presenter {
public class HomeMessagePresenter extends HomeMessageContract.Presenter {
......
app/src/main/java/com/dayu/bigfish/presenter/homesecondtab/HomeSecondContract.java → app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderContract.java
package com.dayu.bigfish.presenter.homesecondtab;
package com.dayu.bigfish.presenter.homeorder;
import com.dayu.bigfish.base.BasePresenter;
......@@ -8,7 +8,7 @@ import com.dayu.bigfish.bean.Tab;
/**
* Created by luo on 2016/8/4.
*/
public interface HomeSecondContract {
public interface HomeOrderContract {
interface View extends BaseView {
......
app/src/main/java/com/dayu/bigfish/presenter/homesecondtab/HomeSecondPresenter.java → app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderPresenter.java
package com.dayu.bigfish.presenter.homesecondtab;
package com.dayu.bigfish.presenter.homeorder;
import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
......@@ -10,7 +10,7 @@ import io.reactivex.functions.Consumer;
* Created by luofan on 2017/11/8.
*/
@InstanceFactory
public class HomeSecondPresenter extends HomeSecondContract.Presenter {
public class HomeOrderPresenter extends HomeOrderContract.Presenter {
@Override
public void onAttached() {
......
app/src/main/java/com/dayu/bigfish/presenter/systemmessage/SystemMessageContract.java → app/src/main/java/com/dayu/bigfish/presenter/message/messageContract.java
package com.dayu.bigfish.presenter.systemmessage;
package com.dayu.bigfish.presenter.message;
import com.dayu.bigfish.base.BasePageBean;
......@@ -9,7 +9,7 @@ import com.dayu.bigfish.bean.NewMessage;
/**
* Created by luo on 2016/8/4.
*/
public interface SystemMessageContract {
public interface messageContract {
interface View extends BaseView {
void getHxMessageSuccess(BasePageBean<NewMessage> message);
......
app/src/main/java/com/dayu/bigfish/presenter/systemmessage/SysMessagePresenter.java → app/src/main/java/com/dayu/bigfish/presenter/message/messagePresenter.java
package com.dayu.bigfish.presenter.systemmessage;
package com.dayu.bigfish.presenter.message;
import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
......@@ -16,7 +16,7 @@ import okhttp3.RequestBody;
* Created by luofan on 2017/11/8.
*/
@InstanceFactory
public class SysMessagePresenter extends SystemMessageContract.Presenter {
public class messagePresenter extends messageContract.Presenter {
@Override
public void onAttached() {
......
app/src/main/java/com/dayu/bigfish/presenter/ordertwotab/OrderTwoTabPresenter.java → app/src/main/java/com/dayu/bigfish/presenter/serverorder/ServerOrderPresenter.java
package com.dayu.bigfish.presenter.ordertwotab;
package com.dayu.bigfish.presenter.serverorder;
import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
......@@ -18,7 +18,7 @@ import okhttp3.RequestBody;
* Created by luofan on 2017/11/8.
*/
@InstanceFactory
public class OrderTwoTabPresenter extends OrderTwoTabContract.Presenter {
public class ServerOrderPresenter extends ServerorderContract.Presenter {
@Override
public void onAttached() {
......
app/src/main/java/com/dayu/bigfish/presenter/ordertwotab/OrderTwoTabContract.java → app/src/main/java/com/dayu/bigfish/presenter/serverorder/ServerorderContract.java
package com.dayu.bigfish.presenter.ordertwotab;
package com.dayu.bigfish.presenter.serverorder;
import com.dayu.bigfish.base.BasePageBean;
......@@ -11,7 +11,7 @@ import io.reactivex.Observable;
/**
* Created by luo on 2016/8/4.
*/
public interface OrderTwoTabContract {
public interface ServerorderContract {
interface View extends BaseView {
void getWatingOrderSuccess(BasePageBean<Order> data);
......
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
package com.dayu.bigfish.ui;
import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
......@@ -7,6 +9,7 @@ import android.os.Environment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.app.NotificationCompat;
import android.support.v4.content.FileProvider;
import android.view.View;
import android.widget.ImageView;
......@@ -20,6 +23,7 @@ import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.VersionInfo;
import com.dayu.bigfish.bean.event.DownloadBean;
import com.dayu.bigfish.bean.event.RefreshReceivingNum;
import com.dayu.bigfish.bean.event.SwtichFragment;
import com.dayu.bigfish.presenter.main.MainContract;
......@@ -70,6 +74,12 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
private int mSiteId;
private int REQUEST_CODE = 1;
private TextView[] mTabs;
private NotificationManager notificationManager;
private NotificationCompat.Builder builder;
private HomeFirstTabFragment firstFragment;
private HomeOrderFragment secondFragment;
private HomeMessageTabFragment thirdFragment;
private HomePersonFragment fourFragment;
@Override
public int getLayoutId() {
......@@ -78,10 +88,10 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
@Override
public void initView() {
HomeFirstTabFragment firstFragment = HomeFirstTabFragment.newInstance();
HomeOrderFragment secondFragment = HomeOrderFragment.newInstance();
HomeMessageTabFragment thirdFragment = HomeMessageTabFragment.newInstance();
HomePersonFragment fourFragment = HomePersonFragment.newInstance();
firstFragment = HomeFirstTabFragment.newInstance();
secondFragment = HomeOrderFragment.newInstance();
thirdFragment = HomeMessageTabFragment.newInstance();
fourFragment = HomePersonFragment.newInstance();
mFragments = new Fragment[]{firstFragment, secondFragment, thirdFragment, fourFragment};
mTabs = new TextView[]{mTabFirst, mTabSecond, mTabThird, mTabFour};
addFragment();
......@@ -93,7 +103,6 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
mPresenter.getReceiveOrder(Constants.WATING_ORDER, mAccountId, mSiteId, 1, 20);
mPresenter.getHxNum(GetUserInfo.getHxUserId(mActivity));
// int index = getIntent().getIntExtra(Constants.DUMP_INDEX, 1);
showHideFragment(mFragments[1], mFragments[mPosition]);
mPosition = 1;
mTabSecond.setSelected(true);
......@@ -103,21 +112,13 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
int index = intent.getIntExtra(Constants.DUMP_INDEX, -1);
if (index != -1) {
showHideFragment(mFragments[index], mFragments[mPosition]);
mPosition = index;
mTabSecond.setSelected(true);
thirdFragment.swtichFragment(index);
}
@Override
protected void onResume() {
super.onResume();
MobclickAgent.onResume(this);
MobclickAgent.onPageStart("main");
}
@Override
protected void onPause() {
super.onPause();
MobclickAgent.onPause(this);
MobclickAgent.onPageEnd("main");
}
@OnClick({R.id.tab_first, R.id.tab_second, R.id.tab_third, R.id.tab_four, R.id.tab_get_order})
......@@ -227,6 +228,14 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
File file = new File(sdDir, "dayu" + ".apk");
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
ToastUtils.showShortToast("正在下载中，请稍后...");
notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
builder = new NotificationCompat.Builder(this)
.setSmallIcon(R.mipmap.wechatimg)
.setContentTitle("开始下载")
.setAutoCancel(true)
.setContentText("版本更新");
notificationManager.notify(0, builder.build());
DownloadService.startUpdateService(mActivity, downloadPath, file.getAbsolutePath(), new onDownloadListener() {
@Override
public void onDownloadSuccess(File file) {
......@@ -276,6 +285,30 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
mTabSecond.setSelected(true);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onDownloadEvent(DownloadBean event) {
int progress = (int) Math.round(event.getBytesReaded() / (double) event.getTotal() * 100);
builder.setContentInfo(String.valueOf(progress) + "%").setProgress(100, progress, false);
notificationManager.notify(0, builder.build());
if (progress == 100)
notificationManager.cancel(0);
}
@Override
protected void onResume() {
super.onResume();
MobclickAgent.onResume(this);
MobclickAgent.onPageStart("main");
}
@Override
protected void onPause() {
super.onPause();
MobclickAgent.onPause(this);
MobclickAgent.onPageEnd("main");
}
@Override
protected void onDestroy() {
super.onDestroy();
......
app/src/main/java/com/dayu/bigfish/ui/ReceivingActivity.java
......@@ -70,6 +70,7 @@ public class ReceivingActivity extends BaseActivity<ReceivingPresenter> implemen
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView);
mRefreshLayout.setOnRefreshListener(this);
ProgressUtil.startLoad(mActivity);
mAdapter.setOnLoadMoreListener(this,mRecyclerView);
mAdapter.setEnableLoadMore(false);
mPresenter.getReceiveOrder(Constants.WATING_ORDER, userId, siteId, mPage, mPageSize);
mAdapter.setOnItemChildClickListener((adapter, view, position) -> {
......@@ -99,7 +100,7 @@ public class ReceivingActivity extends BaseActivity<ReceivingPresenter> implemen
} else {
mAdapter.addData(orders.getData());
}
if (mPage == mTotalPage) {
if (mPage >= mTotalPage) {
mAdapter.loadMoreEnd();
} else {
mAdapter.loadMoreComplete();
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderDoingAdapter.java
......@@ -14,7 +14,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.presenter.ordertwotab.OrderTwoTabPresenter;
import com.dayu.bigfish.presenter.serverorder.ServerOrderPresenter;
import com.dayu.bigfish.ui.ProcessOrderActivity;
import com.dayu.bigfish.ui.SopWebViewActivity;
import com.dayu.bigfish.ui.SubcribeTimeActivity;
......@@ -36,7 +36,7 @@ import static com.dayu.bigfish.utils.UtilsDate.SHORT_DATE_FORMAT;
*/
public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
private OrderTwoTabPresenter mPresenter;
private ServerOrderPresenter mPresenter;
private final Activity mActivity;
private Order mItem;
private BaseViewHolder mHolder;
......@@ -295,7 +295,7 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
}
public void initPresenter(OrderTwoTabPresenter presenter) {
public void initPresenter(ServerOrderPresenter presenter) {
mPresenter = presenter;
}
}
app/src/main/java/com/dayu/bigfish/ui/fragment/BigFishMessageFragment.java
......@@ -13,8 +13,8 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.presenter.systemmessage.SysMessagePresenter;
import com.dayu.bigfish.presenter.systemmessage.SystemMessageContract;
import com.dayu.bigfish.presenter.message.messageContract;
import com.dayu.bigfish.presenter.message.messagePresenter;
import com.dayu.bigfish.ui.SystemMesDetailActivity;
import com.dayu.bigfish.ui.adapter.SystemMessageAdapter;
import com.dayu.bigfish.utils.GetUserInfo;
......@@ -27,7 +27,7 @@ import butterknife.BindView;
* on 2017/10/11.
*/
public class BigFishMessageFragment extends BaseFragment<SysMessagePresenter> implements SystemMessageContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
public class BigFishMessageFragment extends BaseFragment<messagePresenter> implements messageContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
@BindView(R.id.rl_sysmessage)
RecyclerView mRecyclerView;
......@@ -51,6 +51,8 @@ public class BigFishMessageFragment extends BaseFragment<SysMessagePresenter> im
mRecyclerView.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView);
mRefreshLayout.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mRecyclerView);
mAdapter.setEnableLoadMore(false);
initListener();
return view;
}
......@@ -87,12 +89,11 @@ public class BigFishMessageFragment extends BaseFragment<SysMessagePresenter> im
if (mRefreshState == 1) {
mRefreshLayout.setRefreshing(false);
mAdapter.setNewData(message.getData());
mAdapter.loadMoreEnd();
mAdapter.setEnableLoadMore(true);
} else {
mAdapter.addData(message.getData());
}
if (mPage == mTotalPage) {
if (mPage >= mTotalPage) {
mAdapter.loadMoreEnd();
} else {
mAdapter.loadMoreComplete();
......@@ -119,7 +120,6 @@ public class BigFishMessageFragment extends BaseFragment<SysMessagePresenter> im
mPage = 1;
mAdapter.setEnableLoadMore(false);
mPresenter.getHxMessage(hxUserId, 2, mPage, mPageSize);
;
}
@Override
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeMessageTabFragment.java
......@@ -8,8 +8,8 @@ import android.view.View;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.presenter.homethiirdtab.HomeThirdContract;
import com.dayu.bigfish.presenter.homethiirdtab.HomeThirdPresenter;
import com.dayu.bigfish.presenter.homemessage.HomeMessageContract;
import com.dayu.bigfish.presenter.homemessage.HomeMessagePresenter;
import com.dayu.bigfish.ui.adapter.FragmentOrderAdapter;
import com.dayu.bigfish.utils.TabLayoutUtils;
......@@ -22,7 +22,7 @@ import butterknife.BindView;
* Created by luofan on 2017/11/20.
*/
public class HomeMessageTabFragment extends BaseFragment<HomeThirdPresenter> implements HomeThirdContract.View {
public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> implements HomeMessageContract.View {
@BindView(R.id.message_tablayout)
TabLayout messageTablayout;
@BindView(R.id.message_view_pager)
......@@ -67,4 +67,8 @@ public class HomeMessageTabFragment extends BaseFragment<HomeThirdPresenter> imp
TabLayoutUtils.setIndicator(messageTablayout, 60, 60, R.color.cl_receiving_order_item_data, getActivity());
}
public void swtichFragment(int position) {
messageViewPager.setCurrentItem(position);
messageTablayout.getTabAt(position).select();
}
}
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeOrderFragment.java
......@@ -15,8 +15,8 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.Tab;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.presenter.homesecondtab.HomeSecondContract;
import com.dayu.bigfish.presenter.homesecondtab.HomeSecondPresenter;
import com.dayu.bigfish.presenter.homeorder.HomeOrderContract;
import com.dayu.bigfish.presenter.homeorder.HomeOrderPresenter;
import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.bigfish.ui.adapter.FragmentHomeAdapter;
import com.dayu.bigfish.utils.GetUserInfo;
......@@ -39,7 +39,7 @@ import static com.dayu.bigfish.R.id.tabicon;
* Created by luofan on 2017/11/20.
*/
public class HomeOrderFragment extends BaseFragment<HomeSecondPresenter> implements HomeSecondContract.View {
public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implements HomeOrderContract.View {
@BindView(R.id.home_tabLayout)
TabLayout mTabLayout;
@BindView(R.id.view_pager)
......@@ -95,14 +95,6 @@ public class HomeOrderFragment extends BaseFragment<HomeSecondPresenter> impleme
public void init() {
userId = GetUserInfo.getACCOUNT_ID(mActivity);
EventBus.getDefault().register(this);
// mDisposable.add(RxBus.getDefault().toObservable(RefreshTab.class)
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new Consumer<RefreshTab>() {
// @Override
// public void accept(RefreshTab refreshTabNum) throws Exception {
// initNetWorkTabNum(userId, refreshTabNum.getTabNum());
// }
// }));
}
@Subscribe(threadMode = ThreadMode.MAIN)
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFirstTabFragment.java
......@@ -14,8 +14,8 @@ import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.event.RefreshApoiment;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.presenter.ordertab.OrderTabContract;
import com.dayu.bigfish.presenter.ordertab.OrderTabPresenter;
import com.dayu.bigfish.presenter.AppointmentOrder.AppointmentContract;
import com.dayu.bigfish.presenter.AppointmentOrder.AppointmentPresenter;
import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.ui.adapter.OrderDoingAdapter;
import com.dayu.bigfish.utils.GetUserInfo;
......@@ -32,7 +32,7 @@ import butterknife.BindView;
* 待预约的Fragment
*/
public class OrderFirstTabFragment extends BaseFragment<OrderTabPresenter> implements OrderTabContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> implements AppointmentContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
@BindView(R.id.order_one_refersh)
SwipeRefreshLayout mRefreshLayout;
@BindView(R.id.recyle_tab_one)
......@@ -75,17 +75,6 @@ public class OrderFirstTabFragment extends BaseFragment<OrderTabPresenter> imple
public void initListener() {
EventBus.getDefault().register(this);
// mDisposable.add(RxBus.getDefault().toObservable(RefreshApoiment.class)
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new Consumer<RefreshApoiment>() {
// @Override
// public void accept(RefreshApoiment refreshNum) throws Exception {
// mPage = 1;
// mAdapter.setEnableLoadMore(false);
// ProgressUtil.startLoad(mActivity);
// mPresenter.getWatingOrder(Constants.APPOIMENT_ORDER, userId, siteId, mPage, mPageSize);
// }
// }));
mAdapter.setOnItemClickListener((adapter, view, position) -> {
Order order = (Order) adapter.getItem(position);
Intent intent = new Intent(mActivity, OrderDetailsActivity.class);
......@@ -99,6 +88,7 @@ public class OrderFirstTabFragment extends BaseFragment<OrderTabPresenter> imple
startActivity(intent);
});
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void RefreshApoiment(RefreshApoiment event) {
mPage = 1;
......@@ -106,6 +96,7 @@ public class OrderFirstTabFragment extends BaseFragment<OrderTabPresenter> imple
ProgressUtil.startLoad(mActivity);
mPresenter.getWatingOrder(Constants.APPOIMENT_ORDER, userId, siteId, mPage, mPageSize);
}
@Override
public void getWatingOrderSuccess(BasePageBean<Order> data) {
EventBus.getDefault().post(new RefreshTab(-1));
......@@ -118,7 +109,7 @@ public class OrderFirstTabFragment extends BaseFragment<OrderTabPresenter> imple
} else {
mAdapter.addData(data.getData());
}
if (mPage == mTotalPage) {
if (mPage >= mTotalPage) {
mAdapter.loadMoreEnd();
} else {
mAdapter.loadMoreComplete();
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFourTabFragment.java
......@@ -13,8 +13,8 @@ import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.presenter.ordertab.OrderTabContract;
import com.dayu.bigfish.presenter.ordertab.OrderTabPresenter;
import com.dayu.bigfish.presenter.AppointmentOrder.AppointmentContract;
import com.dayu.bigfish.presenter.AppointmentOrder.AppointmentPresenter;
import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.ui.adapter.OrderFourTabAdapter;
import com.dayu.bigfish.utils.GetUserInfo;
......@@ -30,7 +30,7 @@ import butterknife.BindView;
* on 2017/8/31.
*/
public class OrderFourTabFragment extends BaseFragment<OrderTabPresenter> implements OrderTabContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter> implements AppointmentContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
@BindView(R.id.order_one_refersh)
SwipeRefreshLayout mRefreshLayout;
@BindView(R.id.recyle_tab_one)
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderSecondTabFragment.java
......@@ -16,8 +16,8 @@ import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.bean.event.RefreshServe;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.bean.event.RxBus;
import com.dayu.bigfish.presenter.ordertwotab.OrderTwoTabContract;
import com.dayu.bigfish.presenter.ordertwotab.OrderTwoTabPresenter;
import com.dayu.bigfish.presenter.serverorder.ServerOrderPresenter;
import com.dayu.bigfish.presenter.serverorder.ServerorderContract;
import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.ui.adapter.OrderDoingAdapter;
import com.dayu.bigfish.utils.GetUserInfo;
......@@ -44,7 +44,7 @@ import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_YUYUE;
* on 2017/8/31.
*/
public class OrderSecondTabFragment extends BaseFragment<OrderTwoTabPresenter> implements OrderTwoTabContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> implements ServerorderContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
@BindView(R.id.order_one_refersh)
SwipeRefreshLayout mRefreshLayout;
@BindView(R.id.recyle_tab_one)
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderThreeTabFragment.java
......@@ -11,8 +11,8 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.ErrorOrder;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.presenter.ordererrortab.OrderErrorTabContract;
import com.dayu.bigfish.presenter.ordererrortab.OrderErrorTabPresenter;
import com.dayu.bigfish.presenter.errororder.ErrorOrderContract;
import com.dayu.bigfish.presenter.errororder.ErrorOrderPresenter;
import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.ui.adapter.OrderThreeTabAdapter;
import com.dayu.bigfish.utils.GetUserInfo;
......@@ -30,7 +30,7 @@ import butterknife.BindView;
* on 2017/8/31.
*/
public class OrderThreeTabFragment extends BaseFragment<OrderErrorTabPresenter> implements OrderErrorTabContract.View, SwipeRefreshLayout.OnRefreshListener {
public class OrderThreeTabFragment extends BaseFragment<ErrorOrderPresenter> implements ErrorOrderContract.View, SwipeRefreshLayout.OnRefreshListener {
@BindView(R.id.order_one_refersh)
SwipeRefreshLayout mRefreshLayout;
@BindView(R.id.recyle_tab_one)
......
app/src/main/java/com/dayu/bigfish/ui/fragment/SystemMessageFragment.java
......@@ -13,8 +13,8 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.presenter.systemmessage.SysMessagePresenter;
import com.dayu.bigfish.presenter.systemmessage.SystemMessageContract;
import com.dayu.bigfish.presenter.message.messageContract;
import com.dayu.bigfish.presenter.message.messagePresenter;
import com.dayu.bigfish.ui.SystemMesDetailActivity;
import com.dayu.bigfish.ui.adapter.SystemMessageAdapter;
import com.dayu.bigfish.utils.GetUserInfo;
......@@ -28,7 +28,7 @@ import butterknife.BindView;
* on 2017/10/11.
*/
public class SystemMessageFragment extends BaseFragment<SysMessagePresenter> implements SystemMessageContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
public class SystemMessageFragment extends BaseFragment<messagePresenter> implements messageContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
@BindView(R.id.rl_sysmessage)
RecyclerView mRecyclerView;
@BindView(R.id.receiving_refersh)
......@@ -51,6 +51,8 @@ public class SystemMessageFragment extends BaseFragment<SysMessagePresenter> imp
mRecyclerView.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView);
mRefreshLayout.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this,mRecyclerView);
mAdapter.setEnableLoadMore(false);
initListener();
return view;
}
......@@ -87,12 +89,11 @@ public class SystemMessageFragment extends BaseFragment<SysMessagePresenter> imp
if (mRefreshState == 1) {
mRefreshLayout.setRefreshing(false);
mAdapter.setNewData(message.getData());
mAdapter.loadMoreEnd();
mAdapter.setEnableLoadMore(true);
} else {
mAdapter.addData(message.getData());
}
if (mPage == mTotalPage) {
if (mPage >= mTotalPage) {
mAdapter.loadMoreEnd();
} else {
mAdapter.loadMoreComplete();
......@@ -119,7 +120,6 @@ public class SystemMessageFragment extends BaseFragment<SysMessagePresenter> imp
mPage = 1;
mAdapter.setEnableLoadMore(false);
mPresenter.getHxMessage(hxUserId, 1, mPage, mPageSize);
;
}
@Override
......
app/src/main/java/com/dayu/bigfish/utils/managers/HxManager.java
......@@ -21,6 +21,8 @@ import com.hyphenate.chat.EMOptions;
import java.util.Iterator;
import java.util.List;
import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;
/**
* Created by luofan on 2017/12/1.
*/
......@@ -66,21 +68,24 @@ public class HxManager {
@Override
public void onMessageReceived(List<EMMessage> messages) {
//收到消息
for (EMMessage list : messages) {
//打开消息列表界面
Intent intent = new Intent(mContext, MainActivity.class);
intent.putExtra(Constants.DUMP_INDEX, 3);
PendingIntent pi = PendingIntent.getActivity(mContext,
0, intent, 0);
String str = list.getBody().toString();
for (EMMessage message : messages) {
String str = message.getBody().toString();
Gson gson = new Gson();
InformBean info = gson.fromJson(list.ext().toString(), InformBean.class);
InformBean info = gson.fromJson(message.ext().toString(), InformBean.class);
String title = "";
int secondIndex = 0;
if (info.getCategory() == 1) {
title = "系统通知";
secondIndex = 0;
} else if (info.getCategory() == 2) {
title = "大于通知";
title = "大鱼通知";
secondIndex = 1;
}
Intent intent = new Intent(mContext, MainActivity.class);
intent.putExtra(Constants.DUMP_INDEX, 2);
intent.putExtra(Constants.SECOND_INDEX, secondIndex);
PendingIntent pi = PendingIntent.getActivity(mContext,
1, intent, FLAG_CANCEL_CURRENT);
NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext);
// 设置打开通知，该通知取消
......@@ -103,7 +108,7 @@ public class HxManager {
.setContentIntent(pi)
.build();
// notificationManager.notify(0, builder.build());
notificationManager.notify(0, builder.build());
}
}
......
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