增加kotlin支持

.idea/gradle.xml

@@ -3,7 +3,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.1" />
         <option name="modules">

app/build.gradle

 apply plugin: 'com.android.application'
 apply plugin: 'org.greenrobot.greendao'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-android-extensions'
 
 android {
 
@@ -71,6 +74,9 @@ android {
         preDexLibraries = false
     }
 }
+kapt {
+    generateStubs = true
+}
 greendao {
     schemaVersion 2
     daoPackage 'com.dayu.bigfish.greendao'
@@ -110,7 +116,10 @@ dependencies {
     //jsbridge
     compile 'com.github.lzyzsd:jsbridge:1.0.4'
 
-    annotationProcessor project(':apt')
+
+    kapt project(':apt')
     compile project(':annotation_lib')
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    kapt "com.android.databinding:compiler:$gradle_version"
 }
 

app/src/main/java/com/dayu/bigfish/Constants.java

@@ -20,20 +20,20 @@ public class Constants {
     public static final String BASE_COUNT = "https://47.94.101.239:7500/";
 
     /***********************测试环境配置**********************************/
-    public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
-    public static final String BASE_URL = "http://47.94.101.239:3112";
-    public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
-    public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
-    public static final boolean UM_DEBUG = true;
+//    public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
+//    public static final String BASE_URL = "http://47.94.101.239:3112";
+//    public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
+//    public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
+//    public static final boolean UM_DEBUG = true;
 
 //    public final static String WEB_SOP = "http://192.168.1.132:8080/#/sop";
 
     /**************************正式环境*******************************/
-//    public static final int DEBUGLEVEL = LogUtils.LEVEL_OFF;
-//    public static final String BASE_URL = "https://mobile.dayu.ai";
-//    public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
-//    public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
-//    public static final boolean UM_DEBUG = false;
+    public static final int DEBUGLEVEL = LogUtils.LEVEL_OFF;
+    public static final String BASE_URL = "https://mobile.dayu.ai";
+    public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
+    public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
+    public static final boolean UM_DEBUG = false;
     /*****************/
     /**
      * 登录.
@@ -139,7 +139,7 @@ public class Constants {
     //订单详情
     public final static String ORDER_DETAIL = "order_detail";
     //数据返回失败标识
-    public final static int FAILED = 1;
+    public final static int FAILED = -1;
     //相册选择照片删除时传递的key
     public final static String BUNDLE_KEY_ID = "BUNDLE_KEY_ID";
     //工程师的账户余额

app/src/main/java/com/dayu/bigfish/InitializeActivity.java

@@ -73,13 +73,6 @@ public class InitializeActivity extends AppCompatActivity {
         );
     }
 
-    @TargetApi(23)
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        MPermissionUtils.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
     public void showPerMissionDialog() {
         CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.please_open__permission)
                 , (dialog1, confirm) -> {
@@ -121,5 +114,12 @@ public class InitializeActivity extends AppCompatActivity {
             mDisposable.dispose();
         }
     }
+
+    @TargetApi(23)
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        MPermissionUtils.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
 }
 

app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderContract.java

@@ -15,6 +15,11 @@ public interface HomeOrderContract {
 
     abstract class Presenter extends BasePresenter<View> {
 
+        /**
+         * 获得tab数量.
+         * @param userId
+         * @param siteId
+         */
         public abstract void getTabNum(int userId, int siteId);
 
         public abstract void dumpToOrderRecordActivity();

app/src/main/java/com/dayu/bigfish/presenter/message/messagePresenter.java

@@ -119,8 +119,4 @@ public class messagePresenter extends messageContract.Presenter {
         mActivity.startActivity(intent);
         MobclickAgent.onEvent(MyApplication.getContext(), "read_message");
     }
-
-    public int getmCategory() {
-        return mCategory;
-    }
 }

app/src/main/java/com/dayu/bigfish/presenter/orderdoing/OrderDoingPresenter.java

@@ -70,24 +70,20 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
 
     @Override
     public void getOrders(int state, int userId, int siteId, int page, int pageSize) {
-        ApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe(baseObserver(new Consumer<BasePageBean<Order>>() {
-            @Override
-            public void accept(BasePageBean<Order> orderBasePageBean) throws Exception {
+        ApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe(
+                baseObserver((Consumer<BasePageBean<Order>>) orderBasePageBean -> {
                     datas.set(orderBasePageBean);
                     mPage++;
                     EventBus.getDefault().post(new RefreshTab(-1));
-            }
                 }, responeThrowable -> datas.set(Constants.FAILED)));
     }
 
     @Override
     public void getErrorOrder() {
-        ApiFactory.getErrorOrders(mUserId, mSiteId).subscribe(baseObserver(new Consumer<List<ErrorOrder>>() {
-            @Override
-            public void accept(List<ErrorOrder> errorOrder) throws Exception {
+        ApiFactory.getErrorOrders(mUserId, mSiteId).subscribe(
+                baseObserver((Consumer<List<ErrorOrder>>) errorOrder -> {
                     datas.set(errorOrder);
                     EventBus.getDefault().post(new RefreshTab(-1));
-            }
                 }, responeThrowable -> datas.set(Constants.FAILED)));
     }
 

app/src/main/java/com/dayu/bigfish/presenter/orderdoing/orderDoingContract.java

@@ -22,10 +22,27 @@ public interface orderDoingContract {
 
     abstract class Presenter extends BaseOrderPresenter<View> {
 
+        /**
+         * 获取异常订单.
+         */
         public abstract void getErrorOrder();
 
+        /**
+         * 开始出发.
+         * @param orderId
+         * @param latitude
+         * @param longitude
+         * @return
+         */
         public abstract Observable<Integer> startOrder(int orderId, double latitude, double longitude);
 
+        /**
+         * 开始服务.
+         * @param orderId
+         * @param latitude
+         * @param longitude
+         * @return
+         */
         public abstract Observable<Integer> startServer(int orderId, double latitude, double longitude);
 
     }

app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java

 package com.dayu.bigfish.presenter.setting;
 
-import android.app.Dialog;
 import android.content.Intent;
 import android.databinding.ObservableBoolean;
 import android.net.Uri;
@@ -16,7 +15,6 @@ import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.ui.AboutUsActivity;
 import com.dayu.bigfish.ui.FeedBackActivity;
 import com.dayu.bigfish.ui.LoginActivity;
-import com.dayu.bigfish.ui.views.CustomDialog;
 import com.dayu.bigfish.utils.AppUtils;
 import com.dayu.bigfish.utils.DataCleanManager;
 import com.dayu.bigfish.utils.SPUtils;
@@ -103,9 +101,7 @@ public class SettingPresenter extends SettingContract.Presenter {
 
     @Override
     public void clearCach() {
-        mView.showCachDialog(new CustomDialog.OnCloseListener() {
-            @Override
-            public void onClick(Dialog dialog, boolean confirm) {
+        mView.showCachDialog((dialog, confirm) -> {
             if (confirm) {
                 mView.showDialog(mActivity.getString(R.string.on_clear));
                 Observable.timer(2, TimeUnit.SECONDS).subscribe(
@@ -115,7 +111,6 @@ public class SettingPresenter extends SettingContract.Presenter {
                         });
                 DataCleanManager.deleteFolderFile(Environment.getExternalStorageDirectory() + "/Android/data/com.dayu.bigfish/cache", false);
             }
-            }
         });
         MobclickAgent.onEvent(mActivity, "clear_cach");
     }

build.gradle

 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.2.10'
+    ext.gradle_version = '3.0.1'
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath "com.android.tools.build:gradle:$gradle_version"
         classpath 'org.greenrobot:greendao-gradle-plugin:3.2.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

gradle/wrapper/gradle-wrapper.properties

-#Fri Nov 17 09:40:30 CST 2017
+#Tue Jan 16 09:59:38 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip