Skip to content

android / dayu

Go to a project
Commit 273f74dc by 罗翻
Options

增加消息跳转

parent 1389d2fa
Inline Side-by-side
Showing with 308 additions and 338 deletions
app/src/main/java/com/dayu/bigfish/Constants.java
...@@ -84,6 +84,7 @@ public class Constants { ...@@ -84,6 +84,7 @@ public class Constants {
/***********************其他配置**********************************/ /***********************其他配置**********************************/
public final static int PAGESIZE = 30;
//相册选择照片删除时传递的key //相册选择照片删除时传递的key
public final static String BUNDLE_KEY_ID = "BUNDLE_KEY_ID"; public final static String BUNDLE_KEY_ID = "BUNDLE_KEY_ID";
//通用的工程师id //通用的工程师id
...@@ -108,6 +109,8 @@ public class Constants { ...@@ -108,6 +109,8 @@ public class Constants {
public final static String DUMP_INDEX = "dump_index"; public final static String DUMP_INDEX = "dump_index";
public final static String MESSAGE_INFO = "message_info";
public final static String SECOND_INDEX = "dump_second_index"; public final static String SECOND_INDEX = "dump_second_index";
//环信message //环信message
public final static String HX_MESSAGE = "hx_message"; public final static String HX_MESSAGE = "hx_message";
......
app/src/main/java/com/dayu/bigfish/api/Api.java
...@@ -56,17 +56,6 @@ public class Api { ...@@ -56,17 +56,6 @@ public class Api {
.addInterceptor(tokenInterceptord) .addInterceptor(tokenInterceptord)
.connectTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS) .connectTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS)
.build(); .build();
//网络缓存路径文件
// File httpCacheDirectory = new File(BaseApplication.getInstance().getExternalCacheDir(), "responses");
// OkHttpClient client = new OkHttpClient.Builder()
// //设置缓存
// // .cache(new Cache(httpCacheDirectory, 10 * 1024 * 1024))
// (okHttpClient)
// //网络请求缓存，未实现
// // .addInterceptor(cacheInterceptor)
// .build();
retrofit = new Retrofit.Builder() retrofit = new Retrofit.Builder()
.client(okHttpClient) .client(okHttpClient)
.baseUrl(Constants.BASE_URL) .baseUrl(Constants.BASE_URL)
......
app/src/main/java/com/dayu/bigfish/api/ApiWrapper.java deleted 100755 → 0
package com.dayu.bigfish.api;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.AccountBalance;
import com.dayu.bigfish.bean.AlipayInfo;
import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.ErrorOrder;
import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.bean.OrderRecord;
import com.dayu.bigfish.bean.Tab;
import com.dayu.bigfish.bean.TodayAchievement;
import com.dayu.bigfish.bean.TodayBalance;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.bean.VersionInfo;
import java.util.List;
import io.reactivex.Observable;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
/**
* Created by luofan on 2017/11/09.
*/
public class ApiWrapper extends Api {
//登录
public Observable<UserInfo> login(String phone, String smsCode) {
return getService().login(phone, smsCode)
.compose(applySchedulers());
}
//发送验证码
public Observable<Boolean> sendCode(String phone, int type) {
return getService().sendCode(phone, type)
.compose(applySchedulers());
}
//提交版本信息
public Observable<Boolean> commitVersionInfo(RequestBody object) {
return getService().commitVersionInfo(object)
.compose(applySchedulers());
}
//下载apk
// public Observable<ResponseBody> download(String url) {
// return getService().download(url)
// .subscribeOn(Schedulers.io());
// }
//检查新版本
public Observable<String> CheckVersion() {
return getService().checkVersion("dayushifua_dayu")
.compose(applySchedulers());
}
//获取新版本信息
public Observable<VersionInfo> getVersionInfo(String appId, String versionCode) {
return getService().getVersionInfo(appId, versionCode)
.compose(applySchedulers());
}
//获取异常订单列表
public Observable<List<ErrorOrder>> getErrorOrders(int siteId, int userId) {
return getService().getErrorOrders(siteId, userId)
.compose(applySchedulers());
}
//工程师接单
public Observable<Boolean> receiveOrder(int orderId, int engineerId) {
return getService().receiveOrder(orderId, engineerId)
.compose(applySchedulers());
}
//预约上门时间
public Observable<Boolean> subcriceTime(int orderId, String doorTime, String doorComment) {
return getService().subcriceTime(orderId, doorTime, doorComment)
.compose(applySchedulers());
}
//我已出发
public Observable<Integer> startOrder(RequestBody body) {
return getService().startOrder(body)
.compose(applySchedulers());
}
//开始服务
public Observable<Integer> startServer(RequestBody body) {
return getService().startServer(body)
.compose(applySchedulers());
}
//获取工单详情信息
public Observable<OrderDetail> getOrderInfo(int orderId) {
return getService().getOrderInfo(orderId)
.compose(applySchedulers());
}
//提交工单
public Observable<Integer> commitOrder(RequestBody orderInfo) {
return getService().commitOrder(orderInfo)
.compose(applySchedulers());
}
//获取工程师信息
public Observable<EngineerInfo> getEngineerInfo(int accountId) {
return getService().getEngineerInfo(accountId)
.compose(applySchedulers());
}
//获取今日收益
public Observable<BasePageBean<AccountBalance>> getAccountBalanceList(int page, int pageSzie, int accountId) {
return getService().getAccountBalanceList(page, pageSzie, accountId)
.compose(applySchedulers());
}
//获取账户列表
public Observable<TodayBalance> getTodayBalance(int accountId) {
return getService().getTodayBalance(accountId)
.compose(applySchedulers());
}
//绑定支付宝账号
public Observable<Boolean> boundAlipay(RequestBody body) {
return getService().boundAlipay(body)
.compose(applySchedulers());
}
//获取支付宝信息
public Observable<AlipayInfo> queryAlipay(int accountId) {
return getService().queryAlipay(accountId)
.compose(applySchedulers());
}
//修改支付宝账号
public Observable<Boolean> modifyAlipay(RequestBody body) {
return getService().modifyAlipay(body)
.compose(applySchedulers());
}
//单表查询工单记录
public Observable<OrderDetail> queryOrderInfo(int accountId) {
return getService().queryOrderInfo(accountId)
.compose(applySchedulers());
}
//获取今日业绩
public Observable<TodayAchievement> getAchievement(int siteId, int engineerId) {
return getService().getAchievement(siteId, engineerId)
.compose(applySchedulers());
}
//获取工单记录
public Observable<OrderRecord> getOrderRecord(int siteId, int engineerId) {
return getService().getOrderScore(siteId, engineerId)
.compose(applySchedulers());
}
//意见反馈
public Observable<Boolean> postFeedBack(RequestBody body) {
return getService().postFeedBack(body)
.compose(applySchedulers());
}
//获取工单记录
public Observable<BasePageBean<Order>> getOrderRecord(int state, int engineerId, int siteId, int page
, int pageSize) {
return getService().getOrders(state, engineerId, siteId, page, pageSize)
.compose(applySchedulers());
}
//获取tab数量
public Observable<Tab> getTabNum(int userId) {
return getService().getTabNum(userId)
.compose(applySchedulers());
}
//获取环信消息
public Observable<BasePageBean<NewMessage>> getHxMessage(String hxUserId, int category, int page, int pageSize) {
return getService().getHxMessage(hxUserId, category, page, pageSize)
.compose(applySchedulers());
}
//上传图片
public Observable<List<String>> uploadPhoto(MultipartBody.Part[] file) {
return getService().uploadPhoto(file)
.compose(applySchedulers());
}
}
app/src/main/java/com/dayu/bigfish/base/BasePresenter.java
...@@ -106,8 +106,8 @@ public abstract class BasePresenter<V> { ...@@ -106,8 +106,8 @@ public abstract class BasePresenter<V> {
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
Log.d("reguest+error", e.toString()); Log.d("reguest+error", e.toString());
ProgressUtil.stopLoad();
processException(e); processException(e);
ProgressUtil.stopLoad();
try { try {
tconsumer.accept(e); tconsumer.accept(e);
} catch (Exception e1) { } catch (Exception e1) {
...@@ -127,7 +127,9 @@ public abstract class BasePresenter<V> { ...@@ -127,7 +127,9 @@ public abstract class BasePresenter<V> {
int code = exception.code; int code = exception.code;
String message = exception.message; String message = exception.message;
if (code == APIException.FORBIDDEN) { if (code == APIException.FORBIDDEN) {
if (mDialog == null || (mDialog != null && !mDialog.isShowing())) {
showLoginDialog(); showLoginDialog();
}
return; return;
} }
if (mView instanceof BaseActivity) { if (mView instanceof BaseActivity) {
...@@ -159,7 +161,8 @@ public abstract class BasePresenter<V> { ...@@ -159,7 +161,8 @@ public abstract class BasePresenter<V> {
}); });
mDialog.setTitle(getString(R.string.notice)) mDialog.setTitle(getString(R.string.notice))
.setNegativeButton(getString(R.string.cancle)) .setNegativeButton(getString(R.string.cancle))
.setPositiveButton(getString(R.string.login_again)); .setPositiveButton(getString(R.string.login_again))
.setOneButton(true);
mDialog.show(); mDialog.show();
} }
} }
app/src/main/java/com/dayu/bigfish/bean/InformBean.java
...@@ -62,7 +62,7 @@ public class InformBean implements Serializable { ...@@ -62,7 +62,7 @@ public class InformBean implements Serializable {
this.action = action; this.action = action;
} }
public static class CustomJsonBean { public static class CustomJsonBean implements Serializable {
/** /**
* orderId : 6 * orderId : 6
*/ */
......
app/src/main/java/com/dayu/bigfish/ui/AccountBalanceActivity.java
package com.dayu.bigfish.ui; package com.dayu.bigfish.ui;
import android.content.Intent; import android.content.Intent;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
...@@ -27,17 +30,21 @@ import butterknife.OnClick; ...@@ -27,17 +30,21 @@ import butterknife.OnClick;
* Created by luofan on 2017/11/1. * Created by luofan on 2017/11/1.
*/ */
public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter> implements AccountBalanceContract.View { public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter> implements AccountBalanceContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
@BindView(R.id.tv_account_balance) @BindView(R.id.tv_account_balance)
TextView mAccountBalanceTv; TextView mAccountBalanceTv;
@BindView(R.id.recycler_balance) @BindView(R.id.recycler_balance)
RecyclerView mRecyclerView; RecyclerView mRecyclerView;
private String mToken; @BindView(R.id.line_one)
ImageView mLine;
@BindView(R.id.swipe_refersh)
SwipeRefreshLayout mRefreshLayout;
private int mUserId; private int mUserId;
private AccountBalanceAdapter mAdapter; private AccountBalanceAdapter mAdapter;
private int mPage = 1; private int mPage = 1;
private int mPageSize = 10; private int mPageSize = Constants.PAGESIZE;
private int mTotalPage = 1; private int mTotalPage = 1;
private int mRefreshState = 1; //1:刷新，2:下拉加载
@Override @Override
public int getLayoutId() { public int getLayoutId() {
...@@ -52,7 +59,6 @@ public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter ...@@ -52,7 +59,6 @@ public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter
} }
private void initData() { private void initData() {
mToken = GetUserInfo.getToken(this);
mUserId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext()); mUserId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
int balance = getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0); int balance = getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0);
mAccountBalanceTv.setText("￥" + balance); mAccountBalanceTv.setText("￥" + balance);
...@@ -60,12 +66,9 @@ public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter ...@@ -60,12 +66,9 @@ public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter
mRecyclerView.setLayoutManager(new LinearLayoutManager(this)); mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
mRecyclerView.setAdapter(mAdapter); mRecyclerView.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView); mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView);
mAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { mRefreshLayout.setOnRefreshListener(this);
@Override mAdapter.setOnLoadMoreListener(this, mRecyclerView);
public void onLoadMoreRequested() { mAdapter.setEnableLoadMore(false);
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
}
}, mRecyclerView);
} }
@OnClick({R.id.receiving_back, R.id.title_right}) @OnClick({R.id.receiving_back, R.id.title_right})
...@@ -86,29 +89,51 @@ public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter ...@@ -86,29 +89,51 @@ public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter
@Override @Override
public void getBalanceSuccess(BasePageBean<AccountBalance> balance) { public void getBalanceSuccess(BasePageBean<AccountBalance> balance) {
ProgressUtil.stopLoad();
if (balance.getData() != null) {
mTotalPage = balance.getTotalPages(); mTotalPage = balance.getTotalPages();
mPageSize = balance.getPageSize(); mPageSize = balance.getPageSize();
if (mRefreshState == 1) {
mRefreshLayout.setRefreshing(false);
mAdapter.setNewData(balance.getData());
mAdapter.loadMoreEnd();
mAdapter.setEnableLoadMore(true);
} else {
mAdapter.addData(balance.getData()); mAdapter.addData(balance.getData());
if (mPage == mTotalPage) { }
if (mPage >= mTotalPage) {
mAdapter.loadMoreEnd(); mAdapter.loadMoreEnd();
} else { } else {
mAdapter.loadMoreComplete(); mAdapter.loadMoreComplete();
mPage += 1; mPage += 1;
} }
mAdapter.notifyDataSetChanged(); mPage += 1;
} else { if (balance.getData().size() == 0) {
ProgressUtil.stopLoad(); LayoutInflater inflater = LayoutInflater.from(mActivity);
mAdapter.setEmptyView(R.layout.tips_loading_failed); View view = inflater.inflate(R.layout.tips_empty, null);
TextView tip = (TextView) view.findViewById(R.id.tv_empty);
tip.setText("暂无记录");
mAdapter.setEmptyView(view);
} }
} }
@Override @Override
public void getBalanceError() { public void getBalanceError() {
ProgressUtil.stopLoad();
mAdapter.setEmptyView(R.layout.tips_loading_failed); mAdapter.setEmptyView(R.layout.tips_loading_failed);
mAdapter.loadMoreFail(); mAdapter.loadMoreFail();
ToastUtils.showShortToast(getString(R.string.get_account_list_error)); ToastUtils.showShortToast(getString(R.string.get_account_list_error));
mLine.setVisibility(View.VISIBLE);
}
@Override
public void onRefresh() {
mRefreshState = 1;
mPage = 1;
mAdapter.setEnableLoadMore(false);
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
}
@Override
public void onLoadMoreRequested() {
mRefreshState = 2;
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
} }
} }
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
...@@ -21,6 +21,7 @@ import com.dayu.bigfish.R; ...@@ -21,6 +21,7 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.api.DownloadService; import com.dayu.bigfish.api.DownloadService;
import com.dayu.bigfish.base.BaseActivity; import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.base.BasePageBean; import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.InformBean;
import com.dayu.bigfish.bean.Order; import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.VersionInfo; import com.dayu.bigfish.bean.VersionInfo;
import com.dayu.bigfish.bean.event.DownloadBean; import com.dayu.bigfish.bean.event.DownloadBean;
...@@ -72,7 +73,6 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon ...@@ -72,7 +73,6 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
private Fragment[] mFragments; private Fragment[] mFragments;
private int mAccountId; private int mAccountId;
private int mSiteId; private int mSiteId;
private int REQUEST_CODE = 1;
private TextView[] mTabs; private TextView[] mTabs;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private NotificationCompat.Builder builder; private NotificationCompat.Builder builder;
...@@ -102,22 +102,37 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon ...@@ -102,22 +102,37 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
mPresenter.getNewVersion(AppUtils.getPackageNum(mActivity)); mPresenter.getNewVersion(AppUtils.getPackageNum(mActivity));
mPresenter.getReceiveOrder(Constants.WATING_ORDER, mAccountId, mSiteId, 1, 20); mPresenter.getReceiveOrder(Constants.WATING_ORDER, mAccountId, mSiteId, 1, 20);
mPresenter.getHxNum(GetUserInfo.getHxUserId(mActivity)); mPresenter.getHxNum(GetUserInfo.getHxUserId(mActivity));
resetSelected(1);
showHideFragment(mFragments[1], mFragments[mPosition]); showHideFragment(mFragments[1], mFragments[mPosition]);
mPosition = 1; doAction(getIntent());
mTabSecond.setSelected(true);
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
} }
@Override @Override
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
super.onNewIntent(intent); super.onNewIntent(intent);
int index = intent.getIntExtra(Constants.DUMP_INDEX, -1); doAction(intent);
if (index != -1) { }
showHideFragment(mFragments[index], mFragments[mPosition]);
mPosition = index; private void doAction(Intent intent) {
mTabSecond.setSelected(true); InformBean info = (InformBean) intent.getSerializableExtra(Constants.MESSAGE_INFO);
thirdFragment.swtichFragment(index); if (info != null) {
if (info.getCategory() == 1 && (info.getFunctionType() == 2)) {
dumpReceActivity();
} else {
int secondIndex = 0;
if (info.getCategory() == 1) {
secondIndex = 0;
} else if (info.getCategory() == 2) {
secondIndex = 1;
}
resetSelected(2);
showHideFragment(mFragments[2], mFragments[mPosition]);
mMessageRedIcon.setVisibility(View.GONE);
thirdFragment.setIndex(secondIndex);
thirdFragment.swtichFragment(secondIndex);
mPosition = 2;
}
} }
} }
...@@ -146,20 +161,25 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon ...@@ -146,20 +161,25 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
mPosition = 3; mPosition = 3;
break; break;
case R.id.tab_get_order: case R.id.tab_get_order:
Intent intent = new Intent(mActivity, ReceivingActivity.class); dumpReceActivity();
startActivityForResult(intent, REQUEST_CODE);
overridePendingTransition(R.anim.slide_bottom_in, 0);
break; break;
default: default:
break; break;
} }
} }
private void dumpReceActivity() {
Intent intent = new Intent(mActivity, ReceivingActivity.class);
startActivity(intent);
overridePendingTransition(R.anim.slide_bottom_in, 0);
}
public void resetSelected(int position) { public void resetSelected(int position) {
for (int i = 0; i < mTabs.length; i++) { for (int i = 0; i < mTabs.length; i++) {
mTabs[i].setSelected(false); mTabs[i].setSelected(false);
} }
mTabs[position].setSelected(false); mTabs[position].setSelected(true);
} }
private void addFragment() { private void addFragment() {
...@@ -211,7 +231,12 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon ...@@ -211,7 +231,12 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
@Override @Override
public void isShowRedIcon(boolean flag) { public void isShowRedIcon(boolean flag) {
if (mPosition != 2) {
mMessageRedIcon.setVisibility(View.VISIBLE); mMessageRedIcon.setVisibility(View.VISIBLE);
} else {
mMessageRedIcon.setVisibility(View.GONE);
}
} }
/** /**
...@@ -228,13 +253,7 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon ...@@ -228,13 +253,7 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
File file = new File(sdDir, "dayu" + ".apk"); File file = new File(sdDir, "dayu" + ".apk");
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
ToastUtils.showShortToast("正在下载中，请稍后..."); ToastUtils.showShortToast("正在下载中，请稍后...");
notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); initNotification();
builder = new NotificationCompat.Builder(this)
.setSmallIcon(R.mipmap.wechatimg)
.setContentTitle("开始下载")
.setAutoCancel(true)
.setContentText("版本更新");
notificationManager.notify(0, builder.build()); notificationManager.notify(0, builder.build());
DownloadService.startUpdateService(mActivity, downloadPath, file.getAbsolutePath(), new onDownloadListener() { DownloadService.startUpdateService(mActivity, downloadPath, file.getAbsolutePath(), new onDownloadListener() {
@Override @Override
...@@ -273,6 +292,16 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon ...@@ -273,6 +292,16 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
dialog.show(); dialog.show();
} }
private void initNotification() {
notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
builder = new NotificationCompat.Builder(this)
.setSmallIcon(R.mipmap.wechatimg)
.setContentTitle("开始下载")
.setAutoCancel(true)
.setContentText("版本更新");
}
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void recevieNum(RefreshReceivingNum event) { public void recevieNum(RefreshReceivingNum event) {
mGetOrderTv.setText(event.getTabNum() + ""); mGetOrderTv.setText(event.getTabNum() + "");
...@@ -290,7 +319,6 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon ...@@ -290,7 +319,6 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
int progress = (int) Math.round(event.getBytesReaded() / (double) event.getTotal() * 100); int progress = (int) Math.round(event.getBytesReaded() / (double) event.getTotal() * 100);
builder.setContentInfo(String.valueOf(progress) + "%").setProgress(100, progress, false); builder.setContentInfo(String.valueOf(progress) + "%").setProgress(100, progress, false);
notificationManager.notify(0, builder.build()); notificationManager.notify(0, builder.build());
if (progress == 100) if (progress == 100)
notificationManager.cancel(0); notificationManager.cancel(0);
} }
......
app/src/main/java/com/dayu/bigfish/ui/OrderRecordActivity.java
package com.dayu.bigfish.ui; package com.dayu.bigfish.ui;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText; import android.widget.EditText;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
...@@ -52,7 +55,7 @@ public class OrderRecordActivity extends BaseActivity<WorksRecordPresenter> impl ...@@ -52,7 +55,7 @@ public class OrderRecordActivity extends BaseActivity<WorksRecordPresenter> impl
private int userId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext()); private int userId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
private OrderDoingAdapter mAdapter; private OrderDoingAdapter mAdapter;
private int mPage = 1; private int mPage = 1;
private int mPageSize = 20; private int mPageSize = Constants.PAGESIZE;
private int mTotalPage = 1; private int mTotalPage = 1;
private int mRefreshState = 1; private int mRefreshState = 1;
...@@ -100,18 +103,18 @@ public class OrderRecordActivity extends BaseActivity<WorksRecordPresenter> impl ...@@ -100,18 +103,18 @@ public class OrderRecordActivity extends BaseActivity<WorksRecordPresenter> impl
private void doSearch(Editable s) { private void doSearch(Editable s) {
mAdapter.setEnableLoadMore(false);
String str = s.toString(); String str = s.toString();
if (mList == null) { if (mList == null) {
return; return;
} }
ArrayList<Order> list = new ArrayList<>(); ArrayList<Order> list = new ArrayList<>();
for (Order data : mList) { for (Order data : mList) {
if (data.getCustomerMobile().contains(str)) { if (TextUtils.isEmpty(str) || (data.getCustomerMobile().contains(str) && data.getAnyContacts() == 1)) {
list.add(data); list.add(data);
} }
} }
mAdapter.setNewData(list); mAdapter.setNewData(list);
mAdapter.loadMoreEnd();
} }
...@@ -126,10 +129,21 @@ public class OrderRecordActivity extends BaseActivity<WorksRecordPresenter> impl ...@@ -126,10 +129,21 @@ public class OrderRecordActivity extends BaseActivity<WorksRecordPresenter> impl
mSeacher.setVisibility(View.VISIBLE); mSeacher.setVisibility(View.VISIBLE);
break; break;
case R.id.quit: case R.id.quit:
hideSearch();
break;
}
}
public void hideSearch() {
try {
etSeacher.setText("");
mSeacher.setVisibility(View.GONE); mSeacher.setVisibility(View.GONE);
timeTitle.setVisibility(View.VISIBLE); timeTitle.setVisibility(View.VISIBLE);
mAdapter.notifyDataSetChanged(); mAdapter.notifyDataSetChanged();
break; InputMethodManager imm = (InputMethodManager) mActivity
.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(mActivity.getCurrentFocus().getWindowToken(), 0);
} catch (NullPointerException e) {
} }
} }
...@@ -169,6 +183,7 @@ public class OrderRecordActivity extends BaseActivity<WorksRecordPresenter> impl ...@@ -169,6 +183,7 @@ public class OrderRecordActivity extends BaseActivity<WorksRecordPresenter> impl
mAdapter.loadMoreFail(); mAdapter.loadMoreFail();
mAdapter.setEnableLoadMore(true); mAdapter.setEnableLoadMore(true);
mAdapter.setEmptyView(R.layout.tips_loading_failed); mAdapter.setEmptyView(R.layout.tips_loading_failed);
mRefreshLayout.setRefreshing(false);
mAdapter.getEmptyView().setOnClickListener(v -> { mAdapter.getEmptyView().setOnClickListener(v -> {
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
mPresenter.getWorksRecord(Constants.FINISH_ORDER, userId, siteId, mPage, mPageSize); mPresenter.getWorksRecord(Constants.FINISH_ORDER, userId, siteId, mPage, mPageSize);
...@@ -187,6 +202,7 @@ public class OrderRecordActivity extends BaseActivity<WorksRecordPresenter> impl ...@@ -187,6 +202,7 @@ public class OrderRecordActivity extends BaseActivity<WorksRecordPresenter> impl
} }
public void refresh() { public void refresh() {
hideSearch();
mRefreshState = 1; mRefreshState = 1;
mPage = 1; mPage = 1;
mAdapter.setEnableLoadMore(false); mAdapter.setEnableLoadMore(false);
......
app/src/main/java/com/dayu/bigfish/ui/PreviewActivty.java
...@@ -20,7 +20,7 @@ import butterknife.ButterKnife; ...@@ -20,7 +20,7 @@ import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
/** /**
* 删除选中图片页面 * 选中图片页面
* on 2016/12/2. * on 2016/12/2.
* Created by MrWang * Created by MrWang
*/ */
......
app/src/main/java/com/dayu/bigfish/ui/ReceivingActivity.java
...@@ -47,7 +47,7 @@ public class ReceivingActivity extends BaseActivity<ReceivingPresenter> implemen ...@@ -47,7 +47,7 @@ public class ReceivingActivity extends BaseActivity<ReceivingPresenter> implemen
private int userId; private int userId;
private int siteId; private int siteId;
private int mPage = 1; private int mPage = 1;
private int mPageSize = 10; private int mPageSize = Constants.PAGESIZE;
private int mTotalPage = 1; private int mTotalPage = 1;
private OrderDoingAdapter mAdapter; private OrderDoingAdapter mAdapter;
private int mRefreshState = 1; //1:刷新，2:下拉加载 private int mRefreshState = 1; //1:刷新，2:下拉加载
...@@ -70,7 +70,7 @@ public class ReceivingActivity extends BaseActivity<ReceivingPresenter> implemen ...@@ -70,7 +70,7 @@ public class ReceivingActivity extends BaseActivity<ReceivingPresenter> implemen
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView); mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView);
mRefreshLayout.setOnRefreshListener(this); mRefreshLayout.setOnRefreshListener(this);
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
mAdapter.setOnLoadMoreListener(this,mRecyclerView); mAdapter.setOnLoadMoreListener(this, mRecyclerView);
mAdapter.setEnableLoadMore(false); mAdapter.setEnableLoadMore(false);
mPresenter.getReceiveOrder(Constants.WATING_ORDER, userId, siteId, mPage, mPageSize); mPresenter.getReceiveOrder(Constants.WATING_ORDER, userId, siteId, mPage, mPageSize);
mAdapter.setOnItemChildClickListener((adapter, view, position) -> { mAdapter.setOnItemChildClickListener((adapter, view, position) -> {
......
app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
...@@ -55,7 +55,6 @@ public class SettingActivity extends BaseActivity<SettingPresenter> implements S ...@@ -55,7 +55,6 @@ public class SettingActivity extends BaseActivity<SettingPresenter> implements S
} }
@OnClick({R.id.set_back, R.id.set_message_switch, R.id.set_message, R.id.set_clear_huancun, R.id.set_jiance_gengxin, R.id.set_kefu_phone, R.id.set_guanyu_we, R.id.set_center_fankui, R.id.exit_button}) @OnClick({R.id.set_back, R.id.set_message_switch, R.id.set_message, R.id.set_clear_huancun, R.id.set_jiance_gengxin, R.id.set_kefu_phone, R.id.set_guanyu_we, R.id.set_center_fankui, R.id.exit_button})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
...@@ -79,7 +78,11 @@ public class SettingActivity extends BaseActivity<SettingPresenter> implements S ...@@ -79,7 +78,11 @@ public class SettingActivity extends BaseActivity<SettingPresenter> implements S
public void onClick(Dialog dialog, boolean confirm) { public void onClick(Dialog dialog, boolean confirm) {
if (confirm) { if (confirm) {
ProgressUtil.startLoad(mActivity, "正在清理..."); ProgressUtil.startLoad(mActivity, "正在清理...");
Observable.timer(2, TimeUnit.SECONDS).subscribe(along -> ProgressUtil.stopLoad()); Observable.timer(2, TimeUnit.SECONDS).subscribe(
along -> {
ProgressUtil.stopLoad();
ToastUtils.showShortToast("清理完成");
});
DataCleanManager.deleteFolderFile(Environment.getExternalStorageDirectory() + "/Android/data/com.dayu.bigfish/cache", false); DataCleanManager.deleteFolderFile(Environment.getExternalStorageDirectory() + "/Android/data/com.dayu.bigfish/cache", false);
try { try {
tvHc.setText(DataCleanManager.getCacheSize(new File(Environment.getExternalStorageDirectory() + "/Android/data/com.dayu.bigfish/cache"))); tvHc.setText(DataCleanManager.getCacheSize(new File(Environment.getExternalStorageDirectory() + "/Android/data/com.dayu.bigfish/cache")));
......
app/src/main/java/com/dayu/bigfish/ui/SystemMesDetailActivity.java
...@@ -4,6 +4,7 @@ import android.app.Activity; ...@@ -4,6 +4,7 @@ import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
...@@ -11,8 +12,12 @@ import com.dayu.bigfish.Constants; ...@@ -11,8 +12,12 @@ import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.NewMessage; import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.utils.UtilsDate; import com.dayu.bigfish.utils.UtilsDate;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import java.text.ParseException; import java.text.ParseException;
import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
...@@ -78,10 +83,24 @@ public class SystemMesDetailActivity extends AppCompatActivity { ...@@ -78,10 +83,24 @@ public class SystemMesDetailActivity extends AppCompatActivity {
private void dumpDetail() { private void dumpDetail() {
Intent intent = new Intent(mActivity, OrderDetailsActivity.class); Intent intent = new Intent(mActivity, OrderDetailsActivity.class);
intent.putExtra("orderId", message.getId()); Map<String, String> map = parseData(message.getCustomJson());
int id = 0;
if (!TextUtils.isEmpty(map.get("orderId"))) {
id = Integer.parseInt(map.get("orderId"));
}
intent.putExtra("orderId",id);
startActivity(intent); startActivity(intent);
} }
private static Map<String, String> parseData(String data) {
GsonBuilder gb = new GsonBuilder();
Gson g = gb.create();
Map<String, String> map = g.fromJson(data, new TypeToken<Map<String, String>>() {
}.getType());
return map;
}
@OnClick({R.id.tv_message_check, R.id.receiving_back}) @OnClick({R.id.tv_message_check, R.id.receiving_back})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderDoingAdapter.java
...@@ -167,22 +167,22 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> { ...@@ -167,22 +167,22 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
} }
} }
break; break;
// case 5://已完成 case 5://已完成
// holder.setText(R.id.tv_error_state, "[已完成]"); holder.setText(R.id.tv_error_state, "[已完成]");
// holder.setTextColor(R.id.tv_error_state, mActivity.getResources().getColor(R.color.cl_tab_line)); holder.setTextColor(R.id.tv_error_state, mActivity.getResources().getColor(R.color.cl_tab_line));
// holder.getView(R.id.tv_error_state).setVisibility(View.VISIBLE); holder.getView(R.id.tv_error_state).setVisibility(View.VISIBLE);
// holder.getView(R.id.item_updata_time).setVisibility(View.GONE); holder.getView(R.id.item_updata_time).setVisibility(View.GONE);
// holder.getView(R.id.tv_item_process).setVisibility(View.GONE); holder.getView(R.id.tv_item_process).setVisibility(View.GONE);
// holder.getView(R.id.order_line_one).setVisibility(View.GONE); holder.getView(R.id.order_line_one).setVisibility(View.GONE);
// holder.getView(R.id.order_line_two).setVisibility(View.GONE); holder.getView(R.id.order_line_two).setVisibility(View.GONE);
// if (!haveCustomer) { if (!haveCustomer) {
// holder.getView(R.id.ll_bottom).setVisibility(View.GONE); holder.getView(R.id.ll_bottom).setVisibility(View.GONE);
// holder.getView(R.id.item_bottom_line).setVisibility(View.GONE); holder.getView(R.id.item_bottom_line).setVisibility(View.GONE);
// } else { } else {
// holder.getView(R.id.ll_bottom).setVisibility(View.VISIBLE); holder.getView(R.id.ll_bottom).setVisibility(View.VISIBLE);
// holder.getView(R.id.item_bottom_line).setVisibility(View.VISIBLE); holder.getView(R.id.item_bottom_line).setVisibility(View.VISIBLE);
// } }
// break; break;
default: default:
break; break;
} }
......
app/src/main/java/com/dayu/bigfish/ui/adapter/SystemMessageAdapter.java
...@@ -39,7 +39,13 @@ public class SystemMessageAdapter extends BaseQuickAdapter<NewMessage, BaseViewH ...@@ -39,7 +39,13 @@ public class SystemMessageAdapter extends BaseQuickAdapter<NewMessage, BaseViewH
try { try {
String dateMD = UtilsDate.changeFormat(item.getCreateTime(), FORMAT_ONE, SHORT_DATE_FORMAT); String dateMD = UtilsDate.changeFormat(item.getCreateTime(), FORMAT_ONE, SHORT_DATE_FORMAT);
String dateTime = UtilsDate.changeFormat(item.getCreateTime(), FORMAT_ONE, LONG_TIME_FORMAT_TWO); String dateTime = UtilsDate.changeFormat(item.getCreateTime(), FORMAT_ONE, LONG_TIME_FORMAT_TWO);
if (UtilsDate.IsToday(item.getCreateTime())) {
helper.setText(R.id.message_date, "今天");
} else if (UtilsDate.IsNextday(item.getCreateTime())) {
helper.setText(R.id.message_date, "明天");
} else {
helper.setText(R.id.message_date, dateMD); helper.setText(R.id.message_date, dateMD);
}
helper.setText(R.id.message_time, dateTime); helper.setText(R.id.message_time, dateTime);
helper.setText(R.id.message_text_content, item.getTitle()); helper.setText(R.id.message_text_content, item.getTitle());
} catch (Exception e) { } catch (Exception e) {
......
app/src/main/java/com/dayu/bigfish/ui/fragment/BigFishMessageFragment.java
...@@ -36,24 +36,14 @@ public class BigFishMessageFragment extends BaseFragment<messagePresenter> imple ...@@ -36,24 +36,14 @@ public class BigFishMessageFragment extends BaseFragment<messagePresenter> imple
private SystemMessageAdapter mAdapter; private SystemMessageAdapter mAdapter;
private String hxUserId; private String hxUserId;
private int mPage = 1; private int mPage = 1;
private int mPageSize = 10; private int mPageSize = Constants.PAGESIZE;
private int mTotalPage = 1; private int mTotalPage = 1;
private int mRefreshState = 1; //1:刷新，2:下拉加载 private int mRefreshState = 1; //1:刷新，2:下拉加载
@Override @Override
public View initView(View view) { public View initView(View view) {
hxUserId = GetUserInfo.getHxUserId(mActivity); initData();
ProgressUtil.startLoad(mActivity);
mPresenter.getHxMessage(hxUserId, 2, mPage, mPageSize);
mAdapter = new SystemMessageAdapter(R.layout.message_adapter);
mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
mRecyclerView.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView);
mRefreshLayout.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mRecyclerView);
mAdapter.setEnableLoadMore(false);
initListener();
return view; return view;
} }
...@@ -64,7 +54,20 @@ public class BigFishMessageFragment extends BaseFragment<messagePresenter> imple ...@@ -64,7 +54,20 @@ public class BigFishMessageFragment extends BaseFragment<messagePresenter> imple
@Override @Override
protected void lazyLoad() { protected void lazyLoad() {
}
public void initData() {
hxUserId = GetUserInfo.getHxUserId(mActivity);
ProgressUtil.startLoad(mActivity);
mPresenter.getHxMessage(hxUserId, 2, mPage, mPageSize);
mAdapter = new SystemMessageAdapter(R.layout.message_adapter);
mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
mRecyclerView.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView);
mRefreshLayout.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mRecyclerView);
mAdapter.setEnableLoadMore(false);
initListener();
} }
private void initListener() { private void initListener() {
...@@ -87,6 +90,7 @@ public class BigFishMessageFragment extends BaseFragment<messagePresenter> imple ...@@ -87,6 +90,7 @@ public class BigFishMessageFragment extends BaseFragment<messagePresenter> imple
mTotalPage = message.getTotalPages(); mTotalPage = message.getTotalPages();
mPageSize = message.getPageSize(); mPageSize = message.getPageSize();
if (mRefreshState == 1) { if (mRefreshState == 1) {
mRecyclerView.smoothScrollToPosition(0);
mRefreshLayout.setRefreshing(false); mRefreshLayout.setRefreshing(false);
mAdapter.setNewData(message.getData()); mAdapter.setNewData(message.getData());
mAdapter.setEnableLoadMore(true); mAdapter.setEnableLoadMore(true);
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeMessageTabFragment.java
...@@ -29,6 +29,7 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i ...@@ -29,6 +29,7 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i
ViewPager messageViewPager; ViewPager messageViewPager;
private List<Fragment> list; private List<Fragment> list;
private FragmentOrderAdapter fragmentAdapter; private FragmentOrderAdapter fragmentAdapter;
private int mIndex = -1;
public static HomeMessageTabFragment newInstance() { public static HomeMessageTabFragment newInstance() {
Bundle args = new Bundle(); Bundle args = new Bundle();
...@@ -39,6 +40,7 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i ...@@ -39,6 +40,7 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i
@Override @Override
public View initView(View view) { public View initView(View view) {
initData();
return view; return view;
} }
...@@ -49,7 +51,6 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i ...@@ -49,7 +51,6 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i
@Override @Override
protected void lazyLoad() { protected void lazyLoad() {
initData();
} }
...@@ -65,10 +66,21 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i ...@@ -65,10 +66,21 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i
messageTablayout.addTab(messageTablayout.newTab().setText("大鱼通知")); messageTablayout.addTab(messageTablayout.newTab().setText("大鱼通知"));
messageTablayout.setTabMode(TabLayout.MODE_FIXED); messageTablayout.setTabMode(TabLayout.MODE_FIXED);
TabLayoutUtils.setIndicator(messageTablayout, 60, 60, R.color.cl_receiving_order_item_data, getActivity()); TabLayoutUtils.setIndicator(messageTablayout, 60, 60, R.color.cl_receiving_order_item_data, getActivity());
if (mIndex != -1) {
messageViewPager.setCurrentItem(mIndex);
messageTablayout.getTabAt(mIndex).select();
}
} }
public void swtichFragment(int position) { public void swtichFragment(int position) {
if (messageTablayout == null || messageTablayout.getTabAt(position) == null) {
return;
}
messageViewPager.setCurrentItem(position); messageViewPager.setCurrentItem(position);
messageTablayout.getTabAt(position).select(); messageTablayout.getTabAt(position).select();
} }
public void setIndex(int index) {
mIndex = index;
}
} }
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeOrderFragment.java
...@@ -83,7 +83,6 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen ...@@ -83,7 +83,6 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
@Override @Override
protected void lazyLoad() { protected void lazyLoad() {
ProgressUtil.startLoad(mActivity);
initNetWorkTabNum(userId, 0); initNetWorkTabNum(userId, 0);
} }
...@@ -117,11 +116,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen ...@@ -117,11 +116,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
mTabLayout.post(() -> { mTabLayout.post(() -> {
TabLayoutUtils.setIndicator(mTabLayout, 15, 15, R.color.cl_order_item_line_bg, mActivity); TabLayoutUtils.setIndicator(mTabLayout, 15, 15, R.color.cl_order_item_line_bg, mActivity);
}); });
mTabLayout.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { mTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
/**
* tab的状态监听器，此方法是当tab被选中的回调
* @param tab 当前被选中的tab
* */
@Override @Override
public void onTabSelected(TabLayout.Tab tab) { public void onTabSelected(TabLayout.Tab tab) {
int temp = tab.getPosition(); int temp = tab.getPosition();
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFirstTabFragment.java
...@@ -41,7 +41,7 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im ...@@ -41,7 +41,7 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im
private int siteId; private int siteId;
private int userId; private int userId;
private int mTotalPage; private int mTotalPage;
private int mPageSize = 10; private int mPageSize = Constants.PAGESIZE;
private int mPage = 1; private int mPage = 1;
private int mRefreshState = 1; //1:刷新，private int mRefreshState; private int mRefreshState = 1; //1:刷新，private int mRefreshState;
...@@ -92,6 +92,7 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im ...@@ -92,6 +92,7 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void RefreshApoiment(RefreshApoiment event) { public void RefreshApoiment(RefreshApoiment event) {
mPage = 1; mPage = 1;
mRefreshState = 1;
mAdapter.setEnableLoadMore(false); mAdapter.setEnableLoadMore(false);
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
mPresenter.getWatingOrder(Constants.APPOIMENT_ORDER, userId, siteId, mPage, mPageSize); mPresenter.getWatingOrder(Constants.APPOIMENT_ORDER, userId, siteId, mPage, mPageSize);
...@@ -103,6 +104,7 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im ...@@ -103,6 +104,7 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im
mTotalPage = data.getTotalPages(); mTotalPage = data.getTotalPages();
mPageSize = data.getPageSize(); mPageSize = data.getPageSize();
if (mRefreshState == 1) { if (mRefreshState == 1) {
mRecyclerView.smoothScrollToPosition(0);
mRefreshLayout.setRefreshing(false); mRefreshLayout.setRefreshing(false);
mAdapter.setNewData(data.getData()); mAdapter.setNewData(data.getData());
mAdapter.setEnableLoadMore(true); mAdapter.setEnableLoadMore(true);
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFourTabFragment.java
...@@ -39,7 +39,7 @@ public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter> imp ...@@ -39,7 +39,7 @@ public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter> imp
private int siteId; private int siteId;
private int userId; private int userId;
private int mTotalPage; private int mTotalPage;
private int mPageSize = 10; private int mPageSize = Constants.PAGESIZE;
private int mPage = 1; private int mPage = 1;
private int mRefreshState = 1; //1:刷新，private int mRefreshState; private int mRefreshState = 1; //1:刷新，private int mRefreshState;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderSecondTabFragment.java
...@@ -53,7 +53,7 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i ...@@ -53,7 +53,7 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i
private int siteId; private int siteId;
private int userId; private int userId;
private int mTotalPage; private int mTotalPage;
private int mPageSize = 20; private int mPageSize = Constants.PAGESIZE;
private int mPage = 1; private int mPage = 1;
private int mRefreshState = 1; //1:刷新，private int mRefreshState; private int mRefreshState = 1; //1:刷新，private int mRefreshState;
private List<Order> mDatas; private List<Order> mDatas;
...@@ -97,6 +97,7 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i ...@@ -97,6 +97,7 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void RefreshServe(RefreshServe event) { public void RefreshServe(RefreshServe event) {
mPage = 1; mPage = 1;
mRefreshState = 1;
mAdapter.setEnableLoadMore(false); mAdapter.setEnableLoadMore(false);
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
mPresenter.getWatingOrder(Constants.WATING_SERVER, userId, siteId, mPage, mPageSize); mPresenter.getWatingOrder(Constants.WATING_SERVER, userId, siteId, mPage, mPageSize);
...@@ -140,6 +141,7 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i ...@@ -140,6 +141,7 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i
mTotalPage = data.getTotalPages(); mTotalPage = data.getTotalPages();
mPageSize = data.getPageSize(); mPageSize = data.getPageSize();
if (mRefreshState == 1) { if (mRefreshState == 1) {
mRecyclerView.smoothScrollToPosition(0);
mRefreshLayout.setRefreshing(false); mRefreshLayout.setRefreshing(false);
mAdapter.setNewData(data.getData()); mAdapter.setNewData(data.getData());
mDatas.clear(); mDatas.clear();
......
app/src/main/java/com/dayu/bigfish/ui/fragment/SystemMessageFragment.java
...@@ -36,24 +36,14 @@ public class SystemMessageFragment extends BaseFragment<messagePresenter> implem ...@@ -36,24 +36,14 @@ public class SystemMessageFragment extends BaseFragment<messagePresenter> implem
private SystemMessageAdapter mAdapter; private SystemMessageAdapter mAdapter;
private String hxUserId; private String hxUserId;
private int mPage = 1; private int mPage = 1;
private int mPageSize = 10; private int mPageSize = Constants.PAGESIZE;
private int mTotalPage = 1; private int mTotalPage = 1;
private int mRefreshState = 1; //1:刷新，2:下拉加载 private int mRefreshState = 1; //1:刷新，2:下拉加载
@Override @Override
public View initView(View view) { public View initView(View view) {
hxUserId = GetUserInfo.getHxUserId(mActivity); initData();
ProgressUtil.startLoad(mActivity);
mPresenter.getHxMessage(hxUserId, 1, mPage, mPageSize);
mAdapter = new SystemMessageAdapter(R.layout.message_adapter);
mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
mRecyclerView.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView);
mRefreshLayout.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this,mRecyclerView);
mAdapter.setEnableLoadMore(false);
initListener();
return view; return view;
} }
...@@ -79,7 +69,20 @@ public class SystemMessageFragment extends BaseFragment<messagePresenter> implem ...@@ -79,7 +69,20 @@ public class SystemMessageFragment extends BaseFragment<messagePresenter> implem
@Override @Override
protected void lazyLoad() { protected void lazyLoad() {
}
public void initData() {
hxUserId = GetUserInfo.getHxUserId(mActivity);
ProgressUtil.startLoad(mActivity);
mPresenter.getHxMessage(hxUserId, 1, mPage, mPageSize);
mAdapter = new SystemMessageAdapter(R.layout.message_adapter);
mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
mRecyclerView.setAdapter(mAdapter);
mRefreshLayout.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mRecyclerView);
mAdapter.setEnableLoadMore(false);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView);
initListener();
} }
@Override @Override
...@@ -87,6 +90,7 @@ public class SystemMessageFragment extends BaseFragment<messagePresenter> implem ...@@ -87,6 +90,7 @@ public class SystemMessageFragment extends BaseFragment<messagePresenter> implem
mTotalPage = message.getTotalPages(); mTotalPage = message.getTotalPages();
mPageSize = message.getPageSize(); mPageSize = message.getPageSize();
if (mRefreshState == 1) { if (mRefreshState == 1) {
mRecyclerView.smoothScrollToPosition(0);
mRefreshLayout.setRefreshing(false); mRefreshLayout.setRefreshing(false);
mAdapter.setNewData(message.getData()); mAdapter.setNewData(message.getData());
mAdapter.setEnableLoadMore(true); mAdapter.setEnableLoadMore(true);
......
app/src/main/java/com/dayu/bigfish/ui/views/CustomDialog.java
...@@ -13,7 +13,8 @@ import com.dayu.bigfish.R; ...@@ -13,7 +13,8 @@ import com.dayu.bigfish.R;
* Created by luofan on 2017/11/10. * Created by luofan on 2017/11/10.
*/ */
public class CustomDialog extends Dialog implements View.OnClickListener { public class
CustomDialog extends Dialog implements View.OnClickListener {
private TextView contentTxt; private TextView contentTxt;
private TextView titleTxt; private TextView titleTxt;
private TextView submitTxt; private TextView submitTxt;
...@@ -25,6 +26,7 @@ public class CustomDialog extends Dialog implements View.OnClickListener { ...@@ -25,6 +26,7 @@ public class CustomDialog extends Dialog implements View.OnClickListener {
private String positiveName; private String positiveName;
private String negativeName; private String negativeName;
private String title; private String title;
private boolean flag;
public CustomDialog(Context context) { public CustomDialog(Context context) {
super(context); super(context);
...@@ -64,6 +66,11 @@ public class CustomDialog extends Dialog implements View.OnClickListener { ...@@ -64,6 +66,11 @@ public class CustomDialog extends Dialog implements View.OnClickListener {
return this; return this;
} }
public CustomDialog setOneButton(boolean flag) {
this.flag = flag;
return this;
}
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
...@@ -93,9 +100,13 @@ public class CustomDialog extends Dialog implements View.OnClickListener { ...@@ -93,9 +100,13 @@ public class CustomDialog extends Dialog implements View.OnClickListener {
if (!TextUtils.isEmpty(title)) { if (!TextUtils.isEmpty(title)) {
titleTxt.setText(title); titleTxt.setText(title);
} }
if (flag) {
cancelTxt.setVisibility(View.GONE);
}
} }
@Override @Override
public void onClick(View v) { public void onClick(View v) {
switch (v.getId()) { switch (v.getId()) {
......
app/src/main/java/com/dayu/bigfish/utils/managers/HxManager.java
...@@ -20,6 +20,7 @@ import com.hyphenate.chat.EMOptions; ...@@ -20,6 +20,7 @@ import com.hyphenate.chat.EMOptions;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map;
import static android.app.PendingIntent.FLAG_CANCEL_CURRENT; import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;
...@@ -69,21 +70,23 @@ public class HxManager { ...@@ -69,21 +70,23 @@ public class HxManager {
public void onMessageReceived(List<EMMessage> messages) { public void onMessageReceived(List<EMMessage> messages) {
//收到消息 //收到消息
for (EMMessage message : messages) { for (EMMessage message : messages) {
String str = message.getBody().toString(); String messagebody = message.getBody().toString();
Gson gson = new Gson(); Gson gson = new Gson();
InformBean info = gson.fromJson(message.ext().toString(), InformBean.class); Map<String, Object> map = message.ext();
String customJson = (String) map.get("customJson");
InformBean.CustomJsonBean customJsonBean = gson.fromJson(customJson, InformBean.CustomJsonBean.class);
map.remove("customJson");
String jsonStr = gson.toJson(map);
InformBean info = gson.fromJson(jsonStr, InformBean.class);
info.setCustomJson(customJsonBean);
String title = ""; String title = "";
int secondIndex = 0;
if (info.getCategory() == 1) { if (info.getCategory() == 1) {
title = "系统通知"; title = "系统通知";
secondIndex = 0;
} else if (info.getCategory() == 2) { } else if (info.getCategory() == 2) {
title = "大鱼通知"; title = "大鱼通知";
secondIndex = 1;
} }
Intent intent = new Intent(mContext, MainActivity.class); Intent intent = new Intent(mContext, MainActivity.class);
intent.putExtra(Constants.DUMP_INDEX, 2); intent.putExtra(Constants.MESSAGE_INFO, info);
intent.putExtra(Constants.SECOND_INDEX, secondIndex);
PendingIntent pi = PendingIntent.getActivity(mContext, PendingIntent pi = PendingIntent.getActivity(mContext,
1, intent, FLAG_CANCEL_CURRENT); 1, intent, FLAG_CANCEL_CURRENT);
NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE); NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
...@@ -97,7 +100,7 @@ public class HxManager { ...@@ -97,7 +100,7 @@ public class HxManager {
// 设置通知的标题 // 设置通知的标题
.setContentTitle(title) .setContentTitle(title)
// 设置通知的内容 // 设置通知的内容
.setContentText(str) .setContentText(messagebody)
// 设置使用系统默认的声音、LED // 设置使用系统默认的声音、LED
.setDefaults( .setDefaults(
Notification.DEFAULT_LIGHTS Notification.DEFAULT_LIGHTS
......
app/src/main/java/com/dayu/bigfish/utils/managers/UserManager.java
...@@ -60,12 +60,22 @@ public class UserManager { ...@@ -60,12 +60,22 @@ public class UserManager {
if (!TextUtils.isEmpty(info.getToken())) { if (!TextUtils.isEmpty(info.getToken())) {
SPUtils.put(context, "ACCESS_TOKEN", info.getToken()); SPUtils.put(context, "ACCESS_TOKEN", info.getToken());
} }
if (!TextUtils.isEmpty(info.getAccountId())) {
SPUtils.put(context, "ACCOUNT_ID", info.getAccountId()); SPUtils.put(context, "ACCOUNT_ID", info.getAccountId());
}
if (!TextUtils.isEmpty(info.getSiteId())) {
SPUtils.put(context, "SITE_ID", info.getSiteId()); SPUtils.put(context, "SITE_ID", info.getSiteId());
}
if (!TextUtils.isEmpty(info.getHxAccount())) {
SPUtils.put(context, "HXUSER_ID", info.getHxAccount()); SPUtils.put(context, "HXUSER_ID", info.getHxAccount());
}
if (!TextUtils.isEmpty(info.getHxPwd())) {
SPUtils.put(context, "HXUSER_PWD", info.getHxPwd()); SPUtils.put(context, "HXUSER_PWD", info.getHxPwd());
}
if (!TextUtils.isEmpty(info.getHeaderImg())) {
SPUtils.put(context, "IMAGE_URL", info.getHeaderImg()); SPUtils.put(context, "IMAGE_URL", info.getHeaderImg());
} }
}
/** /**
* 清空 userInfo中数据 * 清空 userInfo中数据
......
app/src/main/res/layout/activity_accountbalance_layout.xml
...@@ -40,15 +40,30 @@ ...@@ -40,15 +40,30 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="100dp"
android:gravity="center" android:gravity="center"
android:text="100"
android:textColor="#ffbe2d" android:textColor="#ffbe2d"
android:textSize="40sp" android:textSize="40sp"
/> />
<ImageView
android:id="@+id/line_one"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0.3"
android:layout_centerHorizontal="true"
android:background="@color/cl_order_item_line_bg"
android:visibility="gone"
/>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe_refersh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recycler_balance" android:id="@+id/recycler_balance"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
</android.support.v7.widget.RecyclerView> </android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
...@@ -25,6 +25,6 @@ ...@@ -25,6 +25,6 @@
android:text="@string/tv_start_page_text" android:text="@string/tv_start_page_text"
android:textColor="#8a8a8a" android:textColor="#8a8a8a"
android:textSize="@dimen/sp_1" android:textSize="@dimen/sp_1"
android:visibility="gone" android:visibility="visible"
/> />
</RelativeLayout> </RelativeLayout>
app/src/main/res/layout/activity_message_detail_layout.xml
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:layout_marginLeft="@dimen/dp_16.7" android:layout_marginLeft="@dimen/dp_16.7"
android:layout_marginRight="@dimen/dp_16.7" android:layout_marginRight="@dimen/dp_16.7"
android:layout_marginTop="33.3dp" android:layout_marginTop="23.3dp"
android:background="@drawable/btn_login_selector" android:background="@drawable/btn_login_selector"
android:gravity="center" android:gravity="center"
android:text="查看工单" android:text="查看工单"
......
app/src/main/res/layout/dialog_loading_layout.xml
...@@ -5,16 +5,16 @@ ...@@ -5,16 +5,16 @@
android:layout_height="fill_parent"> android:layout_height="fill_parent">
<LinearLayout <LinearLayout
android:layout_width="100dip" android:layout_width="80dip"
android:layout_height="100dip" android:layout_height="80dip"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:background="@drawable/loading_progress_bg" android:background="@drawable/loading_progress_bg"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<ProgressBar <ProgressBar
android:layout_width="65dp" android:layout_width="45dp"
android:layout_height="65dp" android:layout_height="45dp"
android:indeterminateDrawable="@drawable/progressbar" android:indeterminateDrawable="@drawable/progressbar"
android:layout_gravity="center" android:layout_gravity="center"
/> />
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:textSize="12sp"
android:text="加载中" android:text="加载中"
android:textColor="#9a9b98"/> android:textColor="#9a9b98"/>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_first.xml
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
</RelativeLayout> </RelativeLayout>
<ImageView <ImageView
android:id="@+id/image_tip" android:id="@+id/iv_empty"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="150dp" android:layout_marginTop="150dp"
android:src="@mipmap/yu" android:src="@mipmap/icon_coming_soon"
/> />
<TextView <TextView
...@@ -29,9 +29,19 @@ ...@@ -29,9 +29,19 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_13" android:layout_marginTop="@dimen/dp_13"
android:text="暂无工单" android:text="此功能正在紧张的开发中..."
android:textColor="@color/cl_selector_hui" android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" android:textSize="11.3sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="敬请期待！"
android:textColor="#3faafc"
android:layout_marginTop="8.7dp"
android:textSize="13.3sp"
/> />
</LinearLayout> </LinearLayout>
\ No newline at end of file
app/src/main/res/layout/message_adapter.xml
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/> />
<TextView <TextView
android:id="@+id/message_time" android:id="@+id/message_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignRight="@id/line_textView" android:layout_alignRight="@id/line_textView"
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
/> />
<TextView <TextView
android:id="@+id/message_date" android:id="@+id/message_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignRight="@id/line_textView" android:layout_alignRight="@id/line_textView"
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
android:text="18:72" android:text="18:72"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textSize="24sp" android:textSize="24sp"
android:textStyle="bold"
/> />
<LinearLayout <LinearLayout
......
app/src/main/res/layout/tips_empty.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
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:background="@color/cl_home_listview_bg"
android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
> >
<ImageView <ImageView
android:id="@+id/image_tip" android:id="@+id/iv_empty"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
...@@ -16,9 +17,10 @@ ...@@ -16,9 +17,10 @@
/> />
<TextView <TextView
android:id="@+id/tv_empty"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/image_tip" android:layout_below="@id/iv_empty"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_13" android:layout_marginTop="@dimen/dp_13"
android:text="暂无工单" android:text="暂无工单"
...@@ -26,4 +28,4 @@ ...@@ -26,4 +28,4 @@
android:textSize="@dimen/sp_13.3" android:textSize="@dimen/sp_13.3"
/> />
</RelativeLayout> </LinearLayout>
\ No newline at end of file \ No newline at end of file
app/src/main/res/mipmap-xhdpi/bg_splash.png
app/src/main/res/mipmap-xhdpi/bg_splash.png

113 KB | W: | H:

app/src/main/res/mipmap-xhdpi/bg_splash.png

47 KB | W: | H:

app/src/main/res/mipmap-xhdpi/bg_splash.png
app/src/main/res/mipmap-xhdpi/bg_splash.png
app/src/main/res/mipmap-xhdpi/bg_splash.png
app/src/main/res/mipmap-xhdpi/bg_splash.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxhdpi/bg_splash.png
app/src/main/res/mipmap-xxhdpi/bg_splash.png

113 KB | W: | H:

app/src/main/res/mipmap-xxhdpi/bg_splash.png

88.6 KB | W: | H:

app/src/main/res/mipmap-xxhdpi/bg_splash.png
app/src/main/res/mipmap-xxhdpi/bg_splash.png
app/src/main/res/mipmap-xxhdpi/bg_splash.png
app/src/main/res/mipmap-xxhdpi/bg_splash.png
  • 2-up
  • Swipe
  • Onion skin
apt/src/main/java/com/app/apt/processor/ApiFactoryProcessor.java
...@@ -34,7 +34,7 @@ public class ApiFactoryProcessor implements IProcessor { ...@@ -34,7 +34,7 @@ public class ApiFactoryProcessor implements IProcessor {
@Override @Override
public void process(RoundEnvironment roundEnv, AnnotationProcessor mAbstractProcessor) { public void process(RoundEnvironment roundEnv, AnnotationProcessor mAbstractProcessor) {
String CLASS_NAME = "ApiFactory"; String CLASS_NAME = "ApiFactory";
TypeSpec.Builder tb = classBuilder(CLASS_NAME).addModifiers(PUBLIC, FINAL).addJavadoc("@ API工厂 此类由apt自动生成"); TypeSpec.Builder tb = classBuilder(CLASS_NAME).addModifiers(PUBLIC, FINAL).addJavadoc("@ API工厂 代替model类");
try { try {
for (TypeElement element : ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(ApiFactory.class))) { for (TypeElement element : ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(ApiFactory.class))) {
mAbstractProcessor.mMessager.printMessage(Diagnostic.Kind.NOTE, "正在处理: " + element.toString()); mAbstractProcessor.mMessager.printMessage(Diagnostic.Kind.NOTE, "正在处理: " + element.toString());
...@@ -52,7 +52,6 @@ public class ApiFactoryProcessor implements IProcessor { ...@@ -52,7 +52,6 @@ public class ApiFactoryProcessor implements IProcessor {
methodBuilder.addParameter(TypeName.get(ep.asType()), ep.getSimpleName().toString()); methodBuilder.addParameter(TypeName.get(ep.asType()), ep.getSimpleName().toString());
paramsString += ep.getSimpleName().toString() + ","; paramsString += ep.getSimpleName().toString() + ",";
} }
mAbstractProcessor.mMessager.printMessage(Diagnostic.Kind.NOTE, "就是这个: " + e.getSimpleName().toString());
if (!(e.getSimpleName().toString()).equals("download")) { if (!(e.getSimpleName().toString()).equals("download")) {
methodBuilder.addStatement( methodBuilder.addStatement(
"return $T.getService()" + "return $T.getService()" +
......
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