Skip to content

android / dayu

Go to a project
Commit a0d4cd6a by 罗翻
Options

去除butternife，使用databingding

parent 4d4f14f2
Expand all
Inline Side-by-side
Showing with 777 additions and 812 deletions
app/build.gradle
...@@ -88,9 +88,6 @@ dependencies { ...@@ -88,9 +88,6 @@ dependencies {
compile 'com.android.support:multidex:1.0.2' compile 'com.android.support:multidex:1.0.2'
compile 'com.android.support:design:25.0.0' compile 'com.android.support:design:25.0.0'
//注解工具
compile 'com.jakewharton:butterknife:8.1.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.1.0'
//greendao数据库 //greendao数据库
compile 'org.greenrobot:greendao:3.2.0' compile 'org.greenrobot:greendao:3.2.0'
......
app/src/main/java/com/dayu/bigfish/Constants.java
...@@ -77,7 +77,7 @@ public class Constants { ...@@ -77,7 +77,7 @@ public class Constants {
//分页获取工单 //分页获取工单
public final static String ORDERS = "/api-order/" + "orders/findSimpleOrderVOByPage"; public final static String ORDERS = "/api-order/" + "orders/findSimpleOrderVOByPage";
//获取首页tab状态的数量 //获取首页tab状态的数量
public final static String TAB_NUM = "/api-order/" + "orders/{userId}/count"; public final static String TAB_NUM = "/api-order/" + "orders/{userId}/count/siteId/{siteId}";
//环信 //环信
public final static String MESSAGE_HX = "/api-message/" + "hXMessage"; public final static String MESSAGE_HX = "/api-message/" + "hXMessage";
//获取消息数量 //获取消息数量
......
app/src/main/java/com/dayu/bigfish/InitializeActivity.java
...@@ -24,10 +24,12 @@ import com.dayu.bigfish.utils.managers.UserManager; ...@@ -24,10 +24,12 @@ import com.dayu.bigfish.utils.managers.UserManager;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
public class InitializeActivity extends AppCompatActivity { public class InitializeActivity extends AppCompatActivity {
public static final int SDK_PERMISSION_REQUEST = 1; public static final int SDK_PERMISSION_REQUEST = 1;
private Activity mActivity; private Activity mActivity;
private Disposable mDisposable;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -108,7 +110,7 @@ public class InitializeActivity extends AppCompatActivity { ...@@ -108,7 +110,7 @@ public class InitializeActivity extends AppCompatActivity {
} else { } else {
intent = new Intent(InitializeActivity.this, LoginActivity.class); intent = new Intent(InitializeActivity.this, LoginActivity.class);
} }
Observable.timer(2000, TimeUnit.MICROSECONDS).subscribe( mDisposable = Observable.timer(2000, TimeUnit.MICROSECONDS).subscribe(
aLong -> { aLong -> {
startActivity(intent); startActivity(intent);
finish(); finish();
...@@ -117,8 +119,9 @@ public class InitializeActivity extends AppCompatActivity { ...@@ -117,8 +119,9 @@ public class InitializeActivity extends AppCompatActivity {
} }
@Override @Override
protected void onPause() { protected void onDestroy() {
super.onPause(); super.onDestroy();
mDisposable.dispose();
} }
} }
app/src/main/java/com/dayu/bigfish/api/APIService.java
...@@ -277,7 +277,7 @@ public interface APIService { ...@@ -277,7 +277,7 @@ public interface APIService {
* @return * @return
*/ */
@GET(Constants.TAB_NUM) @GET(Constants.TAB_NUM)
Observable<BaseResponse<Tab>> getTabNum(@Path("userId") int userId); Observable<BaseResponse<Tab>> getTabNum(@Path("userId") int userId,@Path("siteId") int siteId);
/** /**
......
app/src/main/java/com/dayu/bigfish/base/BaseActivity.java
...@@ -10,7 +10,6 @@ import com.dayu.bigfish.utils.ToastUtils; ...@@ -10,7 +10,6 @@ import com.dayu.bigfish.utils.ToastUtils;
import java.lang.reflect.ParameterizedType; import java.lang.reflect.ParameterizedType;
import butterknife.ButterKnife;
import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.CompositeDisposable;
/** /**
...@@ -25,7 +24,6 @@ public abstract class BaseActivity<P extends BasePresenter> extends AppCompatAct ...@@ -25,7 +24,6 @@ public abstract class BaseActivity<P extends BasePresenter> extends AppCompatAct
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
this.setContentView(this.getLayoutId()); this.setContentView(this.getLayoutId());
ButterKnife.bind(this);
mActivity = this; mActivity = this;
if (this instanceof BaseView && if (this instanceof BaseView &&
this.getClass().getGenericSuperclass() instanceof ParameterizedType && this.getClass().getGenericSuperclass() instanceof ParameterizedType &&
...@@ -33,7 +31,6 @@ public abstract class BaseActivity<P extends BasePresenter> extends AppCompatAct ...@@ -33,7 +31,6 @@ public abstract class BaseActivity<P extends BasePresenter> extends AppCompatAct
Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass() Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass()
.getGenericSuperclass())).getActualTypeArguments()[0]; .getGenericSuperclass())).getActualTypeArguments()[0];
mPresenter = InstanceUtil.getInstance(mPresenterClass); mPresenter = InstanceUtil.getInstance(mPresenterClass);
// }
if (mPresenter != null) mPresenter.setView(this, mActivity); if (mPresenter != null) mPresenter.setView(this, mActivity);
} }
this.initView(); this.initView();
......
app/src/main/java/com/dayu/bigfish/base/BaseBingFragment.java
package com.dayu.bigfish.base; package com.dayu.bigfish.base;
import android.app.Activity; import android.databinding.ViewDataBinding;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.dayu.bigfish.utils.InstanceUtil; import com.dayu.bigfish.utils.InstanceUtil;
import com.dayu.bigfish.utils.ProgressUtil; import com.dayu.bigfish.utils.ProgressUtil;
...@@ -16,48 +8,15 @@ import com.dayu.bigfish.utils.ToastUtils; ...@@ -16,48 +8,15 @@ import com.dayu.bigfish.utils.ToastUtils;
import java.lang.reflect.ParameterizedType; import java.lang.reflect.ParameterizedType;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.disposables.CompositeDisposable;
/** /**
* Created by luo on 2017/11/14. * Created by luo on 2017/11/14.
*/ */
public abstract class BaseBingFragment<P extends BasePresenter> extends Fragment { public abstract class BaseBingFragment<P extends BasePresenter, B extends ViewDataBinding> extends DataBindingFragment<B> {
protected Activity mActivity;
public P mPresenter; public P mPresenter;
private Unbinder mKnife;
private boolean isVisible; //是否可见状态
private boolean isPrepared; //标志位，View已经初始化完成。
private boolean isFirstLoad = true;
protected CompositeDisposable mDisposable = new CompositeDisposable();
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
onAttachToContext((Activity) context);
}
}
@SuppressWarnings("deprecation")
@Override @Override
public void onAttach(Activity activity) { protected void initPresenter() {
super.onAttach(activity); super.initPresenter();
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
onAttachToContext(activity);
}
}
private void onAttachToContext(Activity context) {
mActivity = context;
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
isFirstLoad = true;
isPrepared = true;
if (this instanceof BaseView && if (this instanceof BaseView &&
this.getClass().getGenericSuperclass() instanceof ParameterizedType && this.getClass().getGenericSuperclass() instanceof ParameterizedType &&
((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments().length > 0) { ((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments().length > 0) {
...@@ -68,76 +27,12 @@ public abstract class BaseBingFragment<P extends BasePresenter> extends Fragment ...@@ -68,76 +27,12 @@ public abstract class BaseBingFragment<P extends BasePresenter> extends Fragment
} }
} }
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(getLayoutId(), container, false);
mKnife = ButterKnife.bind(this, view);
initView(view);
return view;
}
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
mKnife.unbind();
if (mPresenter != null) mPresenter.onDetached(); if (mPresenter != null) mPresenter.onDetached();
mDisposable.dispose();
} }
public abstract View initView(View view);
public abstract int getLayoutId();
/**
* 如果是与ViewPager一起使用，调用的是setUserVisibleHint
*/
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (getUserVisibleHint()) {
isVisible = true;
onVisible();
} else {
isVisible = false;
onInvisible();
}
}
/**
* 如果是通过FragmentTransaction的show和hide的方法来控制显示，调用的是onHiddenChanged.
* 若是初始就show的Fragment 为了触发该事件 需要先hide再show
*/
@Override
public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden);
if (!hidden) {
isVisible = true;
onVisible();
} else {
isVisible = false;
onInvisible();
}
}
protected void onVisible() {
doInit();
}
protected void onInvisible() {
}
protected void doInit() {
if (!isPrepared || !isVisible || !isFirstLoad) {
return;
}
isFirstLoad = false;
lazyLoad();
}
protected abstract void lazyLoad();
public void showToast(String msg) { public void showToast(String msg) {
ToastUtils.showShortToast(msg); ToastUtils.showShortToast(msg);
} }
......
app/src/main/java/com/dayu/bigfish/base/BaseBingdActivity.java
...@@ -52,4 +52,8 @@ public abstract class BaseBingdActivity<P extends BasePresenter, B extends ViewD ...@@ -52,4 +52,8 @@ public abstract class BaseBingdActivity<P extends BasePresenter, B extends ViewD
public void hideDialog() { public void hideDialog() {
ProgressUtil.stopLoad(); ProgressUtil.stopLoad();
} }
public void dumbBack() {
mActivity.finish();
}
} }
app/src/main/java/com/dayu/bigfish/base/BaseFragment.java
...@@ -16,8 +16,6 @@ import com.dayu.bigfish.utils.ToastUtils; ...@@ -16,8 +16,6 @@ import com.dayu.bigfish.utils.ToastUtils;
import java.lang.reflect.ParameterizedType; import java.lang.reflect.ParameterizedType;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.CompositeDisposable;
/** /**
...@@ -26,7 +24,6 @@ import io.reactivex.disposables.CompositeDisposable; ...@@ -26,7 +24,6 @@ import io.reactivex.disposables.CompositeDisposable;
public abstract class BaseFragment<P extends BasePresenter> extends Fragment { public abstract class BaseFragment<P extends BasePresenter> extends Fragment {
protected Activity mActivity; protected Activity mActivity;
public P mPresenter; public P mPresenter;
private Unbinder mKnife;
private boolean isVisible; //是否可见状态 private boolean isVisible; //是否可见状态
private boolean isPrepared; //标志位，View已经初始化完成。 private boolean isPrepared; //标志位，View已经初始化完成。
private boolean isFirstLoad = true; private boolean isFirstLoad = true;
...@@ -72,7 +69,6 @@ public abstract class BaseFragment<P extends BasePresenter> extends Fragment { ...@@ -72,7 +69,6 @@ public abstract class BaseFragment<P extends BasePresenter> extends Fragment {
@Override @Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(getLayoutId(), container, false); View view = inflater.inflate(getLayoutId(), container, false);
mKnife = ButterKnife.bind(this, view);
initView(view); initView(view);
return view; return view;
} }
...@@ -80,7 +76,6 @@ public abstract class BaseFragment<P extends BasePresenter> extends Fragment { ...@@ -80,7 +76,6 @@ public abstract class BaseFragment<P extends BasePresenter> extends Fragment {
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
mKnife.unbind();
if (mPresenter != null) mPresenter.onDetached(); if (mPresenter != null) mPresenter.onDetached();
mDisposable.dispose(); mDisposable.dispose();
} }
......
app/src/main/java/com/dayu/bigfish/base/BasePresenter.java
...@@ -41,6 +41,12 @@ public abstract class BasePresenter<V> { ...@@ -41,6 +41,12 @@ public abstract class BasePresenter<V> {
mComDisposable.dispose(); mComDisposable.dispose();
} }
public void dumpBack() {
if (mView instanceof BaseBingdActivity) {
((BaseBingdActivity) mView).dumbBack();
}
}
/** /**
* 创建观察者 * 创建观察者
...@@ -134,8 +140,8 @@ public abstract class BasePresenter<V> { ...@@ -134,8 +140,8 @@ public abstract class BasePresenter<V> {
} }
if (mView instanceof BaseBingdActivity) { if (mView instanceof BaseBingdActivity) {
((BaseBingdActivity) mView).showToast(message); ((BaseBingdActivity) mView).showToast(message);
} else if (mView instanceof BaseFragment) { } else if (mView instanceof BaseBingFragment) {
((BaseFragment) mView).showToast(message); ((BaseBingFragment) mView).showToast(message);
} }
} }
......
app/src/main/java/com/dayu/bigfish/base/DataBindingFragment.java
package com.dayu.bigfish.base; package com.dayu.bigfish.base;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.databinding.DataBindingUtil; import android.databinding.DataBindingUtil;
import android.databinding.ViewDataBinding; import android.databinding.ViewDataBinding;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
...@@ -10,26 +12,113 @@ import android.view.LayoutInflater; ...@@ -10,26 +12,113 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import io.reactivex.disposables.CompositeDisposable;
public abstract class DataBindingFragment<B extends ViewDataBinding> extends Fragment { public abstract class DataBindingFragment<B extends ViewDataBinding> extends Fragment {
public B mBind; public B mBind;
protected Activity mActivity; protected Activity mActivity;
private boolean isVisible; //是否可见状态
private boolean isPrepared; //标志位，View已经初始化完成。
private boolean isFirstLoad = true;
protected CompositeDisposable mDisposable = new CompositeDisposable();
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
onAttachToContext((Activity) context);
}
}
@SuppressWarnings("deprecation")
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
onAttachToContext(activity);
}
}
private void onAttachToContext(Activity context) {
mActivity = context;
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
isFirstLoad = true;
isPrepared = true;
}
@Nullable @Nullable
@Override @Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(getLayoutId(), container, false); View view = inflater.inflate(getLayoutId(), container, false);
DataBindingUtil.inflate(inflater, getLayoutId(), container, false); mBind = DataBindingUtil.bind(view);
initPresenter(); initPresenter();
initView(); initView(view);
return view; return view;
} }
public abstract View initView(View view);
public abstract int getLayoutId();
protected void initPresenter() { protected void initPresenter() {
} }
public abstract int getLayoutId();
public abstract void initView(); /**
* 如果是与ViewPager一起使用，调用的是setUserVisibleHint
*/
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (getUserVisibleHint()) {
isVisible = true;
onVisible();
} else {
isVisible = false;
onInvisible();
}
}
/**
* 如果是通过FragmentTransaction的show和hide的方法来控制显示，调用的是onHiddenChanged.
* 若是初始就show的Fragment 为了触发该事件 需要先hide再show
*/
@Override
public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden);
if (!hidden) {
isVisible = true;
onVisible();
} else {
isVisible = false;
onInvisible();
}
}
protected void onVisible() {
doInit();
}
protected void onInvisible() {
}
protected void doInit() {
if (!isPrepared || !isVisible || !isFirstLoad) {
return;
}
isFirstLoad = false;
lazyLoad();
}
protected abstract void lazyLoad();
@Override
public void onDetach() {
super.onDetach();
mDisposable.dispose();
}
} }
app/src/main/java/com/dayu/bigfish/bean/OrderDetail.java
...@@ -102,7 +102,7 @@ public class OrderDetail { ...@@ -102,7 +102,7 @@ public class OrderDetail {
private Object confirmDoorComment; private Object confirmDoorComment;
private Object serviceRecordComment; private Object serviceRecordComment;
private Object customerCheckComment; private Object customerCheckComment;
private Object isPay; private Integer isPay;
private Object payType; private Object payType;
private Integer doorPrice; private Integer doorPrice;
private Object doorPriceComment; private Object doorPriceComment;
...@@ -423,11 +423,11 @@ public class OrderDetail { ...@@ -423,11 +423,11 @@ public class OrderDetail {
this.customerCheckComment = customerCheckComment; this.customerCheckComment = customerCheckComment;
} }
public Object getIsPay() { public Integer getIsPay() {
return isPay; return isPay;
} }
public void setIsPay(Object isPay) { public void setIsPay(Integer isPay) {
this.isPay = isPay; this.isPay = isPay;
} }
......
app/src/main/java/com/dayu/bigfish/presenter/accountbalance/AccountBalanceContract.java
...@@ -23,6 +23,8 @@ public interface AccountBalanceContract { ...@@ -23,6 +23,8 @@ public interface AccountBalanceContract {
* 获取账户列表信息失败. * 获取账户列表信息失败.
*/ */
void getBalanceError(); void getBalanceError();
void dumpToWithdrawal();
} }
abstract class Presenter extends BasePresenter<View> { abstract class Presenter extends BasePresenter<View> {
...@@ -34,5 +36,10 @@ public interface AccountBalanceContract { ...@@ -34,5 +36,10 @@ public interface AccountBalanceContract {
* @param accountId * @param accountId
*/ */
public abstract void getAccountBalanceList(int page, int pageSize, int accountId); public abstract void getAccountBalanceList(int page, int pageSize, int accountId);
/**
* 跳转到账户绑定界面.
*/
public abstract void dumpToWithdrawal();
} }
} }
app/src/main/java/com/dayu/bigfish/presenter/accountbalance/AccountBalancePresenter.java
...@@ -31,4 +31,9 @@ public class AccountBalancePresenter extends AccountBalanceContract.Presenter { ...@@ -31,4 +31,9 @@ public class AccountBalancePresenter extends AccountBalanceContract.Presenter {
} }
})); }));
} }
@Override
public void dumpToWithdrawal() {
mView.dumpToWithdrawal();
}
} }
app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderContract.java
...@@ -17,6 +17,6 @@ public interface HomeOrderContract { ...@@ -17,6 +17,6 @@ public interface HomeOrderContract {
abstract class Presenter extends BasePresenter<View> { abstract class Presenter extends BasePresenter<View> {
public abstract void getTabNum(int userId); public abstract void getTabNum(int userId, int siteId);
} }
} }
app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderPresenter.java
...@@ -18,8 +18,8 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter { ...@@ -18,8 +18,8 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
} }
@Override @Override
public void getTabNum(int userId) { public void getTabNum(int userId,int siteId) {
ApiFactory.getTabNum(userId).subscribe(baseObserver(new Consumer<Tab>() { ApiFactory.getTabNum(userId,siteId).subscribe(baseObserver(new Consumer<Tab>() {
@Override @Override
public void accept(Tab tab) throws Exception { public void accept(Tab tab) throws Exception {
mView.getTabNumSuccess(tab); mView.getTabNumSuccess(tab);
......
app/src/main/java/com/dayu/bigfish/presenter/login/LoginContract.java
...@@ -6,6 +6,7 @@ import com.dayu.bigfish.base.BaseView; ...@@ -6,6 +6,7 @@ import com.dayu.bigfish.base.BaseView;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.LoginActivity; import com.dayu.bigfish.ui.LoginActivity;
/** /**
* Created by luo on 2016/8/4. * Created by luo on 2016/8/4.
*/ */
...@@ -14,38 +15,37 @@ public interface LoginContract { ...@@ -14,38 +15,37 @@ public interface LoginContract {
interface View extends BaseView { interface View extends BaseView {
/** /**
* 登录. * 登录.
*
* @param userPhone 手机号. * @param userPhone 手机号.
* @param code 验证码. * @param code 验证码.
*/ */
void login(String userPhone, String code); void login(String userPhone, String code);
/** /**
* 登陆成功.
* @param info 用户信息.
*/
void loginSuccess(UserInfo info);
/**
* 登录失败 * 登录失败
*
* @param throwable 错误信息. * @param throwable 错误信息.
*/ */
void loginFail(Throwable throwable); void loginFail(Throwable throwable);
/** /**
* 发送验证码. * 发送验证码.
*
* @param userPhone 手机号 * @param userPhone 手机号
* @param type 1：短信,2:语音验证码. * @param type 1：短信,2:语音验证码.
*/ */
void sendCode(String userPhone, int type); void sendCode(String userPhone, int type);
/** /**
* 验证码发送成功 * 验证码发送成功
*
* @param flag * @param flag
*/ */
void sendCodeSuccess(boolean flag); void sendCodeSuccess(boolean flag);
/** /**
* 验证码发送失败. * 验证码发送失败.
*
* @param throwable * @param throwable
*/ */
void sendCodeFail(Throwable throwable); void sendCodeFail(Throwable throwable);
...@@ -64,6 +64,20 @@ public interface LoginContract { ...@@ -64,6 +64,20 @@ public interface LoginContract {
* 跳转到用户须知页面. * 跳转到用户须知页面.
*/ */
void dumpAgreement(); void dumpAgreement();
/**
* 登录环信.
*
* @param hxAccount
* @param hxPwd
*/
void loginHx(String hxAccount, String hxPwd);
/**
* 跳转到主界面并保存用户信息.
* @param info
*/
void dumpAndSave(UserInfo info);
} }
abstract class Presenter extends BasePresenter<LoginActivity> { abstract class Presenter extends BasePresenter<LoginActivity> {
...@@ -83,7 +97,25 @@ public interface LoginContract { ...@@ -83,7 +97,25 @@ public interface LoginContract {
*/ */
public abstract void login(String userPhone, String register); public abstract void login(String userPhone, String register);
/**
* 跳转到用户须知.
*/
public abstract void dumpAgreement(); public abstract void dumpAgreement();
/**
* 登录环信.
*
* @param hxAccount
* @param hxPwd
*/
public abstract void loginHx(String hxAccount, String hxPwd);
/**
* 跳转到主界面并保存用户信息.
*
* @param info
*/
public abstract void dumpAndSave(UserInfo info);
} }
} }
app/src/main/java/com/dayu/bigfish/presenter/login/LoginPresenter.java
...@@ -44,12 +44,7 @@ public class LoginPresenter extends LoginContract.Presenter { ...@@ -44,12 +44,7 @@ public class LoginPresenter extends LoginContract.Presenter {
public void accept(Boolean aBoolean) throws Exception { public void accept(Boolean aBoolean) throws Exception {
mView.sendCodeSuccess(aBoolean); mView.sendCodeSuccess(aBoolean);
} }
}, new Consumer<Throwable>() { }, throwable -> mView.sendCodeFail(throwable)));
@Override
public void accept(Throwable throwable) throws Exception {
mView.sendCodeFail(throwable);
}
}));
} }
@Override @Override
...@@ -66,14 +61,12 @@ public class LoginPresenter extends LoginContract.Presenter { ...@@ -66,14 +61,12 @@ public class LoginPresenter extends LoginContract.Presenter {
ApiFactory.login(userPhone, code).subscribe(baseObserver(new Consumer<UserInfo>() { ApiFactory.login(userPhone, code).subscribe(baseObserver(new Consumer<UserInfo>() {
@Override @Override
public void accept(UserInfo userInfo) throws Exception { public void accept(UserInfo userInfo) throws Exception {
mView.loginSuccess(userInfo); loginHx(userInfo.getHxAccount(), userInfo.getHxPwd());
} dumpAndSave(userInfo);
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
Log.d("request", throwable.toString());
mView.loginFail(throwable);
} }
}, throwable -> {
Log.d("request", throwable.toString());
mView.loginFail(throwable);
})); }));
} }
...@@ -81,4 +74,14 @@ public class LoginPresenter extends LoginContract.Presenter { ...@@ -81,4 +74,14 @@ public class LoginPresenter extends LoginContract.Presenter {
public void dumpAgreement() { public void dumpAgreement() {
mView.dumpAgreement(); mView.dumpAgreement();
} }
@Override
public void loginHx(String hxAccount, String hxPwd) {
mView.loginHx(hxAccount, hxPwd);
}
@Override
public void dumpAndSave(UserInfo info) {
mView.dumpAndSave(info);
}
} }
app/src/main/java/com/dayu/bigfish/presenter/orderdetail/OrderDetailContract.java
...@@ -12,9 +12,19 @@ public interface OrderDetailContract { ...@@ -12,9 +12,19 @@ public interface OrderDetailContract {
interface View extends BaseView { interface View extends BaseView {
void getDetailInfo(OrderDetail detail); void getDetailInfo(OrderDetail detail);
/**
* 备注过长，显示查看更多.
*/
void lookMore();
} }
abstract class Presenter extends BasePresenter<View> { abstract class Presenter extends BasePresenter<View> {
public abstract void getOrderDetailInfo(int orderId); public abstract void getOrderDetailInfo(int orderId);
/**
* 备注过长，显示查看更多.
*/
public abstract void lookMore();
} }
} }
app/src/main/java/com/dayu/bigfish/presenter/orderdetail/OrderDetailPresenter.java
...@@ -27,5 +27,10 @@ public class OrderDetailPresenter extends OrderDetailContract.Presenter { ...@@ -27,5 +27,10 @@ public class OrderDetailPresenter extends OrderDetailContract.Presenter {
})); }));
} }
@Override
public void lookMore() {
mView.lookMore();
}
} }
app/src/main/java/com/dayu/bigfish/ui/AccountBalanceActivity.java
...@@ -42,6 +42,7 @@ public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePres ...@@ -42,6 +42,7 @@ public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePres
@Override @Override
public void initView() { public void initView() {
mBind.setPresenter(mPresenter);
initData(); initData();
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId); mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
...@@ -58,12 +59,6 @@ public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePres ...@@ -58,12 +59,6 @@ public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePres
mBind.swipeRefersh.setOnRefreshListener(this); mBind.swipeRefersh.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mBind.rlBalance); mAdapter.setOnLoadMoreListener(this, mBind.rlBalance);
mAdapter.setEnableLoadMore(false); mAdapter.setEnableLoadMore(false);
mBind.titleBack.setOnClickListener(o -> finish());
mBind.titleRight.setOnClickListener(o -> {
Intent intent = new Intent(mActivity, WithdrawalsActivity.class);
startActivity(intent);
});
} }
@Override @Override
...@@ -103,6 +98,12 @@ public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePres ...@@ -103,6 +98,12 @@ public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePres
} }
@Override @Override
public void dumpToWithdrawal() {
Intent intent = new Intent(mActivity, WithdrawalsActivity.class);
startActivity(intent);
}
@Override
public void onRefresh() { public void onRefresh() {
mRefreshState = 1; mRefreshState = 1;
mPage = 1; mPage = 1;
......
app/src/main/java/com/dayu/bigfish/ui/LoginActivity.java
...@@ -22,9 +22,8 @@ import com.hyphenate.chat.EMClient; ...@@ -22,9 +22,8 @@ import com.hyphenate.chat.EMClient;
* 2017/11/08. * 2017/11/08.
*/ */
public class LoginActivity extends BaseBingdActivity<LoginPresenter, ActivityLoginBinding> implements LoginContract.View { public class LoginActivity extends BaseBingdActivity<LoginPresenter, ActivityLoginBinding>
private String hxUserId; implements LoginContract.View {
private String hxUserPwd;
private int mType; private int mType;
private String mPhone; private String mPhone;
private String mCode; private String mCode;
...@@ -36,21 +35,21 @@ public class LoginActivity extends BaseBingdActivity<LoginPresenter, ActivityLog ...@@ -36,21 +35,21 @@ public class LoginActivity extends BaseBingdActivity<LoginPresenter, ActivityLog
@Override @Override
public void initView() { public void initView() {
mBind.setPresenter(mPresenter);
mBind.btnSendCode.setOnClickListener(o -> { mBind.btnSendCode.setOnClickListener(o -> {
getData(); getData();
mType = 1; mType = 1;
sendCode(mPhone, mType); sendCode(mPhone, mType);
}); });
mBind.btnLogin.setOnClickListener(o -> {
getData();
login(mPhone, mCode);
});
mBind.tvVoiceCode.setOnClickListener(o -> { mBind.tvVoiceCode.setOnClickListener(o -> {
getData(); getData();
mType = 2; mType = 2;
sendCode(mPhone, mType); sendCode(mPhone, mType);
}); });
mBind.tvAgreement.setOnClickListener(o -> dumpAgreement()); mBind.btnLogin.setOnClickListener(o -> {
getData();
login(mPhone, mCode);
});
} }
private void getData() { private void getData() {
...@@ -64,33 +63,6 @@ public class LoginActivity extends BaseBingdActivity<LoginPresenter, ActivityLog ...@@ -64,33 +63,6 @@ public class LoginActivity extends BaseBingdActivity<LoginPresenter, ActivityLog
} }
@Override @Override
public void loginSuccess(UserInfo info) {
hxUserId = info.getHxAccount();
hxUserPwd = info.getHxPwd();
UserManager.getInstance().saveUserInfo(this, info);
if (!(TextUtils.isEmpty(hxUserId)) && !(TextUtils.isEmpty(hxUserPwd))) {
EMClient.getInstance().login(hxUserId, hxUserPwd, new EMCallBack() {
@Override
public void onSuccess() {
EMClient.getInstance().groupManager().loadAllGroups();
EMClient.getInstance().chatManager().loadAllConversations();
}
@Override
public void onProgress(int progress, String status) {
}
@Override
public void onError(int code, String message) {
}
});
}
Intent intent = new Intent(this, MainActivity.class);
startActivity(intent);
finish();
}
@Override
public void loginFail(Throwable throwable) { public void loginFail(Throwable throwable) {
ToastUtils.showShortToast(throwable.toString()); ToastUtils.showShortToast(throwable.toString());
ToastUtils.showShortToast(getString(R.string.login_faile)); ToastUtils.showShortToast(getString(R.string.login_faile));
...@@ -137,6 +109,35 @@ public class LoginActivity extends BaseBingdActivity<LoginPresenter, ActivityLog ...@@ -137,6 +109,35 @@ public class LoginActivity extends BaseBingdActivity<LoginPresenter, ActivityLog
} }
@Override @Override
public void loginHx(String hxAccount, String hxPwd) {
if (!(TextUtils.isEmpty(hxAccount)) && !(TextUtils.isEmpty(hxPwd))) {
EMClient.getInstance().login(hxAccount, hxPwd, new EMCallBack() {
@Override
public void onSuccess() {
EMClient.getInstance().groupManager().loadAllGroups();
EMClient.getInstance().chatManager().loadAllConversations();
}
@Override
public void onProgress(int progress, String status) {
}
@Override
public void onError(int code, String message) {
}
});
}
}
@Override
public void dumpAndSave(UserInfo info) {
UserManager.getInstance().saveUserInfo(this, info);
Intent intent = new Intent(this, MainActivity.class);
startActivity(intent);
finish();
}
@Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
} }
......
app/src/main/java/com/dayu/bigfish/ui/OrderRecordActivity.java
...@@ -116,7 +116,6 @@ public class OrderRecordActivity extends BaseBingdActivity<WorksRecordPresenter, ...@@ -116,7 +116,6 @@ public class OrderRecordActivity extends BaseBingdActivity<WorksRecordPresenter,
mBind.etSeacher.setText(""); mBind.etSeacher.setText("");
mBind.rlSeacher.setVisibility(View.GONE); mBind.rlSeacher.setVisibility(View.GONE);
mBind.rlTitle.setVisibility(View.VISIBLE); mBind.rlTitle.setVisibility(View.VISIBLE);
mAdapter.notifyDataSetChanged();
InputMethodManager imm = (InputMethodManager) mActivity InputMethodManager imm = (InputMethodManager) mActivity
.getSystemService(Context.INPUT_METHOD_SERVICE); .getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(mActivity.getCurrentFocus().getWindowToken(), 0); imm.hideSoftInputFromWindow(mActivity.getCurrentFocus().getWindowToken(), 0);
......
app/src/main/java/com/dayu/bigfish/ui/ReceivingActivity.java
...@@ -65,6 +65,7 @@ public class ReceivingActivity extends BaseBingdActivity<ReceivingPresenter, Act ...@@ -65,6 +65,7 @@ public class ReceivingActivity extends BaseBingdActivity<ReceivingPresenter, Act
mAdapter.setEnableLoadMore(false); mAdapter.setEnableLoadMore(false);
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
mPresenter.getReceiveOrder(Constants.WATING_ORDER, userId, siteId, mPage, mPageSize); mPresenter.getReceiveOrder(Constants.WATING_ORDER, userId, siteId, mPage, mPageSize);
mBind.setPresenter(mPresenter);
initListener(); initListener();
} }
...@@ -81,7 +82,6 @@ public class ReceivingActivity extends BaseBingdActivity<ReceivingPresenter, Act ...@@ -81,7 +82,6 @@ public class ReceivingActivity extends BaseBingdActivity<ReceivingPresenter, Act
intent.putExtra("orderId", order.getId()); intent.putExtra("orderId", order.getId());
startActivity(intent); startActivity(intent);
}); });
mBind.receivingBack.setOnClickListener(o -> finish());
} }
......
app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
...@@ -3,7 +3,7 @@ package com.dayu.bigfish.ui; ...@@ -3,7 +3,7 @@ package com.dayu.bigfish.ui;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Environment; import android.os.Environment;
import android.provider.Settings; import android.text.TextUtils;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingdActivity; import com.dayu.bigfish.base.BaseBingdActivity;
...@@ -13,9 +13,11 @@ import com.dayu.bigfish.presenter.setting.SettingPresenter; ...@@ -13,9 +13,11 @@ import com.dayu.bigfish.presenter.setting.SettingPresenter;
import com.dayu.bigfish.ui.views.CustomDialog; import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.AppUtils; import com.dayu.bigfish.utils.AppUtils;
import com.dayu.bigfish.utils.DataCleanManager; import com.dayu.bigfish.utils.DataCleanManager;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ProgressUtil; import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.ToastUtils; import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.hyphenate.EMCallBack;
import com.hyphenate.chat.EMClient; import com.hyphenate.chat.EMClient;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -28,6 +30,9 @@ import io.reactivex.Observable; ...@@ -28,6 +30,9 @@ import io.reactivex.Observable;
*/ */
public class SettingActivity extends BaseBingdActivity<SettingPresenter, ActivitySettingBinding> implements SettingContract.View { public class SettingActivity extends BaseBingdActivity<SettingPresenter, ActivitySettingBinding> implements SettingContract.View {
private String mHxAccount;
private String mHxPwd;
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_setting; return R.layout.activity_setting;
...@@ -36,6 +41,12 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit ...@@ -36,6 +41,12 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit
@Override @Override
public void initView() { public void initView() {
initListener();
mHxAccount = GetUserInfo.getHxUserId(mActivity);
mHxPwd = GetUserInfo.getHxPwd(mActivity);
}
private void initListener() {
mBind.exitButton.setOnClickListener(o -> { mBind.exitButton.setOnClickListener(o -> {
UserManager.getInstance().clearUserInfo(this); UserManager.getInstance().clearUserInfo(this);
EMClient.getInstance().logout(true); EMClient.getInstance().logout(true);
...@@ -44,11 +55,7 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit ...@@ -44,11 +55,7 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit
startActivity(Intents); startActivity(Intents);
}); });
mBind.titleBack.setOnClickListener(o -> finish()); mBind.titleBack.setOnClickListener(o -> finish());
mBind.setMessageSwitch.setOnClickListener(o -> mBind.setMessageSwitch.changeSwitchButton()); mBind.setMessageSwitch.setOnClickListener(o -> switchButton());
mBind.setMessage.setOnClickListener(o -> {
startActivity(new Intent(Settings.ACTION_APPLICATION_SETTINGS));
mBind.setMessageSwitch.changeSwitchButton();
});
mBind.setClearHuancun.setOnClickListener(o -> clearCach()); mBind.setClearHuancun.setOnClickListener(o -> clearCach());
mBind.setJianceGengxin.setOnClickListener(o -> { mBind.setJianceGengxin.setOnClickListener(o -> {
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
...@@ -69,6 +76,31 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit ...@@ -69,6 +76,31 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit
}); });
} }
private void switchButton() {
mBind.setMessageSwitch.changeSwitchButton();
if (mBind.setMessageSwitch.getSwitchButton()) {
if (!(TextUtils.isEmpty(mHxAccount)) && !(TextUtils.isEmpty(mHxPwd))) {
EMClient.getInstance().login(mHxAccount, mHxPwd, new EMCallBack() {
@Override
public void onSuccess() {
EMClient.getInstance().groupManager().loadAllGroups();
EMClient.getInstance().chatManager().loadAllConversations();
}
@Override
public void onProgress(int progress, String status) {
}
@Override
public void onError(int code, String message) {
}
});
}
} else {
EMClient.getInstance().logout(true);
}
}
private void clearCach() { private void clearCach() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.custom_dialog2, getString(R.string.sure_clear_data) CustomDialog dialog = new CustomDialog(mActivity, R.style.custom_dialog2, getString(R.string.sure_clear_data)
, (dialog1, confirm) -> { , (dialog1, confirm) -> {
......
app/src/main/java/com/dayu/bigfish/ui/adapter/AccountBalanceAdapter.java
...@@ -2,8 +2,6 @@ package com.dayu.bigfish.ui.adapter; ...@@ -2,8 +2,6 @@ package com.dayu.bigfish.ui.adapter;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.view.View;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
...@@ -12,44 +10,26 @@ import com.dayu.bigfish.bean.AccountBalance; ...@@ -12,44 +10,26 @@ import com.dayu.bigfish.bean.AccountBalance;
import java.util.List; import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
/** /**
* Created by luofan on 2017/11/1. * Created by luofan on 2017/11/1.
*/ */
public class AccountBalanceAdapter extends BaseQuickAdapter<AccountBalance, AccountBalanceAdapter.ViewHodler> { public class AccountBalanceAdapter extends BaseQuickAdapter<AccountBalance, BaseViewHolder> {
public AccountBalanceAdapter(@LayoutRes int layoutResId, @Nullable List<AccountBalance> data) { public AccountBalanceAdapter(@LayoutRes int layoutResId, @Nullable List<AccountBalance> data) {
super(layoutResId, data); super(layoutResId, data);
} }
@Override @Override
protected void convert(ViewHodler helper, AccountBalance item) { protected void convert(BaseViewHolder helper, AccountBalance item) {
double balance = item.getStreamPrice(); double balance = item.getStreamPrice();
if (balance > 0) { if (balance > 0) {
helper.mBalance.setText("+" + item.getStreamPrice()); helper.setText(R.id.item_tv_accout_balance, "+" + item.getStreamPrice());
helper.mBalance.setTextColor(mContext.getResources().getColor(R.color.cl_tab_yellow)); helper.setTextColor(R.id.item_tv_accout_balance, mContext.getResources().getColor(R.color.cl_tab_yellow));
} else { } else {
helper.mBalance.setText(item.getStreamPrice() + ""); helper.setText(R.id.item_tv_accout_balance, item.getStreamPrice() + "");
helper.mBalance.setTextColor(mContext.getResources().getColor(R.color.cl_order_text_title)); helper.setTextColor(R.id.item_tv_accout_balance, mContext.getResources().getColor(R.color.cl_order_text_title));
}
helper.mSource.setText(item.getOperateActionComment());
helper.mTime.setText(item.getCreateTime());
}
class ViewHodler extends BaseViewHolder {
@BindView(R.id.item_tv_accout_source)
TextView mSource;
@BindView(R.id.item_tv_accout_time)
TextView mTime;
@BindView(R.id.item_tv_accout_balance)
TextView mBalance;
public ViewHodler(View view) {
super(view);
ButterKnife.bind(this, view);
} }
helper.setText(R.id.item_tv_accout_source, item.getOperateActionComment());
helper.setText(R.id.item_tv_accout_time, item.getCreateTime());
} }
} }
app/src/main/java/com/dayu/bigfish/ui/adapter/BigFishMessageAdapter.java deleted 100755 → 0
package com.dayu.bigfish.ui.adapter;
import android.content.Context;
import android.content.res.AssetManager;
import android.graphics.Typeface;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.utils.DateUtils;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 系统消息的适配器
* on 2017/10/14.
*/
public class BigFishMessageAdapter extends BaseAdapter {
private List<NewMessage> bigFishList;
private DateUtils myDateUtils;
private Context context;
private String dataMD;
private String dataTime;
public BigFishMessageAdapter(List<NewMessage> bigFishList, Context context, DateUtils dateUtils) {
this.bigFishList = bigFishList;
this.context = context;
this.myDateUtils = dateUtils;
}
@Override
public int getCount() {
return bigFishList.size();
}
@Override
public Object getItem(int position) {
return position;
}
@Override
public long getItemId(int position) {
return position;
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View view;
ViewHolder viewHolder;
if (convertView == null) {
view = View.inflate(context, R.layout.big_message_adapter, null);
viewHolder = new ViewHolder(view, context);
view.setTag(viewHolder);
} else {
view = convertView;
viewHolder = (ViewHolder) view.getTag();
}
initData(position, viewHolder);
return view;
}
private void initData(int position, ViewHolder viewHolder) {
if (bigFishList.get(position).getFlag() != null && bigFishList.get(position).getFlag().equals("1")) {
viewHolder.view.setVisibility(View.GONE);
} else {
viewHolder.view.setVisibility(View.VISIBLE);
}
try {
dataMD = myDateUtils.stringDateToDate(bigFishList.get(position).getCreateTime());
viewHolder.bigMessageTime.setText(dataMD);
dataTime = myDateUtils.stringTimeToDate(bigFishList.get(position).getCreateTime());
viewHolder.bigMessageDate.setText(dataTime);
} catch (Exception e) {
e.printStackTrace();
}
viewHolder.bigMessageTextContent.setText(bigFishList.get(position).getContent());
}
static class ViewHolder {
@BindView(R.id.big_line_textView)
TextView bigLineTextView;
@BindView(R.id.big_message_time)
TextView bigMessageTime;
@BindView(R.id.big_message_date)
TextView bigMessageDate;
@BindView(R.id.big_message_text_content)
TextView bigMessageTextContent;
@BindView(R.id.big_item)
RelativeLayout bigItem;
@BindView(R.id.iv)
TextView view;
ViewHolder(View view, Context context) {
ButterKnife.bind(this, view);
AssetManager mgr = context.getAssets();//得到AssetManager
Typeface tf = Typeface.createFromAsset(mgr, "fonts/DIN Alternate Bold.ttf");//根据路径得到Typeface
bigMessageDate.setTypeface(tf);//设置字体
}
}
}
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderDoingAdapter.java
...@@ -20,7 +20,6 @@ import com.dayu.bigfish.ui.SopWebViewActivity; ...@@ -20,7 +20,6 @@ import com.dayu.bigfish.ui.SopWebViewActivity;
import com.dayu.bigfish.ui.SubcribeTimeActivity; import com.dayu.bigfish.ui.SubcribeTimeActivity;
import com.dayu.bigfish.utils.LocationUtils; import com.dayu.bigfish.utils.LocationUtils;
import com.dayu.bigfish.utils.ProgressUtil; import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.utils.UtilsDate; import com.dayu.bigfish.utils.UtilsDate;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
...@@ -245,7 +244,6 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> { ...@@ -245,7 +244,6 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
LocationUtils.getCurrentLocation(new LocationUtils.MyLocationListener() { LocationUtils.getCurrentLocation(new LocationUtils.MyLocationListener() {
@Override @Override
public void result(AMapLocation location) { public void result(AMapLocation location) {
ToastUtils.showShortToast("获取到定位" + location.getLatitude());
double latitude = 0; double latitude = 0;
double longitude = 0; double longitude = 0;
if (location != null) { if (location != null) {
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderFourTabAdapter.java
...@@ -32,12 +32,6 @@ public class OrderFourTabAdapter extends BaseQuickAdapter<Order, BaseViewHolder> ...@@ -32,12 +32,6 @@ public class OrderFourTabAdapter extends BaseQuickAdapter<Order, BaseViewHolder>
initData(helper, item); initData(helper, item);
} }
@Override
public long getItemId(int position) {
return position;
}
private void initData(BaseViewHolder helper, Order item) { private void initData(BaseViewHolder helper, Order item) {
try { try {
String time; String time;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/BigFishMessageFragment.java
...@@ -3,16 +3,16 @@ package com.dayu.bigfish.ui.fragment; ...@@ -3,16 +3,16 @@ package com.dayu.bigfish.ui.fragment;
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.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BasePageBean; import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.NewMessage; import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.databinding.FragmentMessageSystemBinding;
import com.dayu.bigfish.presenter.message.messageContract; import com.dayu.bigfish.presenter.message.messageContract;
import com.dayu.bigfish.presenter.message.messagePresenter; import com.dayu.bigfish.presenter.message.messagePresenter;
import com.dayu.bigfish.ui.SystemMesDetailActivity; import com.dayu.bigfish.ui.SystemMesDetailActivity;
...@@ -20,19 +20,13 @@ import com.dayu.bigfish.ui.adapter.SystemMessageAdapter; ...@@ -20,19 +20,13 @@ import com.dayu.bigfish.ui.adapter.SystemMessageAdapter;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ProgressUtil; import com.dayu.bigfish.utils.ProgressUtil;
import butterknife.BindView;
/** /**
* 大鱼运营官方通知 * 大鱼运营官方通知
* on 2017/10/11. * on 2017/10/11.
*/ */
public class BigFishMessageFragment extends BaseFragment<messagePresenter> implements messageContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener { public class BigFishMessageFragment extends BaseBingFragment<messagePresenter,FragmentMessageSystemBinding>
implements messageContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
@BindView(R.id.rl_sysmessage)
RecyclerView mRecyclerView;
@BindView(R.id.receiving_refersh)
SwipeRefreshLayout mRefreshLayout;
private SystemMessageAdapter mAdapter; private SystemMessageAdapter mAdapter;
private String hxUserId; private String hxUserId;
private int mPage = 1; private int mPage = 1;
...@@ -61,11 +55,11 @@ public class BigFishMessageFragment extends BaseFragment<messagePresenter> imple ...@@ -61,11 +55,11 @@ public class BigFishMessageFragment extends BaseFragment<messagePresenter> imple
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
mPresenter.getHxMessage(hxUserId, 2, mPage, mPageSize); mPresenter.getHxMessage(hxUserId, 2, mPage, mPageSize);
mAdapter = new SystemMessageAdapter(R.layout.message_adapter); mAdapter = new SystemMessageAdapter(R.layout.message_adapter);
mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); mBind.rlMessage.setLayoutManager(new LinearLayoutManager(getContext()));
mRecyclerView.setAdapter(mAdapter); mBind.rlMessage.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView); mAdapter.disableLoadMoreIfNotFullPage(mBind.rlMessage);
mRefreshLayout.setOnRefreshListener(this); mBind.spRefersh.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mRecyclerView); mAdapter.setOnLoadMoreListener(this, mBind.rlMessage);
mAdapter.setEnableLoadMore(false); mAdapter.setEnableLoadMore(false);
initListener(); initListener();
} }
...@@ -90,8 +84,8 @@ public class BigFishMessageFragment extends BaseFragment<messagePresenter> imple ...@@ -90,8 +84,8 @@ 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); mBind.rlMessage.smoothScrollToPosition(0);
mRefreshLayout.setRefreshing(false); mBind.spRefersh.setRefreshing(false);
mAdapter.setNewData(message.getData()); mAdapter.setNewData(message.getData());
mAdapter.setEnableLoadMore(true); mAdapter.setEnableLoadMore(true);
} else { } else {
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeFirstTabFragment.java
...@@ -4,7 +4,8 @@ import android.os.Bundle; ...@@ -4,7 +4,8 @@ import android.os.Bundle;
import android.view.View; import android.view.View;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.databinding.FragmentFirstBinding;
import com.dayu.bigfish.presenter.homefirsttab.HomeFirstContract; import com.dayu.bigfish.presenter.homefirsttab.HomeFirstContract;
import com.dayu.bigfish.presenter.homefirsttab.HomeFirstPresenter; import com.dayu.bigfish.presenter.homefirsttab.HomeFirstPresenter;
...@@ -12,7 +13,7 @@ import com.dayu.bigfish.presenter.homefirsttab.HomeFirstPresenter; ...@@ -12,7 +13,7 @@ import com.dayu.bigfish.presenter.homefirsttab.HomeFirstPresenter;
* Created by luofan on 2017/11/20. * Created by luofan on 2017/11/20.
*/ */
public class HomeFirstTabFragment extends BaseFragment<HomeFirstPresenter> implements HomeFirstContract.View { public class HomeFirstTabFragment extends BaseBingFragment<HomeFirstPresenter, FragmentFirstBinding> implements HomeFirstContract.View {
public static HomeFirstTabFragment newInstance() { public static HomeFirstTabFragment newInstance() {
Bundle args = new Bundle(); Bundle args = new Bundle();
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeMessageTabFragment.java
...@@ -3,11 +3,11 @@ package com.dayu.bigfish.ui.fragment; ...@@ -3,11 +3,11 @@ package com.dayu.bigfish.ui.fragment;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.TabLayout; import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager;
import android.view.View; import android.view.View;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.databinding.FragmentMessageBinding;
import com.dayu.bigfish.presenter.homemessage.HomeMessageContract; import com.dayu.bigfish.presenter.homemessage.HomeMessageContract;
import com.dayu.bigfish.presenter.homemessage.HomeMessagePresenter; import com.dayu.bigfish.presenter.homemessage.HomeMessagePresenter;
import com.dayu.bigfish.ui.adapter.FragmentOrderAdapter; import com.dayu.bigfish.ui.adapter.FragmentOrderAdapter;
...@@ -16,17 +16,12 @@ import com.dayu.bigfish.utils.TabLayoutUtils; ...@@ -16,17 +16,12 @@ import com.dayu.bigfish.utils.TabLayoutUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import butterknife.BindView;
/** /**
* Created by luofan on 2017/11/20. * Created by luofan on 2017/11/20.
*/ */
public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> implements HomeMessageContract.View { public class HomeMessageTabFragment extends BaseBingFragment<HomeMessagePresenter, FragmentMessageBinding>
@BindView(R.id.message_tablayout) implements HomeMessageContract.View {
TabLayout messageTablayout;
@BindView(R.id.message_view_pager)
ViewPager messageViewPager;
private List<Fragment> list; private List<Fragment> list;
private FragmentOrderAdapter fragmentAdapter; private FragmentOrderAdapter fragmentAdapter;
private int mIndex = -1; private int mIndex = -1;
...@@ -46,7 +41,7 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i ...@@ -46,7 +41,7 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_message; return R.layout.fragment_message;
} }
@Override @Override
...@@ -59,25 +54,25 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i ...@@ -59,25 +54,25 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i
list.add(new SystemMessageFragment()); list.add(new SystemMessageFragment());
list.add(new BigFishMessageFragment()); list.add(new BigFishMessageFragment());
fragmentAdapter = new FragmentOrderAdapter(getActivity().getSupportFragmentManager(), list); fragmentAdapter = new FragmentOrderAdapter(getActivity().getSupportFragmentManager(), list);
messageViewPager.setAdapter(fragmentAdapter); mBind.vpMessage.setAdapter(fragmentAdapter);
messageTablayout.setupWithViewPager(messageViewPager); mBind.tbMessage.setupWithViewPager( mBind.vpMessage);
messageTablayout.removeAllTabs(); mBind.tbMessage.removeAllTabs();
messageTablayout.addTab(messageTablayout.newTab().setText(mActivity.getString(R.string.message_system))); mBind.tbMessage.addTab(mBind.tbMessage.newTab().setText(mActivity.getString(R.string.message_system)));
messageTablayout.addTab(messageTablayout.newTab().setText(mActivity.getString(R.string.message_dayu))); mBind.tbMessage.addTab(mBind.tbMessage.newTab().setText(mActivity.getString(R.string.message_dayu)));
messageTablayout.setTabMode(TabLayout.MODE_FIXED); mBind.tbMessage.setTabMode(TabLayout.MODE_FIXED);
TabLayoutUtils.setIndicator(messageTablayout, 60, 60, R.color.cl_receiving_order_item_data, getActivity()); TabLayoutUtils.setIndicator(mBind.tbMessage, 60, 60, R.color.cl_receiving_order_item_data, getActivity());
if (mIndex != -1) { if (mIndex != -1) {
messageViewPager.setCurrentItem(mIndex); mBind.vpMessage.setCurrentItem(mIndex);
messageTablayout.getTabAt(mIndex).select(); mBind.tbMessage.getTabAt(mIndex).select();
} }
} }
public void swtichFragment(int position) { public void swtichFragment(int position) {
if (messageTablayout == null || messageTablayout.getTabAt(position) == null) { if (mBind.tbMessage == null || mBind.tbMessage.getTabAt(position) == null) {
return; return;
} }
messageViewPager.setCurrentItem(position); mBind.vpMessage.setCurrentItem(position);
messageTablayout.getTabAt(position).select(); mBind.tbMessage.getTabAt(position).select();
} }
public void setIndex(int index) { public void setIndex(int index) {
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeOrderFragment.java
...@@ -6,15 +6,15 @@ import android.graphics.Typeface; ...@@ -6,15 +6,15 @@ import android.graphics.Typeface;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.TabLayout; import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.bean.Tab; import com.dayu.bigfish.bean.Tab;
import com.dayu.bigfish.bean.event.RefreshTab; import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.databinding.FragmentOrderHomeBinding;
import com.dayu.bigfish.presenter.homeorder.HomeOrderContract; import com.dayu.bigfish.presenter.homeorder.HomeOrderContract;
import com.dayu.bigfish.presenter.homeorder.HomeOrderPresenter; import com.dayu.bigfish.presenter.homeorder.HomeOrderPresenter;
import com.dayu.bigfish.ui.OrderRecordActivity; import com.dayu.bigfish.ui.OrderRecordActivity;
...@@ -30,22 +30,14 @@ import org.greenrobot.eventbus.ThreadMode; ...@@ -30,22 +30,14 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import butterknife.BindView;
import butterknife.OnClick;
import static com.dayu.bigfish.R.id.tabicon; import static com.dayu.bigfish.R.id.tabicon;
/** /**
* Created by luofan on 2017/11/20. * Created by luofan on 2017/11/20.
*/ */
public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implements HomeOrderContract.View { public class HomeOrderFragment extends BaseBingFragment<HomeOrderPresenter, FragmentOrderHomeBinding>
@BindView(R.id.home_tabLayout) implements HomeOrderContract.View {
TabLayout mTabLayout;
@BindView(R.id.view_pager)
ViewPager mViewPager;
@BindView(R.id.title_right)
TextView mTitleRight;
public List<Fragment> list_fragments; public List<Fragment> list_fragments;
private FragmentHomeAdapter adapter; private FragmentHomeAdapter adapter;
private int userId; private int userId;
...@@ -60,6 +52,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen ...@@ -60,6 +52,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
public final static int ORDER_NOCONTACT_FINISH = 7;//无联系人已完成 public final static int ORDER_NOCONTACT_FINISH = 7;//无联系人已完成
private int mTabIndex; private int mTabIndex;
private String[] tabDesc; private String[] tabDesc;
private int mSiteId;
public static HomeOrderFragment newInstance() { public static HomeOrderFragment newInstance() {
Bundle args = new Bundle(); Bundle args = new Bundle();
...@@ -77,7 +70,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen ...@@ -77,7 +70,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_home; return R.layout.fragment_order_home;
} }
@Override @Override
...@@ -93,13 +86,14 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen ...@@ -93,13 +86,14 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
public void init() { public void init() {
tabDesc = new String[]{mActivity.getString(R.string.waite_appointemnt), mActivity.getString(R.string.waite_server), mActivity.getString(R.string.order_exception), mActivity.getString(R.string.cancle_order)}; tabDesc = new String[]{mActivity.getString(R.string.waite_appointemnt), mActivity.getString(R.string.waite_server), mActivity.getString(R.string.order_exception), mActivity.getString(R.string.cancle_order)};
userId = GetUserInfo.getACCOUNT_ID(mActivity); userId = GetUserInfo.getACCOUNT_ID(mActivity);
mSiteId = GetUserInfo.getSITE_ID(mActivity);
mBind.tvRightTitle.setOnClickListener(o -> {
Intent intent = new Intent(mActivity, OrderRecordActivity.class);
mActivity.startActivity(intent);
});
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
} }
@Subscribe(threadMode = ThreadMode.MAIN)
public void onRefreshTab(RefreshTab event) {
initNetWorkTabNum(userId, event.getTabNum());
}
public void initData() { public void initData() {
list_fragments = new ArrayList<>(); list_fragments = new ArrayList<>();
...@@ -108,15 +102,15 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen ...@@ -108,15 +102,15 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
list_fragments.add(new OrderThreeTabFragment()); list_fragments.add(new OrderThreeTabFragment());
list_fragments.add(new OrderFourTabFragment()); list_fragments.add(new OrderFourTabFragment());
adapter = new FragmentHomeAdapter(getFragmentManager(), list_fragments); adapter = new FragmentHomeAdapter(getFragmentManager(), list_fragments);
mViewPager.setAdapter(adapter); mBind.vpHome.setAdapter(adapter);
mTabLayout.setupWithViewPager(mViewPager); mBind.tbHome.setupWithViewPager(mBind.vpHome);
mTabLayout.setTabMode(TabLayout.MODE_FIXED); mBind.tbHome.setTabMode(TabLayout.MODE_FIXED);
mViewPager.setOffscreenPageLimit(4); mBind.vpHome.setOffscreenPageLimit(4);
mViewPager.setCurrentItem(0); mBind.vpHome.setCurrentItem(0);
mTabLayout.post(() -> { mBind.tbHome.post(() -> {
TabLayoutUtils.setIndicator(mTabLayout, 15, 15, R.color.cl_order_item_line_bg, mActivity); TabLayoutUtils.setIndicator(mBind.tbHome, 15, 15, R.color.cl_order_item_line_bg, mActivity);
}); });
mTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { mBind.tbHome.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override @Override
public void onTabSelected(TabLayout.Tab tab) { public void onTabSelected(TabLayout.Tab tab) {
int temp = tab.getPosition(); int temp = tab.getPosition();
...@@ -129,20 +123,20 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen ...@@ -129,20 +123,20 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
case 0: case 0:
mTabNumTv.setTextColor(getResources().getColor(R.color.cl_order_item_date)); mTabNumTv.setTextColor(getResources().getColor(R.color.cl_order_item_date));
mTabTextTv.setTextColor(getResources().getColor(R.color.cl_order_item_date)); mTabTextTv.setTextColor(getResources().getColor(R.color.cl_order_item_date));
mViewPager.setCurrentItem(0); mBind.vpHome.setCurrentItem(0);
break; break;
case 1: case 1:
mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_yellow)); mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_yellow));
mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_yellow)); mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_yellow));
mViewPager.setCurrentItem(1); mBind.vpHome.setCurrentItem(1);
break; break;
case 2: case 2:
mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_read)); mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_read));
mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_read)); mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_read));
mViewPager.setCurrentItem(2); mBind.vpHome.setCurrentItem(2);
break; break;
case 3: case 3:
mViewPager.setCurrentItem(3); mBind.vpHome.setCurrentItem(3);
break; break;
} }
} }
...@@ -184,7 +178,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen ...@@ -184,7 +178,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
private void initNetWorkTabNum(int userId, int tabIndex) { private void initNetWorkTabNum(int userId, int tabIndex) {
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
mTabIndex = tabIndex; mTabIndex = tabIndex;
mPresenter.getTabNum(userId); mPresenter.getTabNum(userId, mSiteId);
} }
/** /**
...@@ -194,22 +188,22 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen ...@@ -194,22 +188,22 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
String[] tabNum = new String[]{tab.getReservation() + "", tab.getPendingservice() + "", String[] tabNum = new String[]{tab.getReservation() + "", tab.getPendingservice() + "",
tab.getError() + "", tab.getCanceled() + ""}; tab.getError() + "", tab.getCanceled() + ""};
if (isFirstAddTab) { if (isFirstAddTab) {
mTabLayout.removeAllTabs(); mBind.tbHome.removeAllTabs();
mTabLayout.addTab(mTabLayout.newTab().setCustomView(CreatTab(tabNum[0], tabDesc[0]))); mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab(tabNum[0], tabDesc[0])));
mTabLayout.addTab(mTabLayout.newTab().setCustomView(CreatTab(tabNum[1], tabDesc[1]))); mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab(tabNum[1], tabDesc[1])));
mTabLayout.addTab(mTabLayout.newTab().setCustomView(CreatTab(tabNum[2], tabDesc[2]))); mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab(tabNum[2], tabDesc[2])));
mTabLayout.addTab(mTabLayout.newTab().setCustomView(CreatTab(tabNum[3], tabDesc[3]))); mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab(tabNum[3], tabDesc[3])));
isFirstAddTab = false; isFirstAddTab = false;
} else { } else {
for (int i = 0; i < mTabLayout.getTabCount(); i++) { for (int i = 0; i < mBind.tbHome.getTabCount(); i++) {
TextView tv = (TextView) mTabLayout.getTabAt(i).getCustomView().findViewById(R.id.tabtext); TextView tv = (TextView) mBind.tbHome.getTabAt(i).getCustomView().findViewById(R.id.tabtext);
TextView tvIcon = (TextView) mTabLayout.getTabAt(i).getCustomView().findViewById(R.id.tabicon); TextView tvIcon = (TextView) mBind.tbHome.getTabAt(i).getCustomView().findViewById(R.id.tabicon);
tv.setText(tabNum[i]); tv.setText(tabNum[i]);
tvIcon.setText(tabDesc[i]); tvIcon.setText(tabDesc[i]);
} }
if (myTabIndex != -1) { if (myTabIndex != -1) {
mViewPager.setCurrentItem(myTabIndex); mBind.vpHome.setCurrentItem(myTabIndex);
mTabLayout.getTabAt(myTabIndex).select(); mBind.tbHome.getTabAt(myTabIndex).select();
} }
} }
} }
...@@ -234,21 +228,15 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen ...@@ -234,21 +228,15 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
return newtab; return newtab;
} }
@OnClick(R.id.title_right)
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.title_right:
Intent intent = new Intent(mActivity, OrderRecordActivity.class);
mActivity.startActivity(intent);
break;
}
}
@Override @Override
public void getTabNumSuccess(Tab tab) { public void getTabNumSuccess(Tab tab) {
setTabNum(tab, mTabIndex); setTabNum(tab, mTabIndex);
} }
@Subscribe(threadMode = ThreadMode.MAIN)
public void onRefreshTab(RefreshTab event) {
initNetWorkTabNum(userId, event.getTabNum());
}
@Override @Override
public void onDetach() { public void onDetach() {
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomePersonFragment.java
...@@ -12,7 +12,6 @@ import android.view.View; ...@@ -12,7 +12,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
...@@ -20,64 +19,36 @@ import com.bumptech.glide.request.RequestOptions; ...@@ -20,64 +19,36 @@ import com.bumptech.glide.request.RequestOptions;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.bean.AlipayInfo; import com.dayu.bigfish.bean.AlipayInfo;
import com.dayu.bigfish.bean.EngineerInfo; import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.OrderRecord; import com.dayu.bigfish.bean.OrderRecord;
import com.dayu.bigfish.bean.TodayAchievement; import com.dayu.bigfish.bean.TodayAchievement;
import com.dayu.bigfish.bean.TodayBalance; import com.dayu.bigfish.bean.TodayBalance;
import com.dayu.bigfish.databinding.FragmentPersonalCenterBinding;
import com.dayu.bigfish.presenter.homefourtab.HomeFourContract; import com.dayu.bigfish.presenter.homefourtab.HomeFourContract;
import com.dayu.bigfish.presenter.homefourtab.HomeFourPresenter; import com.dayu.bigfish.presenter.homefourtab.HomeFourPresenter;
import com.dayu.bigfish.ui.AccountBalanceActivity; import com.dayu.bigfish.ui.AccountBalanceActivity;
import com.dayu.bigfish.ui.OrderRecordActivity; import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.bigfish.ui.SettingActivity; import com.dayu.bigfish.ui.SettingActivity;
import com.dayu.bigfish.ui.WithdrawalsActivity; import com.dayu.bigfish.ui.WithdrawalsActivity;
import com.dayu.bigfish.ui.views.CircleImageView;
import com.dayu.bigfish.ui.views.CustomDialog; import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ProgressUtil; import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.SPUtils; import com.dayu.bigfish.utils.SPUtils;
import butterknife.BindView;
import butterknife.OnClick;
/** /**
* Created by luofan on 2017/11/20. * Created by luofan on 2017/11/20.
*/ */
public class HomePersonFragment extends BaseFragment<HomeFourPresenter> implements HomeFourContract.View { public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, FragmentPersonalCenterBinding>
@BindView(R.id.person_circle) implements HomeFourContract.View {
CircleImageView personCircle;
@BindView(R.id.person_name)
TextView personName;
@BindView(R.id.person_sex)
TextView personSex;
@BindView(R.id.person_age)
TextView personAge;
@BindView(R.id.person_phone)
TextView personPhone;
@BindView(R.id.person_evaluate)
TextView personEvaluate;
@BindView(R.id.person_evaluate_xing)
LinearLayout personEvaluateXing;
@BindView(R.id.text_yeji_num)
TextView textYejiNum;
@BindView(R.id.text_jiedan_num)
TextView textJiedanNum;
@BindView(R.id.text_leiji_num)
TextView textLeijiNum;
@BindView(R.id.text_gongdan_num)
TextView textGongdanNum;
@BindView(R.id.tv_todaybalance)
TextView mtodayBalanceTv;
@BindView(R.id.ll_todaybalance)
LinearLayout mLTodayBalance;
private int userId; private int userId;
private int siteId; private int siteId;
private String imageUrl;//头像信息 private String mHeaderUrl;
private String userName; private String mUserName;
private String userPhone; private String mUserPhone;
private String evaluate; private String mScore;
private int mAccountBalance; private int mAccountBalance;
public static HomePersonFragment newInstance() { public static HomePersonFragment newInstance() {
...@@ -93,27 +64,44 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter> implemen ...@@ -93,27 +64,44 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter> implemen
siteId = GetUserInfo.getSITE_ID(MyApplication.getContext()); siteId = GetUserInfo.getSITE_ID(MyApplication.getContext());
AssetManager mgr = mActivity.getAssets(); AssetManager mgr = mActivity.getAssets();
Typeface tf = Typeface.createFromAsset(mgr, "fonts/DIN Alternate Bold.ttf"); Typeface tf = Typeface.createFromAsset(mgr, "fonts/DIN Alternate Bold.ttf");
textYejiNum.setTypeface(tf); mBind.tvAchivement.setTypeface(tf);
textJiedanNum.setTypeface(tf); mBind.tvAccountBalance.setTypeface(tf);
textLeijiNum.setTypeface(tf); mBind.tvAllAchivement.setTypeface(tf);
textGongdanNum.setTypeface(tf); mBind.tvOrderRecord.setTypeface(tf);
imageUrl = GetUserInfo.getUserHead(mActivity); mHeaderUrl = GetUserInfo.getUserHead(mActivity);
if (TextUtils.isEmpty(imageUrl)) { if (TextUtils.isEmpty(mHeaderUrl)) {
personCircle.setImageResource(R.mipmap.user_head); mBind.ivHeader.setImageResource(R.mipmap.user_head);
} else { } else {
RequestOptions options = new RequestOptions() RequestOptions options = new RequestOptions()
.diskCacheStrategy(DiskCacheStrategy.ALL); .diskCacheStrategy(DiskCacheStrategy.ALL);
Glide.with(this) Glide.with(this)
.load(imageUrl) .load(mHeaderUrl)
.apply(options) .apply(options)
.into(personCircle); .into(mBind.ivHeader);
} }
initListener();
return view; return view;
} }
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_personal_center; return R.layout.fragment_personal_center;
}
private void initListener() {
mBind.ivSetting.setOnClickListener(o -> {
Intent intentSetting = new Intent(mActivity, SettingActivity.class);
startActivity(intentSetting);
});
mBind.rlOrderRecord.setOnClickListener(o -> {
Intent intent = new Intent(mActivity, OrderRecordActivity.class);
startActivity(intent);
});
mBind.rlAccountBalcance.setOnClickListener(o -> {
Intent intent = new Intent(mActivity, AccountBalanceActivity.class);
intent.putExtra(Constants.ACCOUNT_BALANCE, mAccountBalance);
startActivity(intent);
});
} }
...@@ -124,41 +112,21 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter> implemen ...@@ -124,41 +112,21 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter> implemen
mPresenter.getAlipayAccount(userId); mPresenter.getAlipayAccount(userId);
} }
@OnClick({R.id.person_setting, R.id.rl_gd, R.id.rl_yue})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.person_setting:
Intent intentSetting = new Intent(mActivity, SettingActivity.class);
startActivity(intentSetting);
break;
case R.id.rl_gd:
Intent intent = new Intent(mActivity, OrderRecordActivity.class);
startActivity(intent);
break;
case R.id.rl_yue:
Intent intent1 = new Intent(mActivity, AccountBalanceActivity.class);
intent1.putExtra(Constants.ACCOUNT_BALANCE, mAccountBalance);
startActivity(intent1);
default:
break;
}
}
public void fillData(EngineerInfo info) { public void fillData(EngineerInfo info) {
userName = info.getRealName(); mUserName = info.getRealName();
personName.setText(userName); mBind.tvName.setText(mUserName);
SPUtils.put(mActivity, "USER_NAME", userName); SPUtils.put(mActivity, "USER_NAME", mUserName);
if (info.getGender() == 1) { if (info.getGender() == 1) {
personSex.setText(mActivity.getString(R.string.man)); mBind.tvSex.setText(mActivity.getString(R.string.man));
} else if (info.getGender() == 0) { } else if (info.getGender() == 0) {
personSex.setText(mActivity.getString(R.string.female)); mBind.tvSex.setText(mActivity.getString(R.string.female));
} else { } else {
personSex.setText(mActivity.getString(R.string.unknown)); mBind.tvSex.setText(mActivity.getString(R.string.unknown));
} }
personAge.setText(info.getAge() + mActivity.getString(R.string.age)); mBind.tvAge.setText(info.getAge() + mActivity.getString(R.string.age));
userPhone = info.getMobile(); mUserPhone = info.getMobile();
personPhone.setText(userPhone); mBind.tvPhone.setText(mUserPhone);
SPUtils.put(mActivity, "USER_PHONE", userPhone); SPUtils.put(mActivity, "USER_PHONE", mUserPhone);
} }
private void showAlertDialog() { private void showAlertDialog() {
...@@ -188,31 +156,31 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter> implemen ...@@ -188,31 +156,31 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter> implemen
@Override @Override
public void getAchievementSuccess(TodayAchievement achievement) { public void getAchievementSuccess(TodayAchievement achievement) {
textYejiNum.setText(achievement.getAchievement() + ""); mBind.tvAchivement.setText(achievement.getAchievement() + "");
} }
@Override @Override
public void getOrderRecordSuccess(OrderRecord record) { public void getOrderRecordSuccess(OrderRecord record) {
//累计业绩 //累计业绩
textLeijiNum.setText(record.getCumulativeIncome() + ""); mBind.tvAllAchivement.setText(record.getCumulativeIncome() + "");
//工单记录 //工单记录
textGongdanNum.setText(record.getOrderRecord() + ""); mBind.tvOrderRecord.setText(record.getOrderRecord() + "");
//个人评分 //个人评分
personEvaluate.setText(record.getScore() + mActivity.getString(R.string.score)); mBind.tvScore.setText(record.getScore() + mActivity.getString(R.string.score));
evaluate = record.getScore() + ""; mScore = record.getScore() + "";
drawStars(personEvaluateXing, evaluate, "5"); drawStars(mBind.tvStar, mScore, "5");
} }
@Override @Override
public void getAccountBalanceSuccess(TodayBalance todayBalance) { public void getAccountBalanceSuccess(TodayBalance todayBalance) {
if (todayBalance != null) { if (todayBalance != null) {
mAccountBalance = todayBalance.getAccountBalance(); mAccountBalance = todayBalance.getAccountBalance();
textJiedanNum.setText(mAccountBalance + ""); mBind.tvAccountBalance.setText(mAccountBalance + "");
mtodayBalanceTv.setText(todayBalance.getTodaySubSidymoney() + ""); mBind.tvTodaybalance.setText(todayBalance.getTodaySubSidymoney() + "");
if (todayBalance.getTodaySubSidymoney() == 0) { if (todayBalance.getTodaySubSidymoney() == 0) {
mLTodayBalance.setVisibility(View.GONE); mBind.llTodaybalance.setVisibility(View.GONE);
} else { } else {
mLTodayBalance.setVisibility(View.VISIBLE); mBind.llTodaybalance.setVisibility(View.VISIBLE);
} }
} }
} }
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDatailsServeFragment.java
package com.dayu.bigfish.ui.fragment; package com.dayu.bigfish.ui.fragment;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.View; import android.view.View;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.bean.OrderDetail; import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.databinding.FragmentOrderServeBinding;
import com.dayu.bigfish.presenter.orderdetailserve.OrderDetailServeContract; import com.dayu.bigfish.presenter.orderdetailserve.OrderDetailServeContract;
import com.dayu.bigfish.presenter.orderdetailserve.OrderDetailServePresenter; import com.dayu.bigfish.presenter.orderdetailserve.OrderDetailServePresenter;
import com.dayu.bigfish.ui.adapter.ServeDatailsAdapter; import com.dayu.bigfish.ui.adapter.ServeDatailsAdapter;
import com.dayu.bigfish.utils.ProgressUtil; import com.dayu.bigfish.utils.ProgressUtil;
import butterknife.BindView;
/** /**
* 服务记录的Fragment * 服务记录的Fragment
* on 2017/9/13. * on 2017/9/13.
*/ */
public class OrderDatailsServeFragment extends BaseFragment<OrderDetailServePresenter> implements OrderDetailServeContract.View { public class OrderDatailsServeFragment extends BaseBingFragment<OrderDetailServePresenter, FragmentOrderServeBinding> implements OrderDetailServeContract.View {
@BindView(R.id.serve_list_view)
RecyclerView mRecyclerView;
private int orderId; private int orderId;
private ServeDatailsAdapter mAdapter; private ServeDatailsAdapter mAdapter;
...@@ -30,9 +26,9 @@ public class OrderDatailsServeFragment extends BaseFragment<OrderDetailServePres ...@@ -30,9 +26,9 @@ public class OrderDatailsServeFragment extends BaseFragment<OrderDetailServePres
public View initView(View view) { public View initView(View view) {
orderId = getArguments().getInt("orderId"); orderId = getArguments().getInt("orderId");
mAdapter = new ServeDatailsAdapter(R.layout.serve_datails_item); mAdapter = new ServeDatailsAdapter(R.layout.serve_datails_item);
mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity)); mBind.recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
mRecyclerView.setAdapter(mAdapter); mBind.recyclerView.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView); mAdapter.disableLoadMoreIfNotFullPage(mBind.recyclerView);
return null; return null;
} }
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFirstTabFragment.java
...@@ -3,17 +3,17 @@ package com.dayu.bigfish.ui.fragment; ...@@ -3,17 +3,17 @@ package com.dayu.bigfish.ui.fragment;
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.view.View; import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BasePageBean; import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order; import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.event.RefreshApoiment; import com.dayu.bigfish.bean.event.RefreshApoiment;
import com.dayu.bigfish.bean.event.RefreshTab; import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.databinding.FragmentRecyclerBinding;
import com.dayu.bigfish.presenter.AppointmentOrder.AppointmentContract; import com.dayu.bigfish.presenter.AppointmentOrder.AppointmentContract;
import com.dayu.bigfish.presenter.AppointmentOrder.AppointmentPresenter; import com.dayu.bigfish.presenter.AppointmentOrder.AppointmentPresenter;
import com.dayu.bigfish.ui.OrderDetailsActivity; import com.dayu.bigfish.ui.OrderDetailsActivity;
...@@ -25,18 +25,13 @@ import org.greenrobot.eventbus.EventBus; ...@@ -25,18 +25,13 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode; import org.greenrobot.eventbus.ThreadMode;
import butterknife.BindView;
/** /**
* 待预约的Fragment * 待预约的Fragment
*/ */
public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> implements AppointmentContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener { public class OrderFirstTabFragment extends BaseBingFragment<AppointmentPresenter,FragmentRecyclerBinding> implements AppointmentContract.View,
@BindView(R.id.order_one_refersh) SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
SwipeRefreshLayout mRefreshLayout;
@BindView(R.id.recyle_tab_one)
RecyclerView mRecyclerView;
private OrderDoingAdapter mAdapter; private OrderDoingAdapter mAdapter;
private int siteId; private int siteId;
private int userId; private int userId;
...@@ -51,11 +46,11 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im ...@@ -51,11 +46,11 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im
siteId = GetUserInfo.getSITE_ID(mActivity); siteId = GetUserInfo.getSITE_ID(mActivity);
userId = GetUserInfo.getACCOUNT_ID(mActivity); userId = GetUserInfo.getACCOUNT_ID(mActivity);
mAdapter = new OrderDoingAdapter(R.layout.fragment_orderdoing_item, mActivity); mAdapter = new OrderDoingAdapter(R.layout.fragment_orderdoing_item, mActivity);
mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity)); mBind.recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
mRecyclerView.setAdapter(mAdapter); mBind.recyclerView.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView); mAdapter.disableLoadMoreIfNotFullPage(mBind.recyclerView);
mRefreshLayout.setOnRefreshListener(this); mBind.spRefersh.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mRecyclerView); mAdapter.setOnLoadMoreListener(this, mBind.recyclerView);
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
mAdapter.setEnableLoadMore(false); mAdapter.setEnableLoadMore(false);
mPresenter.getWatingOrder(Constants.APPOIMENT_ORDER, userId, siteId, mPage, mPageSize); mPresenter.getWatingOrder(Constants.APPOIMENT_ORDER, userId, siteId, mPage, mPageSize);
...@@ -69,7 +64,7 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im ...@@ -69,7 +64,7 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.fragment_tab_order; return R.layout.fragment_recycler;
} }
...@@ -104,8 +99,8 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im ...@@ -104,8 +99,8 @@ 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); mBind.recyclerView.smoothScrollToPosition(0);
mRefreshLayout.setRefreshing(false); mBind.spRefersh.setRefreshing(false);
mAdapter.setNewData(data.getData()); mAdapter.setNewData(data.getData());
mAdapter.setEnableLoadMore(true); mAdapter.setEnableLoadMore(true);
} else { } else {
...@@ -125,7 +120,7 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im ...@@ -125,7 +120,7 @@ public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter> im
@Override @Override
public void getWatingOrderFial() { public void getWatingOrderFial() {
if (mRefreshState == 1) { if (mRefreshState == 1) {
mRefreshLayout.setRefreshing(false); mBind.spRefersh.setRefreshing(false);
mAdapter.setEmptyView(R.layout.tips_loading_failed); mAdapter.setEmptyView(R.layout.tips_loading_failed);
mAdapter.setEnableLoadMore(true); mAdapter.setEnableLoadMore(true);
} }
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFourTabFragment.java
...@@ -3,16 +3,16 @@ package com.dayu.bigfish.ui.fragment; ...@@ -3,16 +3,16 @@ package com.dayu.bigfish.ui.fragment;
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.view.View; import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BasePageBean; import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order; import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.event.RefreshTab; import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.databinding.FragmentRecyclerBinding;
import com.dayu.bigfish.presenter.AppointmentOrder.AppointmentContract; import com.dayu.bigfish.presenter.AppointmentOrder.AppointmentContract;
import com.dayu.bigfish.presenter.AppointmentOrder.AppointmentPresenter; import com.dayu.bigfish.presenter.AppointmentOrder.AppointmentPresenter;
import com.dayu.bigfish.ui.OrderDetailsActivity; import com.dayu.bigfish.ui.OrderDetailsActivity;
...@@ -22,19 +22,13 @@ import com.dayu.bigfish.utils.ProgressUtil; ...@@ -22,19 +22,13 @@ import com.dayu.bigfish.utils.ProgressUtil;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import butterknife.BindView;
/** /**
* 已取消的Fragment * 已取消的Fragment
* on 2017/8/31. * on 2017/8/31.
*/ */
public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter> implements AppointmentContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener { public class OrderFourTabFragment extends BaseBingFragment<AppointmentPresenter, FragmentRecyclerBinding> implements AppointmentContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
@BindView(R.id.order_one_refersh)
SwipeRefreshLayout mRefreshLayout;
@BindView(R.id.recyle_tab_one)
RecyclerView mRecyclerView;
private OrderFourTabAdapter mAdapter; private OrderFourTabAdapter mAdapter;
private int siteId; private int siteId;
private int userId; private int userId;
...@@ -48,10 +42,10 @@ public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter> imp ...@@ -48,10 +42,10 @@ public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter> imp
siteId = GetUserInfo.getSITE_ID(mActivity); siteId = GetUserInfo.getSITE_ID(mActivity);
userId = GetUserInfo.getACCOUNT_ID(mActivity); userId = GetUserInfo.getACCOUNT_ID(mActivity);
mAdapter = new OrderFourTabAdapter(R.layout.fragment_order_cancle_item); mAdapter = new OrderFourTabAdapter(R.layout.fragment_order_cancle_item);
mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity)); mBind.recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
mRecyclerView.setAdapter(mAdapter); mBind.recyclerView.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView); mAdapter.disableLoadMoreIfNotFullPage(mBind.recyclerView);
mRefreshLayout.setOnRefreshListener(this); mBind.spRefersh.setOnRefreshListener(this);
initListener(); initListener();
return view; return view;
} }
...@@ -63,7 +57,7 @@ public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter> imp ...@@ -63,7 +57,7 @@ public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter> imp
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.fragment_tab_order; return R.layout.fragment_recycler;
} }
protected void initData() { protected void initData() {
...@@ -88,7 +82,8 @@ public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter> imp ...@@ -88,7 +82,8 @@ public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter> imp
mTotalPage = data.getTotalPages(); mTotalPage = data.getTotalPages();
mPageSize = data.getPageSize(); mPageSize = data.getPageSize();
if (mRefreshState == 1) { if (mRefreshState == 1) {
mRefreshLayout.setRefreshing(false); mBind.recyclerView.smoothScrollToPosition(0);
mBind.spRefersh.setRefreshing(false);
mAdapter.setNewData(data.getData()); mAdapter.setNewData(data.getData());
mAdapter.setEnableLoadMore(true); mAdapter.setEnableLoadMore(true);
} else { } else {
...@@ -107,11 +102,11 @@ public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter> imp ...@@ -107,11 +102,11 @@ public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter> imp
@Override @Override
public void getWatingOrderFial() { public void getWatingOrderFial() {
if (mRefreshLayout.isRefreshing()) { if (mRefreshState == 1) {
mRefreshLayout.setRefreshing(false); mBind.spRefersh.setRefreshing(false);
mAdapter.setEmptyView(R.layout.tips_loading_failed); mAdapter.setEmptyView(R.layout.tips_loading_failed);
mAdapter.setEnableLoadMore(true);
} }
mAdapter.setEnableLoadMore(true);
mAdapter.loadMoreFail(); mAdapter.loadMoreFail();
mAdapter.getEmptyView().setOnClickListener(v -> { mAdapter.getEmptyView().setOnClickListener(v -> {
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderSecondTabFragment.java
...@@ -3,18 +3,18 @@ package com.dayu.bigfish.ui.fragment; ...@@ -3,18 +3,18 @@ package com.dayu.bigfish.ui.fragment;
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.view.View; import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BasePageBean; import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order; import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.event.OrderState; import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.bean.event.RefreshServe; import com.dayu.bigfish.bean.event.RefreshServe;
import com.dayu.bigfish.bean.event.RefreshTab; import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.databinding.FragmentRecyclerBinding;
import com.dayu.bigfish.presenter.serverorder.ServerOrderPresenter; import com.dayu.bigfish.presenter.serverorder.ServerOrderPresenter;
import com.dayu.bigfish.presenter.serverorder.ServerorderContract; import com.dayu.bigfish.presenter.serverorder.ServerorderContract;
import com.dayu.bigfish.ui.OrderDetailsActivity; import com.dayu.bigfish.ui.OrderDetailsActivity;
...@@ -29,8 +29,6 @@ import org.greenrobot.eventbus.ThreadMode; ...@@ -29,8 +29,6 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import butterknife.BindView;
import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_FINISH; import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_FINISH;
import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_NOCONTACT_FINISH; import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_NOCONTACT_FINISH;
import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_SOP_FINISH; import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_SOP_FINISH;
...@@ -42,11 +40,7 @@ import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_YUYUE; ...@@ -42,11 +40,7 @@ import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_YUYUE;
* on 2017/8/31. * on 2017/8/31.
*/ */
public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> implements ServerorderContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener { public class OrderSecondTabFragment extends BaseBingFragment<ServerOrderPresenter,FragmentRecyclerBinding> implements ServerorderContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
@BindView(R.id.order_one_refersh)
SwipeRefreshLayout mRefreshLayout;
@BindView(R.id.recyle_tab_one)
RecyclerView mRecyclerView;
private OrderDoingAdapter mAdapter; private OrderDoingAdapter mAdapter;
private int siteId; private int siteId;
private int userId; private int userId;
...@@ -63,11 +57,11 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i ...@@ -63,11 +57,11 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i
userId = GetUserInfo.getACCOUNT_ID(mActivity); userId = GetUserInfo.getACCOUNT_ID(mActivity);
mAdapter = new OrderDoingAdapter(R.layout.fragment_orderdoing_item, getActivity()); mAdapter = new OrderDoingAdapter(R.layout.fragment_orderdoing_item, getActivity());
mAdapter.initPresenter(mPresenter); mAdapter.initPresenter(mPresenter);
mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity)); mBind.recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
mRecyclerView.setAdapter(mAdapter); mBind.recyclerView.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView); mAdapter.disableLoadMoreIfNotFullPage(mBind.recyclerView);
mRefreshLayout.setOnRefreshListener(this); mBind.spRefersh.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mRecyclerView); mAdapter.setOnLoadMoreListener(this, mBind.recyclerView);
mDatas = new ArrayList<>(); mDatas = new ArrayList<>();
initListener(); initListener();
return view; return view;
...@@ -75,7 +69,7 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i ...@@ -75,7 +69,7 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.fragment_tab_order; return R.layout.fragment_recycler;
} }
public void initListener() { public void initListener() {
...@@ -135,8 +129,8 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i ...@@ -135,8 +129,8 @@ 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); mBind.recyclerView.smoothScrollToPosition(0);
mRefreshLayout.setRefreshing(false); mBind.spRefersh.setRefreshing(false);
mAdapter.setNewData(data.getData()); mAdapter.setNewData(data.getData());
mDatas.clear(); mDatas.clear();
mDatas.addAll(data.getData()); mDatas.addAll(data.getData());
...@@ -158,8 +152,8 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i ...@@ -158,8 +152,8 @@ public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter> i
@Override @Override
public void getWatingOrderFial() { public void getWatingOrderFial() {
if (mRefreshLayout.isRefreshing()) { if (mBind.spRefersh.isRefreshing()) {
mRefreshLayout.setRefreshing(false); mBind.spRefersh.setRefreshing(false);
mAdapter.setEmptyView(R.layout.tips_loading_failed); mAdapter.setEmptyView(R.layout.tips_loading_failed);
} }
mAdapter.loadMoreFail(); mAdapter.loadMoreFail();
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderThreeTabFragment.java
...@@ -3,13 +3,13 @@ package com.dayu.bigfish.ui.fragment; ...@@ -3,13 +3,13 @@ package com.dayu.bigfish.ui.fragment;
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.view.View; import android.view.View;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.bean.ErrorOrder; import com.dayu.bigfish.bean.ErrorOrder;
import com.dayu.bigfish.bean.event.RefreshTab; import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.databinding.FragmentRecyclerBinding;
import com.dayu.bigfish.presenter.errororder.ErrorOrderContract; import com.dayu.bigfish.presenter.errororder.ErrorOrderContract;
import com.dayu.bigfish.presenter.errororder.ErrorOrderPresenter; import com.dayu.bigfish.presenter.errororder.ErrorOrderPresenter;
import com.dayu.bigfish.ui.OrderDetailsActivity; import com.dayu.bigfish.ui.OrderDetailsActivity;
...@@ -21,19 +21,13 @@ import org.greenrobot.eventbus.EventBus; ...@@ -21,19 +21,13 @@ import org.greenrobot.eventbus.EventBus;
import java.util.List; import java.util.List;
import butterknife.BindView;
/** /**
* 异常单的Fragment * 异常单的Fragment
* on 2017/8/31. * on 2017/8/31.
*/ */
public class OrderThreeTabFragment extends BaseFragment<ErrorOrderPresenter> implements ErrorOrderContract.View, SwipeRefreshLayout.OnRefreshListener { public class OrderThreeTabFragment extends BaseBingFragment<ErrorOrderPresenter,FragmentRecyclerBinding> implements ErrorOrderContract.View, SwipeRefreshLayout.OnRefreshListener {
@BindView(R.id.order_one_refersh)
SwipeRefreshLayout mRefreshLayout;
@BindView(R.id.recyle_tab_one)
RecyclerView mRecyclerView;
private OrderThreeTabAdapter mAdapter; private OrderThreeTabAdapter mAdapter;
private int siteId; private int siteId;
private int userId; private int userId;
...@@ -44,10 +38,10 @@ public class OrderThreeTabFragment extends BaseFragment<ErrorOrderPresenter> imp ...@@ -44,10 +38,10 @@ public class OrderThreeTabFragment extends BaseFragment<ErrorOrderPresenter> imp
siteId = GetUserInfo.getSITE_ID(mActivity); siteId = GetUserInfo.getSITE_ID(mActivity);
userId = GetUserInfo.getACCOUNT_ID(mActivity); userId = GetUserInfo.getACCOUNT_ID(mActivity);
mAdapter = new OrderThreeTabAdapter(R.layout.fragment_order_error_item); mAdapter = new OrderThreeTabAdapter(R.layout.fragment_order_error_item);
mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity)); mBind.recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
mRecyclerView.setAdapter(mAdapter); mBind.recyclerView.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView); mAdapter.disableLoadMoreIfNotFullPage(mBind.recyclerView);
mRefreshLayout.setOnRefreshListener(this); mBind.spRefersh.setOnRefreshListener(this);
initListener(); initListener();
return view; return view;
} }
...@@ -59,7 +53,7 @@ public class OrderThreeTabFragment extends BaseFragment<ErrorOrderPresenter> imp ...@@ -59,7 +53,7 @@ public class OrderThreeTabFragment extends BaseFragment<ErrorOrderPresenter> imp
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.fragment_tab_order; return R.layout.fragment_recycler;
} }
public void initListener() { public void initListener() {
...@@ -80,8 +74,8 @@ public class OrderThreeTabFragment extends BaseFragment<ErrorOrderPresenter> imp ...@@ -80,8 +74,8 @@ public class OrderThreeTabFragment extends BaseFragment<ErrorOrderPresenter> imp
@Override @Override
public void getErrorOrderSuccess(List<ErrorOrder> data) { public void getErrorOrderSuccess(List<ErrorOrder> data) {
EventBus.getDefault().post(new RefreshTab(-1)); EventBus.getDefault().post(new RefreshTab(-1));
if (mRefreshLayout.isRefreshing()) { if (mBind.spRefersh.isRefreshing()) {
mRefreshLayout.setRefreshing(false); mBind.spRefersh.setRefreshing(false);
mAdapter.loadMoreEnd(); mAdapter.loadMoreEnd();
} }
mAdapter.setNewData(data); mAdapter.setNewData(data);
...@@ -92,8 +86,8 @@ public class OrderThreeTabFragment extends BaseFragment<ErrorOrderPresenter> imp ...@@ -92,8 +86,8 @@ public class OrderThreeTabFragment extends BaseFragment<ErrorOrderPresenter> imp
@Override @Override
public void getErrorOrderFial() { public void getErrorOrderFial() {
if (mRefreshLayout.isRefreshing()) { if (mBind.spRefersh.isRefreshing()) {
mRefreshLayout.setRefreshing(false); mBind.spRefersh.setRefreshing(false);
} }
mAdapter.getEmptyView().setOnClickListener(v -> { mAdapter.getEmptyView().setOnClickListener(v -> {
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
......
app/src/main/java/com/dayu/bigfish/ui/fragment/SystemMessageFragment.java
...@@ -3,16 +3,16 @@ package com.dayu.bigfish.ui.fragment; ...@@ -3,16 +3,16 @@ package com.dayu.bigfish.ui.fragment;
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.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BasePageBean; import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.NewMessage; import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.databinding.FragmentMessageSystemBinding;
import com.dayu.bigfish.presenter.message.messageContract; import com.dayu.bigfish.presenter.message.messageContract;
import com.dayu.bigfish.presenter.message.messagePresenter; import com.dayu.bigfish.presenter.message.messagePresenter;
import com.dayu.bigfish.ui.SystemMesDetailActivity; import com.dayu.bigfish.ui.SystemMesDetailActivity;
...@@ -20,19 +20,14 @@ import com.dayu.bigfish.ui.adapter.SystemMessageAdapter; ...@@ -20,19 +20,14 @@ import com.dayu.bigfish.ui.adapter.SystemMessageAdapter;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ProgressUtil; import com.dayu.bigfish.utils.ProgressUtil;
import butterknife.BindView;
/** /**
* 系统工单状态通知 * 系统工单状态通知
* on 2017/10/11. * on 2017/10/11.
*/ */
public class SystemMessageFragment extends BaseFragment<messagePresenter> implements messageContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener { public class SystemMessageFragment extends BaseBingFragment<messagePresenter,FragmentMessageSystemBinding>
@BindView(R.id.rl_sysmessage) implements messageContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
RecyclerView mRecyclerView;
@BindView(R.id.receiving_refersh)
SwipeRefreshLayout mRefreshLayout;
private SystemMessageAdapter mAdapter; private SystemMessageAdapter mAdapter;
private String hxUserId; private String hxUserId;
private int mPage = 1; private int mPage = 1;
...@@ -76,12 +71,12 @@ public class SystemMessageFragment extends BaseFragment<messagePresenter> implem ...@@ -76,12 +71,12 @@ public class SystemMessageFragment extends BaseFragment<messagePresenter> implem
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
mPresenter.getHxMessage(hxUserId, 1, mPage, mPageSize); mPresenter.getHxMessage(hxUserId, 1, mPage, mPageSize);
mAdapter = new SystemMessageAdapter(R.layout.message_adapter); mAdapter = new SystemMessageAdapter(R.layout.message_adapter);
mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); mBind.rlMessage.setLayoutManager(new LinearLayoutManager(getContext()));
mRecyclerView.setAdapter(mAdapter); mBind.rlMessage.setAdapter(mAdapter);
mRefreshLayout.setOnRefreshListener(this); mBind.spRefersh.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mRecyclerView); mAdapter.setOnLoadMoreListener(this, mBind.rlMessage);
mAdapter.setEnableLoadMore(false); mAdapter.setEnableLoadMore(false);
mAdapter.disableLoadMoreIfNotFullPage(mRecyclerView); mAdapter.disableLoadMoreIfNotFullPage(mBind.rlMessage);
initListener(); initListener();
} }
...@@ -90,8 +85,8 @@ public class SystemMessageFragment extends BaseFragment<messagePresenter> implem ...@@ -90,8 +85,8 @@ 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); mBind.rlMessage.smoothScrollToPosition(0);
mRefreshLayout.setRefreshing(false); mBind.spRefersh.setRefreshing(false);
mAdapter.setNewData(message.getData()); mAdapter.setNewData(message.getData());
mAdapter.setEnableLoadMore(true); mAdapter.setEnableLoadMore(true);
} else { } else {
......
app/src/main/java/com/dayu/bigfish/utils/GetUserInfo.java
...@@ -51,6 +51,13 @@ public class GetUserInfo { ...@@ -51,6 +51,13 @@ public class GetUserInfo {
return hxuser; return hxuser;
} }
/** /**
*获取环信密码
* */
public static String getHxPwd(Context context){
String hxuser = (String) SPUtils.get(context, "HXUSER_PWD", "");
return hxuser;
}
/**
*获取工程师头像 *获取工程师头像
* */ * */
public static String getUserHead(Context context){ public static String getUserHead(Context context){
......
app/src/main/java/com/dayu/bigfish/utils/LocationUtils.java
...@@ -7,6 +7,11 @@ import com.amap.api.location.AMapLocationClient; ...@@ -7,6 +7,11 @@ import com.amap.api.location.AMapLocationClient;
import com.amap.api.location.AMapLocationClientOption; import com.amap.api.location.AMapLocationClientOption;
import com.amap.api.location.AMapLocationListener; import com.amap.api.location.AMapLocationListener;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/** /**
* Created by luofan on 2017/11/21. * Created by luofan on 2017/11/21.
*/ */
...@@ -16,6 +21,7 @@ public class LocationUtils { ...@@ -16,6 +21,7 @@ public class LocationUtils {
public static AMapLocationClientOption mLocationOption = null; public static AMapLocationClientOption mLocationOption = null;
public static AMapLocation sLocation = null; public static AMapLocation sLocation = null;
private static boolean flag = true; private static boolean flag = true;
private static Disposable mDisposable;
/** /**
* @param context * @param context
...@@ -68,7 +74,16 @@ public class LocationUtils { ...@@ -68,7 +74,16 @@ public class LocationUtils {
return; return;
} }
flag = true; flag = true;
// 设置定位监听 //刷新有时不回调.
mDisposable = Observable.timer(8000, TimeUnit.MILLISECONDS)
.subscribe(aLong -> {
if (flag) {
ToastUtils.showShortToast("获取定位失败");
listener.result(null);
flag = false;
mlocationClient.stopLocation();
}
});
mlocationClient.setLocationListener(new AMapLocationListener() { mlocationClient.setLocationListener(new AMapLocationListener() {
@Override @Override
...@@ -79,9 +94,11 @@ public class LocationUtils { ...@@ -79,9 +94,11 @@ public class LocationUtils {
mlocationClient.stopLocation(); mlocationClient.stopLocation();
sLocation = location; sLocation = location;
listener.result(location); listener.result(location);
} else if ((location == null)) { } else if ((location == null && flag)) {
flag = false;
mlocationClient.stopLocation(); mlocationClient.stopLocation();
listener.result(location); listener.result(location);
ToastUtils.showShortToast("定位失败了");
} }
} }
}); });
...@@ -94,6 +111,9 @@ public class LocationUtils { ...@@ -94,6 +111,9 @@ public class LocationUtils {
* @Description: 销毁定位，必须在退出程序时调用，否则定位会发生异常 * @Description: 销毁定位，必须在退出程序时调用，否则定位会发生异常
*/ */
public static void destroy() { public static void destroy() {
if (mDisposable != null) {
mDisposable.dispose();
}
mlocationClient.onDestroy(); mlocationClient.onDestroy();
} }
......
app/src/main/java/com/dayu/bigfish/utils/UIUtils.java
...@@ -2,6 +2,8 @@ package com.dayu.bigfish.utils; ...@@ -2,6 +2,8 @@ package com.dayu.bigfish.utils;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Paint;
import android.widget.TextView;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
...@@ -50,13 +52,15 @@ public class UIUtils { ...@@ -50,13 +52,15 @@ public class UIUtils {
public static int getColor(int resId) { public static int getColor(int resId) {
return getResources().getColor(resId); return getResources().getColor(resId);
} }
/** /**
* 得到应用程序的包名 * 得到应用程序的包名
*/ */
public static String getPackageName(){ public static String getPackageName() {
return getContext().getPackageName(); return getContext().getPackageName();
} }
/** /**
* 把一个dp的值转换为px值 * 把一个dp的值转换为px值
* *
...@@ -69,5 +73,22 @@ public class UIUtils { ...@@ -69,5 +73,22 @@ public class UIUtils {
return (int) (dp * density + 0.5f); // 加0.5是为了四舍五入 return (int) (dp * density + 0.5f); // 加0.5是为了四舍五入
} }
/**
* 判断TextView的内容宽度是否超出其可用宽度
*
* @param tv
* @return
*/
public static boolean isOverFlowed(TextView tv) {
int availableWidth = tv.getWidth() - tv.getPaddingLeft() - tv.getPaddingRight();
Paint textViewPaint = tv.getPaint();
float textWidth = textViewPaint.measureText(tv.getText().toString()) / 2;
if (textWidth > availableWidth) {
return true;
} else {
return false;
}
}
} }
app/src/main/res/layout/activity_accountbalance_layout.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"> <layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<import type="com.dayu.bigfish.presenter.accountbalance.AccountBalancePresenter"/>
<variable
name="presenter"
type="AccountBalancePresenter"/>
</data>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -20,11 +29,13 @@ ...@@ -20,11 +29,13 @@
<ImageView <ImageView
android:id="@+id/title_back" android:id="@+id/title_back"
style="@style/title_image_back" style="@style/title_image_back"
android:onClick="@{()->presenter.dumpBack()}"
/> />
<TextView <TextView
android:id="@+id/title_right" android:id="@+id/title_right"
style="@style/title_right_text" style="@style/title_right_text"
android:onClick="@{()->presenter.dumpToWithdrawal()}"
android:text="@string/title_account_balance_right" android:text="@string/title_account_balance_right"
android:textColor="#3faafc" android:textColor="#3faafc"
/> />
...@@ -63,7 +74,8 @@ ...@@ -63,7 +74,8 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/rl_balance" android:id="@+id/rl_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> </android.support.v4.widget.SwipeRefreshLayout>
......
app/src/main/res/layout/activity_login.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"> <layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<import type="com.dayu.bigfish.presenter.login.LoginPresenter"/>
<variable
name="presenter"
type="LoginPresenter"/>
</data>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -156,6 +165,7 @@ ...@@ -156,6 +165,7 @@
android:id="@+id/tv_agreement" android:id="@+id/tv_agreement"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:onClick="@{() ->presenter.dumpAgreement()}"
android:text="@string/agreement_detail" android:text="@string/agreement_detail"
android:textColor="@color/cl_receiving_order_item_data" android:textColor="@color/cl_receiving_order_item_data"
android:textSize="11sp" android:textSize="11sp"
......
app/src/main/res/layout/activity_receiving.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"> <layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<import type="com.dayu.bigfish.presenter.receivingorder.ReceivingPresenter"/>
<variable
name="presenter"
type="com.dayu.bigfish.presenter.receivingorder.ReceivingPresenter"/>
</data>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -10,6 +19,7 @@ ...@@ -10,6 +19,7 @@
<RelativeLayout <RelativeLayout
android:id="@+id/title_back" android:id="@+id/title_back"
style="@style/title" style="@style/title"
android:onClick="@{()->presenter.dumpBack()}"
> >
<TextView <TextView
......
app/src/main/res/layout/fragment_first.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout <LinearLayout
style="@style/title" android:layout_width="match_parent"
> android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
style="@style/title"
>
<TextView
style="@style/text_title"
android:text="@string/schedule"
/>
</RelativeLayout>
<ImageView
style="@style/card_line"
/>
<ImageView
android:id="@+id/iv_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="150dp"
android:src="@mipmap/icon_coming_soon"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_13"
android:text="@string/on_develop"
android:textColor="@color/cl_home_title_text_color"
android:textSize="11.3sp"
/>
<TextView <TextView
style="@style/text_title" android:layout_width="wrap_content"
android:text="@string/schedule" android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8.7dp"
android:text="@string/coming_soon"
android:textColor="#3faafc"
android:textSize="13.3sp"
/> />
</RelativeLayout> </LinearLayout>
</layout>
<ImageView \ No newline at end of file
style="@style/card_line"
/>
<ImageView
android:id="@+id/iv_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="150dp"
android:src="@mipmap/icon_coming_soon"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_13"
android:text="@string/on_develop"
android:textColor="@color/cl_home_title_text_color"
android:textSize="11.3sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8.7dp"
android:text="@string/coming_soon"
android:textColor="#3faafc"
android:textSize="13.3sp"
/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/activity_message.xml → app/src/main/res/layout/fragment_message.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_home_listview_bg">
<RelativeLayout
style="@style/title"
>
<TextView
android:id="@+id/text_title"
style="@style/text_title"
android:text="@string/tv_message"
/>
</RelativeLayout>
<android.support.design.widget.TabLayout <LinearLayout
android:id="@+id/message_tablayout" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:background="@color/cl_white"
app:tabIndicatorColor="@color/cl_receiving_order_item_data"
app:tabSelectedTextColor="@color/cl_receiving_order_item_data"
app:tabTextAppearance="@style/TabLayoutTextStyle"
app:tabTextColor="@color/cl_tab_line"
app:tabMaxWidth="0dp"
app:tabMode="fixed"
/>
<ImageView
style="@style/card_line"
/>
<android.support.v4.view.ViewPager
android:id="@+id/message_view_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_10" android:background="@color/cl_home_listview_bg"
android:background="@color/cl_home_listview_bg"/> android:orientation="vertical">
</LinearLayout>
\ No newline at end of file <RelativeLayout
style="@style/title"
>
<TextView
android:id="@+id/text_title"
style="@style/text_title"
android:text="@string/tv_message"
/>
</RelativeLayout>
<android.support.design.widget.TabLayout
android:id="@+id/tb_message"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:background="@color/cl_white"
app:tabIndicatorColor="@color/cl_receiving_order_item_data"
app:tabMaxWidth="0dp"
app:tabMode="fixed"
app:tabSelectedTextColor="@color/cl_receiving_order_item_data"
app:tabTextAppearance="@style/TabLayoutTextStyle"
app:tabTextColor="@color/cl_tab_line"
/>
<ImageView
style="@style/card_line"
/>
<android.support.v4.view.ViewPager
android:id="@+id/vp_message"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_10"
android:background="@color/cl_home_listview_bg"/>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_message_system.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" <layout xmlns:android="http://schemas.android.com/apk/res/android">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_home_listview_bg"
android:orientation="vertical">
<android.support.v4.widget.SwipeRefreshLayout <RelativeLayout
android:id="@+id/receiving_refersh"
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:orientation="vertical">
<RelativeLayout <android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/sp_refersh"
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 <RelativeLayout
android:id="@+id/rl_sysmessage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="#f5f5f5"
android:layout_marginBottom="2dp" <android.support.v7.widget.RecyclerView
/> android:id="@+id/rl_message"
</RelativeLayout> android:layout_width="match_parent"
</android.support.v4.widget.SwipeRefreshLayout> android:layout_height="match_parent"
</RelativeLayout> android:layout_marginBottom="2dp"
\ No newline at end of file android:background="#f5f5f5"
/>
</RelativeLayout>
</android.support.v4.widget.SwipeRefreshLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_home.xml → app/src/main/res/layout/fragment_order_home.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" <LinearLayout
android:layout_height="match_parent" android:layout_width="match_parent"
android:background="@color/cl_white" android:layout_height="match_parent"
android:orientation="vertical" android:background="@color/cl_white"
> android:orientation="vertical"
<RelativeLayout
style="@style/title"
> >
<TextView <RelativeLayout
style="@style/text_title" style="@style/title"
android:text="@string/order_title" >
/>
<TextView <TextView
android:id="@+id/title_right" style="@style/text_title"
style="@style/title_right_text" android:text="@string/order_title"
android:text="@string/order_history" />
android:textSize="@dimen/dp_13.3"
android:textColor="#3faafc" <TextView
android:id="@+id/tv_right_title"
style="@style/title_right_text"
android:text="@string/order_history"
android:textColor="#3faafc"
android:textSize="@dimen/dp_13.3"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
>
<android.support.design.widget.TabLayout
android:id="@+id/tb_home"
android:layout_width="match_parent"
android:layout_height="78dp"
app:tabIndicatorColor="@color/cl_tab_line"
app:tabMaxWidth="0dp"
app:tabMode="fixed"
/>
</RelativeLayout>
<ImageView
style="@style/card_line"
/> />
</RelativeLayout>
<RelativeLayout <android.support.v4.view.ViewPager
android:layout_width="match_parent" android:id="@+id/vp_home"
android:layout_height="0dp"
android:layout_weight="1"
>
<android.support.design.widget.TabLayout
android:id="@+id/home_tabLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="78dp" android:layout_height="0dp"
app:tabIndicatorColor="@color/cl_tab_line" android:layout_weight="5"
app:tabMaxWidth="0dp"
app:tabMode="fixed"
/> />
</RelativeLayout> </LinearLayout>
<ImageView </layout>
style="@style/card_line" \ No newline at end of file
/>
<android.support.v4.view.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="5"
/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_order_serve.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" <layout xmlns:android="http://schemas.android.com/apk/res/android">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView <RelativeLayout
android:id="@+id/serve_list_view" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent" android:orientation="vertical">
android:background="@color/cl_home_listview_bg"
>
</android.support.v7.widget.RecyclerView> <android.support.v7.widget.RecyclerView
</RelativeLayout> android:id="@+id/recyclerView"
\ No newline at end of file android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_home_listview_bg"
>
</android.support.v7.widget.RecyclerView>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_tab_order.xml → app/src/main/res/layout/fragment_recycler.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" <layout xmlns:android="http://schemas.android.com/apk/res/android">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_home_listview_bg"
>
<android.support.v4.widget.SwipeRefreshLayout <RelativeLayout
android:id="@+id/order_one_refersh"
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"
>
<RelativeLayout <android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/sp_refersh"
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 <RelativeLayout
android:id="@+id/recyle_tab_one"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="#f5f5f5"
/> <android.support.v7.widget.RecyclerView
</RelativeLayout> android:id="@+id/recyclerView"
</android.support.v4.widget.SwipeRefreshLayout> android:layout_width="match_parent"
</RelativeLayout> android:layout_height="match_parent"
\ No newline at end of file android:background="#f5f5f5"
/>
</RelativeLayout>
</android.support.v4.widget.SwipeRefreshLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/strings.xml
...@@ -203,6 +203,7 @@ ...@@ -203,6 +203,7 @@
<string name="loading">加载中</string> <string name="loading">加载中</string>
<string name="order_subsidy">工单补贴</string> <string name="order_subsidy">工单补贴</string>
<string name="order_save_success">数据保存成功</string> <string name="order_save_success">数据保存成功</string>
<string name="no_data">暂无数据</string>
<!--消息--> <!--消息-->
<string name="message_system">系统通知</string> <string name="message_system">系统通知</string>
......
build.gradle
...@@ -6,7 +6,6 @@ buildscript { ...@@ -6,7 +6,6 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'org.greenrobot:greendao-gradle-plugin:3.2.0' classpath 'org.greenrobot:greendao-gradle-plugin:3.2.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
......
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