Skip to content

android / dayu

Go to a project
Commit 4ba8f452 by 罗翻
Options

增加baselibrary

parent 3d08268f
Expand all
Inline Side-by-side
Showing with 230 additions and 312 deletions
app/build.gradle
......@@ -116,6 +116,10 @@ dependencies {
//jsbridge
compile 'com.github.lzyzsd:jsbridge:1.0.4'
//ARouter
// compile "com.alibaba:arouter-api:$arouter_api_version"
// kapt "com.alibaba:arouter-compiler:$arouter_api_version"
kapt project(':apt')
compile project(':annotation_lib')
......
app/src/main/java/com/dayu/bigfish/InitializeActivity.java
......@@ -15,7 +15,7 @@ import android.widget.Toast;
import com.dayu.bigfish.ui.LoginActivity;
import com.dayu.bigfish.ui.MainActivity;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.base.widgets.CustomDialog;
import com.dayu.bigfish.utils.MPermissionUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
......
app/src/main/java/com/dayu/bigfish/MyApplication.java
......@@ -10,9 +10,9 @@ import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.Handler;
import android.support.multidex.MultiDex;
import android.support.multidex.MultiDexApplication;
import com.dayu.base.common.BaseApplication;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.greendao.GreenDaoManager;
import com.dayu.bigfish.utils.LocationUtils;
import com.dayu.bigfish.utils.NetworkConnectChangedReceiver;
......@@ -29,7 +29,7 @@ import java.util.Stack;
* on 2017/8/20.
*/
public class MyApplication extends MultiDexApplication {
public class MyApplication extends BaseApplication {
private static Context mContext;
private static Handler mHandler;
private static int mMainThreadId;
......@@ -64,7 +64,6 @@ public class MyApplication extends MultiDexApplication {
initUM();
//初始化环信
HxManager.getInstance().init(mContext);
MultiDex.install(this);
initTextSize();
}
......
app/src/main/java/com/dayu/bigfish/api/APIService.java
......@@ -2,8 +2,8 @@ package com.dayu.bigfish.api;
import com.dayu.base.api.BaseResponse;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.base.common.Constants;
import com.dayu.base.api.BasePageBean;
import com.dayu.bigfish.bean.AccountBalance;
import com.dayu.bigfish.bean.AlipayInfo;
import com.dayu.bigfish.bean.EngineerInfo;
......
app/src/main/java/com/dayu/bigfish/api/Api.java
......@@ -2,10 +2,11 @@ package com.dayu.bigfish.api;
import android.text.TextUtils;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.base.BaseResponse;
import com.dayu.base.api.BaseResponse;
import com.dayu.base.api.ServerException;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.utils.LogUtils;
import com.dayu.base.utils.LogUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
......
app/src/main/java/com/dayu/bigfish/api/ApiFactory.java
package com.dayu.bigfish.api;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.base.api.BasePageBean;
import com.dayu.bigfish.bean.AccountBalance;
import com.dayu.bigfish.bean.AlipayInfo;
import com.dayu.bigfish.bean.EngineerInfo;
......
app/src/main/java/com/dayu/bigfish/base/BaseFragment.java
......@@ -4,14 +4,17 @@ import android.content.Intent;
import android.databinding.ViewDataBinding;
import android.os.Bundle;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
import com.dayu.base.ui.fragment.BaseBindingFragment;
import com.dayu.bigfish.BR;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.ui.LoginActivity;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.InstanceUtil;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.base.widgets.CustomDialog;
import com.dayu.base.utils.InstanceUtil;
import com.dayu.base.utils.ProgressUtil;
import com.dayu.base.utils.ToastUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.hyphenate.chat.EMClient;
......@@ -20,7 +23,7 @@ import java.lang.reflect.ParameterizedType;
/**
* Created by luo on 2017/11/14.
*/
public abstract class BaseFragment<P extends BasePresenter, B extends ViewDataBinding> extends DataBindingFragment<B>
public abstract class BaseFragment<P extends BasePresenter, B extends ViewDataBinding> extends BaseBindingFragment<B>
implements BaseView {
public P mPresenter;
private boolean isDialogShow = false;
......
app/src/main/java/com/dayu/bigfish/base/BaseListPresenter.java
......@@ -2,6 +2,8 @@ package com.dayu.bigfish.base;
import android.databinding.ObservableField;
import com.dayu.base.presenter.BasePresenter;
/**
* Created by luofan on 2017/12/23.
*/
......
app/src/main/java/com/dayu/bigfish/base/CoreAdapter.java
......@@ -7,8 +7,9 @@ import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import com.dayu.base.api.BasePageBean;
import com.dayu.bigfish.BR;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.ui.listener.OnChildClickListener;
import com.dayu.bigfish.ui.listener.OnItemClickListener;
......
app/src/main/java/com/dayu/bigfish/base/DataBindingActivity.java
package com.dayu.bigfish.base;
import android.app.Activity;
import android.databinding.DataBindingUtil;
import android.databinding.ViewDataBinding;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import com.dayu.base.ui.activity.BaseBindingActivity;
import com.umeng.analytics.MobclickAgent;
public abstract class DataBindingActivity<B extends ViewDataBinding> extends AppCompatActivity {
public Activity mActivity;
public B mBind;
private String mClassName;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
View rootView = getLayoutInflater().inflate(this.getLayoutId(), null, false);
mBind = DataBindingUtil.bind(rootView);
this.setContentView(rootView);
mActivity = this;
mClassName = mActivity.getClass().getSimpleName();
initPresenter();
initView();
}
public abstract class DataBindingActivity<B extends ViewDataBinding> extends BaseBindingActivity<B> {
@Override
public void onResume() {
......@@ -45,14 +26,4 @@ public abstract class DataBindingActivity<B extends ViewDataBinding> extends App
}
MobclickAgent.onPause(mActivity);
}
protected void initPresenter() {
}
public abstract int getLayoutId();
public abstract void initView();
}
app/src/main/java/com/dayu/bigfish/presenter/Withdrawals/WithdrawalsContract.java
package com.dayu.bigfish.presenter.Withdrawals;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
/**
* Created by luo on 2016/8/4.
......
app/src/main/java/com/dayu/bigfish/presenter/Withdrawals/WithdrawalsPresenter.java
......@@ -4,7 +4,7 @@ import android.databinding.ObservableField;
import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.UserInfo;
......
app/src/main/java/com/dayu/bigfish/presenter/accountbalance/AccountBalanceContract.java
......@@ -2,7 +2,7 @@ package com.dayu.bigfish.presenter.accountbalance;
import com.dayu.bigfish.base.BaseListPresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.ui.BaseView;
/**
* Created by luo on 2016/8/4.
......
app/src/main/java/com/dayu/bigfish/presenter/accountbalance/AccountBalancePresenter.java
......@@ -4,7 +4,7 @@ import android.databinding.ObservableField;
import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.WithdrawalsActivity;
......
app/src/main/java/com/dayu/bigfish/presenter/commonSubmite/CommonSubmiteContract.java
package com.dayu.bigfish.presenter.commonSubmite;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
/**
......
app/src/main/java/com/dayu/bigfish/presenter/commonSubmite/CommonSubmitePresenter.java
......@@ -6,11 +6,11 @@ import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.event.RefreshApplyPart;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.utils.UIUtils;
import com.dayu.base.utils.ToastUtils;
import com.dayu.base.utils.UIUtils;
import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
import com.dayu.bigfish.utils.managers.UserManager;
......
app/src/main/java/com/dayu/bigfish/presenter/homefirsttab/HomeFirstContract.java
package com.dayu.bigfish.presenter.homefirsttab;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
/**
* Created by luo on 2016/8/4.
......
app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomeFourContract.java
package com.dayu.bigfish.presenter.homefourtab;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.OrderRecord;
import com.dayu.bigfish.bean.TodayAchievement;
......
app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderContract.java
package com.dayu.bigfish.presenter.homeorder;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
/**
* Created by luo on 2016/8/4.
......
app/src/main/java/com/dayu/bigfish/presenter/kaaddress/KaAddressContract.java
package com.dayu.bigfish.presenter.kaaddress;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
/**
* Created by luo on 2016/8/4.
......
app/src/main/java/com/dayu/bigfish/presenter/kaaddress/KaAddressPresenter.java
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.bean.KaAddress;
import io.reactivex.functions.Consumer;
......
app/src/main/java/com/dayu/bigfish/presenter/login/LoginContract.java
package com.dayu.bigfish.presenter.login;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.base.widgets.CustomDialog;
/**
......
app/src/main/java/com/dayu/bigfish/presenter/login/LoginPresenter.java
......@@ -11,7 +11,7 @@ import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.AgreementActivity;
import com.dayu.bigfish.ui.MainActivity;
import com.dayu.bigfish.ui.PersonInfoActivity;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.base.utils.ToastUtils;
import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
import com.dayu.bigfish.utils.managers.UserManager;
import com.hyphenate.EMCallBack;
......
app/src/main/java/com/dayu/bigfish/presenter/logisticsinfo/LogisticsInfoContract.java
......@@ -2,7 +2,7 @@ package com.dayu.bigfish.presenter.logisticsinfo;
import com.dayu.bigfish.base.BaseListPresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.ui.BaseView;
/**
* Created by luo on 2016/8/4.
......
app/src/main/java/com/dayu/bigfish/presenter/logisticsinfo/LogisticsInfoPresenter.java
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.bean.LogsticsInfo;
import io.reactivex.functions.Consumer;
......
app/src/main/java/com/dayu/bigfish/presenter/main/MainContract.java
package com.dayu.bigfish.presenter.main;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
import com.dayu.bigfish.bean.VersionInfo;
/**
......
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
......@@ -3,10 +3,10 @@ package com.dayu.bigfish.presenter.main;
import android.databinding.ObservableField;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.base.api.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.utils.AppUtils;
......
app/src/main/java/com/dayu/bigfish/presenter/message/messageContract.java
......@@ -2,7 +2,7 @@ package com.dayu.bigfish.presenter.message;
import com.dayu.bigfish.base.BaseListPresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.ui.BaseView;
import com.dayu.bigfish.bean.NewMessage;
/**
......
app/src/main/java/com/dayu/bigfish/presenter/message/messagePresenter.java
......@@ -6,15 +6,15 @@ import android.view.View;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.base.api.BasePageBean;
import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.MessageDetailActivity;
import com.dayu.bigfish.ui.fragment.MessageFragment;
import com.dayu.bigfish.utils.UIUtils;
import com.dayu.base.utils.UIUtils;
import com.dayu.bigfish.utils.UtilsDate;
import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
......
app/src/main/java/com/dayu/bigfish/presenter/modifyperson/ModifyPersonContract.java
package com.dayu.bigfish.presenter.modifyperson;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
import com.dayu.base.widgets.CustomDialog;
/**
* Created by luo on 2016/8/4.
......
app/src/main/java/com/dayu/bigfish/presenter/modifyperson/ModifyPersonPresenter.java
......@@ -7,7 +7,7 @@ import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.EngineerInfo;
......
app/src/main/java/com/dayu/bigfish/presenter/myhead/MyHeadContract.java
package com.dayu.bigfish.presenter.myhead;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
/**
* Created by luo on 2016/8/4.
......
app/src/main/java/com/dayu/bigfish/presenter/orderdetail/OrderDetailContract.java
package com.dayu.bigfish.presenter.orderdetail;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
import com.dayu.bigfish.bean.OrderDetail;
/**
......
app/src/main/java/com/dayu/bigfish/presenter/orderdetail/OrderDetailPresenter.java
......@@ -3,7 +3,7 @@ package com.dayu.bigfish.presenter.orderdetail;
import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.api.ApiFactory;
/**
......
app/src/main/java/com/dayu/bigfish/presenter/orderdoing/OrderDoingPresenter.java
......@@ -4,10 +4,10 @@ import android.databinding.ObservableField;
import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.base.api.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.bean.event.RefreshTab;
......
app/src/main/java/com/dayu/bigfish/presenter/orderdoing/orderDoingContract.java
package com.dayu.bigfish.presenter.orderdoing;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.ui.BaseView;
import com.dayu.bigfish.presenter.BaseOrderPresenter;
import io.reactivex.Observable;
......
app/src/main/java/com/dayu/bigfish/presenter/orderpart/OrderPartContract.java
......@@ -2,7 +2,7 @@ package com.dayu.bigfish.presenter.orderpart;
import com.dayu.bigfish.base.BaseListPresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.ui.BaseView;
import com.dayu.bigfish.bean.OrderPart;
import io.reactivex.Observable;
......
app/src/main/java/com/dayu/bigfish/presenter/orderpart/OrderPartPresenter.java
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.OrderDetail;
......@@ -13,7 +13,7 @@ import com.dayu.bigfish.bean.OrderPart;
import com.dayu.bigfish.ui.CommonSubmiteActivity;
import com.dayu.bigfish.ui.LogisticsInfoActivity;
import com.dayu.bigfish.ui.ReturnPartActivity;
import com.dayu.bigfish.utils.UIUtils;
import com.dayu.base.utils.UIUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
......
app/src/main/java/com/dayu/bigfish/presenter/personinfo/PersonInfoContract.java
package com.dayu.bigfish.presenter.personinfo;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
/**
* Created by luo on 2016/8/4.
......
app/src/main/java/com/dayu/bigfish/presenter/personinfo/PersonInfoPresenter.java
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.UserInfo;
......
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderContract.java
package com.dayu.bigfish.presenter.processorder;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
import java.util.ArrayList;
import java.util.List;
......
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderPresenter.java
......@@ -8,7 +8,7 @@ import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.OrderDetail;
......
app/src/main/java/com/dayu/bigfish/presenter/receivingorder/ReceivingContract.java
package com.dayu.bigfish.presenter.receivingorder;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.ui.BaseView;
import com.dayu.bigfish.presenter.BaseOrderPresenter;
......
app/src/main/java/com/dayu/bigfish/presenter/receivingorder/ReceivingPresenter.java
......@@ -5,10 +5,10 @@ import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.base.api.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.bean.event.RefreshApoiment;
......
app/src/main/java/com/dayu/bigfish/presenter/returnpart/ReturnPartContract.java
......@@ -2,8 +2,8 @@ package com.dayu.bigfish.presenter.returnpart;
import com.bigkoo.pickerview.OptionsPickerView;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
import java.util.List;
......
app/src/main/java/com/dayu/bigfish/presenter/returnpart/ReturnPartPresenter.java
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.bean.OrderPart;
import com.dayu.bigfish.bean.ShipperCompany;
import com.dayu.bigfish.bean.UserInfo;
......
app/src/main/java/com/dayu/bigfish/presenter/serverinstruction/ServerInstructionContract.java
......@@ -2,7 +2,7 @@ package com.dayu.bigfish.presenter.serverinstruction;
import com.dayu.bigfish.base.BaseListPresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.ui.BaseView;
/**
* Created by luo
......
app/src/main/java/com/dayu/bigfish/presenter/serverinstruction/ServerInstructionPresenter.java
......@@ -5,8 +5,8 @@ import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.base.common.Constants;
import com.dayu.base.api.BasePageBean;
import com.dayu.bigfish.bean.ServerInstruction;
import com.dayu.bigfish.ui.WebViewActivity;
......
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingContract.java
package com.dayu.bigfish.presenter.setting;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
import com.dayu.base.widgets.CustomDialog;
/**
* Created by luo on 2016/8/4.
......
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java
......@@ -8,7 +8,7 @@ import android.os.Environment;
import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
......@@ -19,7 +19,7 @@ import com.dayu.bigfish.ui.LoginActivity;
import com.dayu.bigfish.utils.AppUtils;
import com.dayu.bigfish.utils.DataCleanManager;
import com.dayu.bigfish.utils.SPUtils;
import com.dayu.bigfish.utils.UIUtils;
import com.dayu.base.utils.UIUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.hyphenate.EMCallBack;
import com.hyphenate.chat.EMClient;
......
app/src/main/java/com/dayu/bigfish/presenter/subcribeTime/SubcribeContract.java
......@@ -2,8 +2,8 @@ package com.dayu.bigfish.presenter.subcribeTime;
import com.bigkoo.pickerview.TimePickerView;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.presenter.BasePresenter;
import com.dayu.base.ui.BaseView;
/**
* Created by luo
......
app/src/main/java/com/dayu/bigfish/presenter/subcribeTime/SubcribeTimePresenter.java
......@@ -6,14 +6,14 @@ import android.text.TextUtils;
import android.view.View;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.bean.event.RefreshApoiment;
import com.dayu.bigfish.bean.event.RefreshServe;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.utils.UIUtils;
import com.dayu.base.utils.UIUtils;
import com.dayu.bigfish.utils.UtilsDate;
import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
......
app/src/main/java/com/dayu/bigfish/presenter/worksRecord/OrderRecordContract.java
package com.dayu.bigfish.presenter.worksRecord;
import com.dayu.bigfish.base.BaseView;
import com.dayu.base.ui.BaseView;
import com.dayu.bigfish.presenter.BaseOrderPresenter;
/**
......
app/src/main/java/com/dayu/bigfish/presenter/worksRecord/OrderRecordPresenter.java
......@@ -7,9 +7,9 @@ import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.base.api.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.OrderDetailsActivity;
......
app/src/main/java/com/dayu/bigfish/ui/AccountBalanceActivity.java
package com.dayu.bigfish.ui;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.AccountbalanceLayoutBinding;
import com.dayu.bigfish.presenter.accountbalance.AccountBalanceContract;
import com.dayu.bigfish.presenter.accountbalance.AccountBalancePresenter;
......
app/src/main/java/com/dayu/bigfish/ui/CommonSubmiteActivity.java
package com.dayu.bigfish.ui;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityFeedbackBinding;
import com.dayu.bigfish.presenter.commonSubmite.CommonSubmiteContract;
import com.dayu.bigfish.presenter.commonSubmite.CommonSubmitePresenter;
......
app/src/main/java/com/dayu/bigfish/ui/KaAddressActivity.java
package com.dayu.bigfish.ui;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityKaAddressLayoutBinding;
import com.dayu.bigfish.presenter.kaaddress.KaAddressContract;
import com.dayu.bigfish.presenter.kaaddress.KaAddressPresenter;
......
app/src/main/java/com/dayu/bigfish/ui/LoginActivity.java
package com.dayu.bigfish.ui;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.widgets.CustomDialog;
import com.dayu.bigfish.LoginBinding;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.presenter.login.LoginContract;
import com.dayu.bigfish.presenter.login.LoginPresenter;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.TimeCountUtil;
import com.umeng.analytics.MobclickAgent;
......
app/src/main/java/com/dayu/bigfish/ui/LogisticsInfoActivity.java
package com.dayu.bigfish.ui;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityLogisticsInfoBinding;
import com.dayu.bigfish.presenter.logisticsinfo.LogisticsInfoContract;
import com.dayu.bigfish.presenter.logisticsinfo.LogisticsInfoPresenter;
......
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
......@@ -16,11 +16,11 @@ import android.view.View;
import android.widget.TextView;
import com.dayu.bigfish.BuildConfig;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.DownloadService;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.bean.InformBean;
import com.dayu.bigfish.bean.VersionInfo;
import com.dayu.bigfish.bean.event.DownloadBean;
......@@ -34,7 +34,7 @@ import com.dayu.bigfish.ui.fragment.HomeMessageFragment;
import com.dayu.bigfish.ui.fragment.HomeOrderFragment;
import com.dayu.bigfish.ui.fragment.HomePersonFragment;
import com.dayu.bigfish.ui.listener.onDownloadListener;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.base.widgets.CustomDialog;
import com.dayu.bigfish.utils.LocationUtils;
import com.umeng.analytics.MobclickAgent;
......
app/src/main/java/com/dayu/bigfish/ui/MessageDetailActivity.java
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.DataBindingActivity;
import com.dayu.bigfish.bean.NewMessage;
......
app/src/main/java/com/dayu/bigfish/ui/ModifyPersonInfoActivity.java
......@@ -5,12 +5,12 @@ import android.os.Environment;
import android.text.TextUtils;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityModifyPersonActivityBinding;
import com.dayu.bigfish.presenter.modifyperson.ModifyPersonContract;
import com.dayu.bigfish.presenter.modifyperson.ModifyPersonPresenter;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.base.widgets.CustomDialog;
import com.dayu.base.utils.ToastUtils;
import com.luck.picture.lib.PictureSelectionModel;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
......
app/src/main/java/com/dayu/bigfish/ui/MyHeaderIvActivity.java
......@@ -3,9 +3,9 @@ package com.dayu.bigfish.ui;
import android.content.Intent;
import android.os.Environment;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.MyHeaderActivityBinding;
import com.dayu.bigfish.presenter.myhead.MyHeadContract;
import com.dayu.bigfish.presenter.myhead.MyHeadPresenter;
......
app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java
......@@ -6,7 +6,7 @@ import android.support.v4.app.FragmentTransaction;
import android.view.View;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.databinding.ActivityOrderDetailsBinding;
import com.dayu.bigfish.presenter.orderdetail.OrderDetailContract;
......
app/src/main/java/com/dayu/bigfish/ui/OrderRecordActivity.java
......@@ -5,7 +5,7 @@ import android.view.View;
import android.view.inputmethod.InputMethodManager;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityOrderRecordBinding;
import com.dayu.bigfish.presenter.worksRecord.OrderRecordContract;
import com.dayu.bigfish.presenter.worksRecord.OrderRecordPresenter;
......
app/src/main/java/com/dayu/bigfish/ui/PersonInfoActivity.java
......@@ -2,9 +2,9 @@ package com.dayu.bigfish.ui;
import android.content.Intent;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityPersonInfoBinding;
import com.dayu.bigfish.presenter.personinfo.PersonInfoContract;
import com.dayu.bigfish.presenter.personinfo.PersonInfoPresenter;
......
app/src/main/java/com/dayu/bigfish/ui/PreviewActivty.java
......@@ -6,7 +6,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.DataBindingActivity;
import com.dayu.bigfish.databinding.ActivtyPreviewBinding;
......
app/src/main/java/com/dayu/bigfish/ui/ProcessOrderActivity.java
......@@ -8,9 +8,9 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityProcessOrderBinding;
import com.dayu.bigfish.presenter.processorder.ProcessOrderContract;
import com.dayu.bigfish.presenter.processorder.ProcessOrderPresenter;
......
app/src/main/java/com/dayu/bigfish/ui/ReceivingActivity.java
package com.dayu.bigfish.ui;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.databinding.ActivityCommomRecycleBinding;
import com.dayu.bigfish.presenter.receivingorder.ReceivingContract;
......
app/src/main/java/com/dayu/bigfish/ui/ReturnPartActivity.java
......@@ -2,11 +2,11 @@ package com.dayu.bigfish.ui;
import com.bigkoo.pickerview.OptionsPickerView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityReturnPartBinding;
import com.dayu.bigfish.presenter.returnpart.ReturnPartContract;
import com.dayu.bigfish.presenter.returnpart.ReturnPartPresenter;
import com.dayu.bigfish.utils.UIUtils;
import com.dayu.base.utils.UIUtils;
import java.util.List;
......
app/src/main/java/com/dayu/bigfish/ui/ServerInstructionActivity.java
package com.dayu.bigfish.ui;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityInstrcutionLayoutBinding;
import com.dayu.bigfish.presenter.serverinstruction.ServerInstructionContract;
import com.dayu.bigfish.presenter.serverinstruction.ServerInstructionPresenter;
......
app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
package com.dayu.bigfish.ui;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivitySettingBinding;
import com.dayu.bigfish.presenter.setting.SettingContract;
import com.dayu.bigfish.presenter.setting.SettingPresenter;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.base.widgets.CustomDialog;
/**
* 设置页面
......
app/src/main/java/com/dayu/bigfish/ui/SopWebViewActivity.java
......@@ -12,14 +12,14 @@ import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.LinearLayout;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.DataBindingActivity;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.databinding.ActivityWebviewBinding;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.base.utils.ProgressUtil;
import com.dayu.base.utils.ToastUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.github.lzyzsd.jsbridge.BridgeHandler;
import com.github.lzyzsd.jsbridge.BridgeWebView;
......
app/src/main/java/com/dayu/bigfish/ui/SubcribeTimeActivity.java
......@@ -4,7 +4,7 @@ import android.graphics.Color;
import com.bigkoo.pickerview.TimePickerView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivitySubscribeTimeBinding;
import com.dayu.bigfish.presenter.subcribeTime.SubcribeContract;
import com.dayu.bigfish.presenter.subcribeTime.SubcribeTimePresenter;
......
app/src/main/java/com/dayu/bigfish/ui/WebViewActivity.java
......@@ -13,12 +13,12 @@ import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.LinearLayout;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.DataBindingActivity;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.databinding.ActivityWebviewBinding;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.base.utils.ProgressUtil;
import com.dayu.bigfish.utils.managers.UserManager;
import com.github.lzyzsd.jsbridge.BridgeHandler;
import com.github.lzyzsd.jsbridge.BridgeWebView;
......
app/src/main/java/com/dayu/bigfish/ui/WithdrawalsActivity.java
package com.dayu.bigfish.ui;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityWithdrawalsBinding;
import com.dayu.bigfish.presenter.Withdrawals.WithdrawalsContract;
import com.dayu.bigfish.presenter.Withdrawals.WithdrawalsPresenter;
......
app/src/main/java/com/dayu/bigfish/ui/adapter/LogisticsAdapter.java
......@@ -4,7 +4,7 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.base.CoreAdapter;
import com.dayu.bigfish.bean.LogsticsInfo;
import com.dayu.bigfish.databinding.ItemLogisticsLayoutBinding;
import com.dayu.bigfish.utils.UIUtils;
import com.dayu.base.utils.UIUtils;
/**
* Created by luofan on 2018/1/23.
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderAdapter.java
......@@ -7,7 +7,7 @@ import android.text.TextUtils;
import android.view.View;
import com.amap.api.location.AMapLocation;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.CoreAdapter;
import com.dayu.bigfish.bean.Order;
......@@ -19,7 +19,7 @@ import com.dayu.bigfish.ui.ProcessOrderActivity;
import com.dayu.bigfish.ui.SopWebViewActivity;
import com.dayu.bigfish.ui.SubcribeTimeActivity;
import com.dayu.bigfish.utils.LocationUtils;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.base.utils.ProgressUtil;
import com.dayu.bigfish.utils.UtilsDate;
import com.umeng.analytics.MobclickAgent;
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderPartAdapter.java
......@@ -4,14 +4,14 @@ import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.CoreAdapter;
import com.dayu.bigfish.bean.OrderPart;
import com.dayu.bigfish.databinding.ItemApplyPartLayoutBinding;
import com.dayu.bigfish.presenter.orderpart.OrderPartPresenter;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.UIUtils;
import com.dayu.base.widgets.CustomDialog;
import com.dayu.base.utils.UIUtils;
import io.reactivex.functions.Consumer;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/ApplicationOrderPartFragment.java
......@@ -2,7 +2,7 @@ package com.dayu.bigfish.ui.fragment;
import android.os.Bundle;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.OrderDetail;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeMessageFragment.java
......@@ -5,7 +5,7 @@ import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.DataBindingFragment;
import com.dayu.base.ui.fragment.BaseBindingFragment;
import com.dayu.bigfish.databinding.FragmentMessageBinding;
import com.dayu.bigfish.ui.adapter.FragmentBaseAdapter;
import com.dayu.bigfish.utils.TabLayoutUtils;
......@@ -21,7 +21,7 @@ import io.reactivex.functions.Function;
* Created by luofan on 2017/11/20.
*/
public class HomeMessageFragment extends DataBindingFragment<FragmentMessageBinding> {
public class HomeMessageFragment extends BaseBindingFragment<FragmentMessageBinding> {
private int mIndex = 0;
private String mUmTag = "serverMessage";
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomePersonFragment.java
......@@ -10,7 +10,7 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.EngineerInfo;
......@@ -25,8 +25,8 @@ import com.dayu.bigfish.ui.AccountBalanceActivity;
import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.bigfish.ui.SettingActivity;
import com.dayu.bigfish.ui.WithdrawalsActivity;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.base.widgets.CustomDialog;
import com.dayu.base.utils.ProgressUtil;
import com.dayu.bigfish.utils.SPUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDetaillsFragment.java
......@@ -5,15 +5,15 @@ import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.CoreAdapter;
import com.dayu.bigfish.base.DataBindingFragment;
import com.dayu.base.ui.fragment.BaseBindingFragment;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.databinding.FragmentOrderDatailsBinding;
import com.dayu.bigfish.ui.QrCodeActivity;
import com.dayu.bigfish.ui.ServerInstructionActivity;
import com.dayu.bigfish.utils.UIUtils;
import com.dayu.base.utils.UIUtils;
import com.umeng.analytics.MobclickAgent;
......@@ -22,7 +22,7 @@ import com.umeng.analytics.MobclickAgent;
* on 2017/9/13.
*/
public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderDatailsBinding> {
public class OrderDetaillsFragment extends BaseBindingFragment<FragmentOrderDatailsBinding> {
private static final String TAG = "OrderDetaillsFragment";
private boolean mFlag = true;
private CoreAdapter mAdapter;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDetailsServeFragment.java
......@@ -2,9 +2,9 @@ package com.dayu.bigfish.ui.fragment;
import android.os.Bundle;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.DataBindingFragment;
import com.dayu.base.ui.fragment.BaseBindingFragment;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.databinding.FragmentOrderServeBinding;
import com.dayu.bigfish.utils.UtilsDate;
......@@ -17,7 +17,7 @@ import java.text.ParseException;
* on 2017/9/13.
*/
public class OrderDetailsServeFragment extends DataBindingFragment<FragmentOrderServeBinding> {
public class OrderDetailsServeFragment extends BaseBindingFragment<FragmentOrderServeBinding> {
private static final String TAG = "OrderDetailsServeFragme";
public static OrderDetailsServeFragment newInstance(OrderDetail detail) {
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFirstTabFragment.java
package com.dayu.bigfish.ui.fragment;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.event.RefreshApoiment;
......@@ -8,7 +8,7 @@ import com.dayu.bigfish.databinding.FragmentCommomRecycleBinding;
import com.dayu.bigfish.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.bigfish.presenter.orderdoing.orderDoingContract;
import com.dayu.bigfish.ui.adapter.OrderAdapter;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.base.utils.ProgressUtil;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFourTabFragment.java
package com.dayu.bigfish.ui.fragment;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.databinding.FragmentCommomRecycleBinding;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderPartFragment.java
......@@ -3,9 +3,9 @@ package com.dayu.bigfish.ui.fragment;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.DataBindingFragment;
import com.dayu.base.ui.fragment.BaseBindingFragment;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.databinding.FragmentOrderPartBinding;
import com.dayu.bigfish.ui.adapter.FragmentBaseAdapter;
......@@ -18,7 +18,7 @@ import java.util.List;
* Created by luofan on 2018/1/18.
*/
public class OrderPartFragment extends DataBindingFragment<FragmentOrderPartBinding> {
public class OrderPartFragment extends BaseBindingFragment<FragmentOrderPartBinding> {
public static OrderPartFragment newInstance(OrderDetail detail) {
Bundle args = new Bundle();
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderSecondTabFragment.java
package com.dayu.bigfish.ui.fragment;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.Order;
......@@ -10,7 +10,7 @@ import com.dayu.bigfish.databinding.FragmentCommomRecycleBinding;
import com.dayu.bigfish.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.bigfish.presenter.orderdoing.orderDoingContract;
import com.dayu.bigfish.ui.adapter.OrderAdapter;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.base.utils.ProgressUtil;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
......
app/src/main/java/com/dayu/bigfish/ui/views/CustomProgressDialog.java deleted 100755 → 0
package com.dayu.bigfish.ui.views;
import android.app.ProgressDialog;
import android.content.Context;
import android.os.Bundle;
import android.view.WindowManager;
import com.dayu.bigfish.R;
/**
* @Description:自定义对话框
* @author http://blog.csdn.net/finddreams
*/
public class CustomProgressDialog extends ProgressDialog {
public CustomProgressDialog(Context context) {
super(context);
}
public CustomProgressDialog(Context context, int theme) {
super(context, theme);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
init(getContext());
}
private void init(Context context) {
setCancelable(true);
setCanceledOnTouchOutside(false);
setContentView(R.layout.progress_dialog);//loading的xml文件
WindowManager.LayoutParams params = getWindow().getAttributes();
params.width = WindowManager.LayoutParams.WRAP_CONTENT;
params.height = WindowManager.LayoutParams.WRAP_CONTENT;
getWindow().setAttributes(params);
}
@Override
public void show() {//开启
super.show();
}
@Override
public void dismiss() {//关闭
super.dismiss();
}
@Override
public void cancel() {
super.cancel();
}
}
app/src/main/java/com/dayu/bigfish/ui/views/LRecyclerView.java
......@@ -15,13 +15,13 @@ import android.widget.LinearLayout;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseListPresenter;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.base.api.BasePageBean;
import com.dayu.bigfish.base.CoreAdapter;
import com.dayu.bigfish.base.TypeSelector;
import com.dayu.bigfish.ui.listener.OnItemClickListener;
import com.dayu.bigfish.ui.listener.OnRefreshListener;
import com.dayu.bigfish.ui.listener.onLoadMoreListener;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.base.utils.ProgressUtil;
import java.util.List;
......
app/src/main/java/com/dayu/bigfish/utils/BindingUtils.java
......@@ -10,10 +10,10 @@ import android.widget.ImageView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.base.BaseListPresenter;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.base.api.BasePageBean;
import com.dayu.bigfish.ui.views.LRecyclerView;
import com.dayu.bigfish.ui.views.SwitchImage;
......
app/src/main/java/com/dayu/bigfish/utils/LocationUtils.java
......@@ -6,6 +6,7 @@ import com.amap.api.location.AMapLocation;
import com.amap.api.location.AMapLocationClient;
import com.amap.api.location.AMapLocationClientOption;
import com.amap.api.location.AMapLocationListener;
import com.dayu.base.utils.LogUtils;
import java.util.concurrent.TimeUnit;
......
app/src/main/java/com/dayu/bigfish/utils/NetworkConnectChangedReceiver.java
......@@ -13,6 +13,8 @@ import android.net.wifi.WifiManager;
import android.os.Parcelable;
import android.util.Log;
import com.dayu.base.utils.ToastUtils;
/**
* 网络改变监控广播
* <p>
......
app/src/main/java/com/dayu/bigfish/utils/StringUtils.java
......@@ -8,6 +8,8 @@ import android.text.TextUtils;
import android.text.style.CharacterStyle;
import android.text.style.ForegroundColorSpan;
import com.dayu.base.utils.UIUtils;
import java.text.DecimalFormat;
public class StringUtils {
......
app/src/main/java/com/dayu/bigfish/utils/managers/HxManager.java
......@@ -8,7 +8,7 @@ import android.content.Context;
import android.content.Intent;
import android.support.v4.app.NotificationCompat;
import com.dayu.bigfish.Constants;
import com.dayu.base.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.InformBean;
import com.dayu.bigfish.ui.MainActivity;
......
app/src/main/res/values/styles.xml
......@@ -89,39 +89,4 @@
<style name="TabLayoutTextStyle">
<item name="android:textSize">@dimen/sp_13.3</item>
</style>
<style name="Dialog" parent="@android:style/Theme.Holo.Dialog">
<item name="android:windowSoftInputMode">stateHidden|adjustResize</item>
<!-- 边框 -->
<item name="android:windowFrame">@null</item>
<!-- 是否浮现在activity之上 -->
<item name="android:windowIsFloating">true</item>
<!-- 半透明 -->
<item name="android:windowIsTranslucent">false</item>
<!-- 无标题 -->
<item name="android:windowNoTitle">true</item>
<!-- 背景透明 -->
<item name="android:windowBackground">@android:color/transparent</item>
<!-- 模糊 -->
<item name="android:backgroundDimEnabled">false</item>
</style>
<style name="CustomDialog" parent="@android:style/Theme.Dialog">
<item name="android:windowSoftInputMode">stateHidden|adjustResize</item>
<item name="android:windowFrame">@null</item>
<!-- Dialog的windowFrame框为无 -->
<item name="android:windowIsFloating">true</item>
<!-- 是否漂现在activity上 -->
<item name="android:windowIsTranslucent">true</item>
<!-- 是否半透明 -->
<item name="android:windowNoTitle">true</item>
<item name="android:background">@null</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<!-- 去除黑色边框的关键设置项 -->
<item name="android:backgroundDimEnabled">true</item>
<!-- 屏幕背景是否变暗 -->
<item name="android:backgroundDimAmount">0.3</item>
</style>
</resources>
baselibrary/build.gradle
......@@ -22,6 +22,14 @@ android {
}
}
dataBinding {
enabled = true
}
compileOptions {
targetCompatibility 1.8
sourceCompatibility 1.8
}
}
dependencies {
......@@ -32,6 +40,13 @@ dependencies {
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
//mutidex
compile 'com.android.support:multidex:1.0.2'
//ARouter
compile "com.alibaba:arouter-api:$arouter_api_version"
annotationProcessor "com.alibaba:arouter-compiler:$arouter_api_version"
//retrofit
compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
......
app/src/main/java/com/dayu/bigfish/api/APIException.java → baselibrary/src/main/java/com/dayu/base/api/APIException.java
package com.dayu.bigfish.api;
package com.dayu.base.api;
import android.net.ParseException;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.base.R;
import com.dayu.base.common.BaseApplication;
import com.google.gson.JsonParseException;
import org.apache.http.conn.ConnectTimeoutException;
......@@ -13,7 +13,7 @@ import java.net.ConnectException;
import retrofit2.HttpException;
import static com.dayu.bigfish.api.APIException.ERROR.SERVER_ERROR;
import static com.dayu.base.api.APIException.ERROR.SERVER_ERROR;
/**
* Created by luofan on 2017/11/15.
......@@ -37,24 +37,24 @@ public class APIException {
ex = new ResponeThrowable(e, ERROR.HTTP_ERROR);
switch (httpException.code()) {
case FORBIDDEN:
ex.message = MyApplication.getContext().getString(R.string.error_token);
ex.message = BaseApplication.getContext().getString(R.string.error_token);
ex.code = FORBIDDEN;
break;
case UNAUTHORIZED:
case NOT_FOUND:
case REQUEST_TIMEOUT:
ex.message = MyApplication.getContext().getString(R.string.error_time_out);
ex.message = BaseApplication.getContext().getString(R.string.error_time_out);
ex.code = REQUEST_TIMEOUT;
break;
case GATEWAY_TIMEOUT:
case INTERNAL_SERVER_ERROR:
ex.message = MyApplication.getContext().getString(R.string.error_connect);
ex.message = BaseApplication.getContext().getString(R.string.error_connect);
ex.code = INTERNAL_SERVER_ERROR;
break;
case BAD_GATEWAY:
case SERVICE_UNAVAILABLE:
default:
ex.message = MyApplication.getContext().getString(R.string.error_internet);
ex.message = BaseApplication.getContext().getString(R.string.error_internet);
break;
}
return ex;
......@@ -67,27 +67,27 @@ public class APIException {
|| e instanceof JSONException
|| e instanceof ParseException) {
ex = new ResponeThrowable(e, ERROR.PARSE_ERROR);
ex.message = MyApplication.getContext().getString(R.string.error_parse);
ex.message = BaseApplication.getContext().getString(R.string.error_parse);
return ex;
} else if (e instanceof ConnectException) {
ex = new ResponeThrowable(e, ERROR.NETWORD_ERROR);
ex.message = MyApplication.getContext().getString(R.string.error_connect);
ex.message = BaseApplication.getContext().getString(R.string.error_connect);
return ex;
} else if (e instanceof javax.net.ssl.SSLHandshakeException) {
ex = new ResponeThrowable(e, ERROR.SSL_ERROR);
ex.message = MyApplication.getContext().getString(R.string.error_ssl);
ex.message = BaseApplication.getContext().getString(R.string.error_ssl);
return ex;
} else if (e instanceof ConnectTimeoutException) {
ex = new ResponeThrowable(e, ERROR.TIMEOUT_ERROR);
ex.message = MyApplication.getContext().getString(R.string.error_time_out);
ex.message = BaseApplication.getContext().getString(R.string.error_time_out);
return ex;
} else if (e instanceof java.net.SocketTimeoutException) {
ex = new ResponeThrowable(e, ERROR.TIMEOUT_ERROR);
ex.message = MyApplication.getContext().getString(R.string.error_time_out);
ex.message = BaseApplication.getContext().getString(R.string.error_time_out);
return ex;
} else {
ex = new ResponeThrowable(e, ERROR.UNKNOWN);
ex.message = MyApplication.getContext().getString(R.string.error_unknow);
ex.message = BaseApplication.getContext().getString(R.string.error_unknow);
return ex;
}
}
......
app/src/main/java/com/dayu/bigfish/api/ServerException.java → baselibrary/src/main/java/com/dayu/base/api/ServerException.java
package com.dayu.bigfish.api;
package com.dayu.base.api;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.base.R;
import com.dayu.base.common.BaseApplication;
import com.dayu.base.common.Constants;
/**
* Created by luofan on 2017/11/15.
......@@ -21,69 +21,69 @@ public class ServerException extends Exception {
private void processCode(String code) {
if (code == null) {
message = MyApplication.getContext().getString(R.string.get_info_failed);
message = BaseApplication.getContext().getString(R.string.get_info_failed);
return;
}
switch (code) {
/** order相关错误*/
case "ORDER0001":
message = MyApplication.getContext().getString(R.string.order_not_exite);
message = BaseApplication.getContext().getString(R.string.order_not_exite);
break;
case "ORDER0002":
message = MyApplication.getContext().getString(R.string.order_receive_already);
message = BaseApplication.getContext().getString(R.string.order_receive_already);
break;
case "ORDER0003":
message = MyApplication.getContext().getString(R.string.order_cancle_not_receive);
message = BaseApplication.getContext().getString(R.string.order_cancle_not_receive);
break;
case "ORDER0004":
message = MyApplication.getContext().getString(R.string.order_cancle_not_subcribe);
message = BaseApplication.getContext().getString(R.string.order_cancle_not_subcribe);
break;
case "ORDER0005":
message = MyApplication.getContext().getString(R.string.order_cancle_not_begin);
message = BaseApplication.getContext().getString(R.string.order_cancle_not_begin);
break;
case "ORDER0006":
message = MyApplication.getContext().getString(R.string.order_cancle_not_process);
message = BaseApplication.getContext().getString(R.string.order_cancle_not_process);
break;
case "LOGISTICS0001":
message = MyApplication.getContext().getString(R.string.query_logistics_failed);
message = BaseApplication.getContext().getString(R.string.query_logistics_failed);
break;
/** 用户相关错误*/
case "USER0002":
message = MyApplication.getContext().getString(R.string.sms_code_unsend_or_expire);
message = BaseApplication.getContext().getString(R.string.sms_code_unsend_or_expire);
break;
case "USER0004":
message = MyApplication.getContext().getString(R.string.not_engineer);
message = BaseApplication.getContext().getString(R.string.not_engineer);
break;
case "USER0005":
message = MyApplication.getContext().getString(R.string.account_frozen);
message = BaseApplication.getContext().getString(R.string.account_frozen);
break;
case "USER0020":
message = MyApplication.getContext().getString(R.string.sms_code_unsend_or_expire);
message = BaseApplication.getContext().getString(R.string.sms_code_unsend_or_expire);
break;
case "USER0021":
message = MyApplication.getContext().getString(R.string.sms_code_error);
message = BaseApplication.getContext().getString(R.string.sms_code_error);
break;
case "USER0003":
case "USER0023":
message = MyApplication.getContext().getString(R.string.engineer_acount_notavialibe);
message = BaseApplication.getContext().getString(R.string.engineer_acount_notavialibe);
break;
case "USER0024":
message = MyApplication.getContext().getString(R.string.engineer_not_have_site);
message = BaseApplication.getContext().getString(R.string.engineer_not_have_site);
break;
case "USER0062":
message = MyApplication.getContext().getString(R.string.identity_is_error);
message = BaseApplication.getContext().getString(R.string.identity_is_error);
break;
case "USER0051":
message = MyApplication.getContext().getString(R.string.not_audite_aviliable);
message = BaseApplication.getContext().getString(R.string.not_audite_aviliable);
break;
/** 账户相关*/
case "SETTLEMENT0015":
message = Constants.NOT_SHOW;
break;
case "SETTLEMENT0001":
message = MyApplication.getContext().getString(R.string.perameter_is_null);
message = BaseApplication.getContext().getString(R.string.perameter_is_null);
break;
/**全局错误*/
......@@ -142,7 +142,7 @@ public class ServerException extends Exception {
message = "未知错误GLOBAL1005"; //数据越界异
break;
default:
message = MyApplication.getContext().getString(R.string.get_info_failed);
message = BaseApplication.getContext().getString(R.string.get_info_failed);
break;
}
}
......
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