搬家前最后一次提交

.gitignore

 *.iml
 *.iml
 .gradle
 .gradle
 /local.properties
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea
 .DS_Store
 .DS_Store
 /build
 /build
 /captures
 /captures

app/proguard-rules.pro

@@ -118,6 +118,7 @@
 -keep class com.dayu.base.api.protocol.** { *; }
 -keep class com.dayu.base.api.protocol.** { *; }
 -keep class com.dayu.message.data.protocol.** { *; }
 -keep class com.dayu.message.data.protocol.** { *; }
 -keep class com.dayu.order.api.protocol.** { *; }
 -keep class com.dayu.order.api.protocol.** { *; }
+-keep class com.dayu.order.sqlbean.** { *; }
 -keep class com.dayu.provider.event.** { *; }
 -keep class com.dayu.provider.event.** { *; }
 -keep class com.dayu.usercenter.data.protocol.** { *; }
 -keep class com.dayu.usercenter.data.protocol.** { *; }
 #-------------------------------------------------------------------------
 #-------------------------------------------------------------------------

app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java

@@ -25,7 +25,7 @@ public class MainPresenter extends MainContract.Presenter {
     /**
     /**
      * 待接单数目.
      * 待接单数目.
      */
      */
-    public ObservableField<String> tabRecive = new ObservableField("0");
+    public ObservableField<String> tabRecive = new ObservableField<>("0");
     private UserInfo mUser;
     private UserInfo mUser;
     private int mAccountId;
     private int mAccountId;
     private int mSiteId;
     private int mSiteId;

baseSDK/src/main/java/com/dayu/base/ui/presenter/BasePresenter.java

@@ -15,10 +15,10 @@ import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 import io.reactivex.functions.Consumer;
 
 
 /**
 /**
- * Created by luofan on 17/11/02.
+ * Created by luofan
+ * on 17/11/02.
  */
  */
 public abstract class BasePresenter<V> {
 public abstract class BasePresenter<V> {
-    protected static final String TAG = "BasePresenter";
     protected V mView;
     protected V mView;
     protected CompositeDisposable mComDisposable = new CompositeDisposable();
     protected CompositeDisposable mComDisposable = new CompositeDisposable();
 
 

baseSDK/src/main/java/com/dayu/utils/InstanceUtil.java

-package com.dayu.utils;
-
-/**
- * Created by luofan on 2017/11/24.
- */
-public class InstanceUtil {
-
-    /**
-     * 通过实例工厂去实例化相应类
-     *
-     * @param <T> 返回实例的泛型类型
-     * @return
-     */
-    public static <T> T getInstance(Class clazz) {
-        try {
-            return null;
-//                    (T) InstanceFactory.create(clazz);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}

build.gradle

@@ -28,8 +28,8 @@ buildscript {
 allprojects {
 allprojects {
     repositories {
     repositories {
         jcenter()
         jcenter()
-        mavenCentral()
         google()
         google()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
         maven { url 'https://jitpack.io' }
         maven { url 'https://maven.google.com' }
         maven { url 'https://maven.google.com' }
     }
     }

orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java

@@ -68,7 +68,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
         mOrderInfoDao = GreenDaoManager.getInstance().getmDaoSession().getOrderInfoDao();
         mOrderInfoDao = GreenDaoManager.getInstance().getmDaoSession().getOrderInfoDao();
         mView.showDialog();
         mView.showDialog();
         getOrderInfo(mOrderId);
         getOrderInfo(mOrderId);
-        Query query = mOrderInfoDao.queryBuilder().where(OrderInfoDao.Properties.Id.eq(mOrderId),
+        Query<OrderInfo> query = mOrderInfoDao.queryBuilder().where(OrderInfoDao.Properties.Id.eq(mOrderId),
                 OrderInfoDao.Properties.EngineerId.eq(mAccountId))
                 OrderInfoDao.Properties.EngineerId.eq(mAccountId))
                 .build();
                 .build();
         List<OrderInfo> list = query.list();
         List<OrderInfo> list = query.list();

userCenter/src/main/java/com/dayu/usercenter/presenter/login/LoginPresenter.java

@@ -22,7 +22,6 @@ import com.umeng.analytics.MobclickAgent;
  * Created by luofan
  * Created by luofan
  * on 2017/11/8.
  * on 2017/11/8.
  */
  */
-
 public class LoginPresenter extends LoginContract.Presenter {
 public class LoginPresenter extends LoginContract.Presenter {
     public ObservableField<String> userName = new ObservableField<>();
     public ObservableField<String> userName = new ObservableField<>();
     public ObservableField<String> password = new ObservableField<>();
     public ObservableField<String> password = new ObservableField<>();

userCenter/src/main/java/com/dayu/usercenter/ui/activity/AccountBalanceActivity.java

@@ -7,7 +7,8 @@ import com.dayu.usercenter.presenter.accountbalance.AccountBalanceContract;
 import com.dayu.usercenter.presenter.accountbalance.AccountBalancePresenter;
 import com.dayu.usercenter.presenter.accountbalance.AccountBalancePresenter;
 
 
 /**
 /**
- * Created by luofan on 2017/11/1.
+ * Created by luofan
+ * on 2017/11/1.
  */
  */
 
 
 public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter, AccountbalanceLayoutBinding>
 public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter, AccountbalanceLayoutBinding>