增加备件列表，物流信息等页面

app/build.gradle

 apply plugin: 'com.android.application'
 apply plugin: 'com.android.application'
 apply plugin: 'org.greenrobot.greendao'
 apply plugin: 'org.greenrobot.greendao'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
 
 
 android {
 android {
 
 
@@ -74,9 +71,7 @@ android {
         preDexLibraries = false
         preDexLibraries = false
     }
     }
 }
 }
-kapt {
-    generateStubs = true
-}
+
 greendao {
 greendao {
     schemaVersion 2
     schemaVersion 2
     daoPackage 'com.dayu.bigfish.greendao'
     daoPackage 'com.dayu.bigfish.greendao'
@@ -117,9 +112,7 @@ dependencies {
     compile 'com.github.lzyzsd:jsbridge:1.0.4'
     compile 'com.github.lzyzsd:jsbridge:1.0.4'
 
 
 
 
-    kapt project(':apt')
+    annotationProcessor project(':apt')
     compile project(':annotation_lib')
     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/base/BasePresenter.java

@@ -37,7 +37,7 @@ public abstract class BasePresenter<V> {
      * @return
      * @return
      */
      */
 
 
-    public <M> Observer baseObserver(final Consumer<? super M> consumer) {
+    public <M> Observer<M> baseObserver(final Consumer<? super M> consumer) {
         return new Observer<M>() {
         return new Observer<M>() {
             @Override
             @Override
             public void onSubscribe(Disposable d) {
             public void onSubscribe(Disposable d) {
@@ -74,7 +74,7 @@ public abstract class BasePresenter<V> {
      * @return
      * @return
      */
      */
 
 
-    public <M> Observer baseObserver(final Consumer<? super M> consumer, final Consumer<APIException.ResponeThrowable> tconsumer) {
+    public <M> Observer<M> baseObserver(final Consumer<? super M> consumer, final Consumer<APIException.ResponeThrowable> tconsumer) {
         return new Observer<M>() {
         return new Observer<M>() {
             @Override
             @Override
             public void onSubscribe(Disposable d) {
             public void onSubscribe(Disposable d) {

app/src/main/res/layout/activity_return_part.xml

@@ -95,7 +95,7 @@
 
 
             <EditText
             <EditText
                 android:id="@+id/sp_beizhu"
                 android:id="@+id/sp_beizhu"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginTop="20dp"
                 android:layout_marginTop="20dp"
                 android:background="@null"
                 android:background="@null"

app/src/main/res/layout/progress_dialog.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"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="100dp"
-              android:layout_height="100dp"
-              android:layout_centerInParent="true"
-              android:layout_gravity="center_horizontal"
-              android:background="@drawable/shape_dialog_bg"
-              android:orientation="vertical">
+    android:layout_width="100dp"
+    android:layout_height="100dp"
+    android:layout_centerInParent="true"
+    android:layout_gravity="center_horizontal"
+    android:background="@drawable/shape_dialog_bg"
+    android:orientation="vertical">
 
 
     <RelativeLayout
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_width="match_parent"
@@ -28,4 +28,4 @@
         android:text="@string/loading"
         android:text="@string/loading"
         android:textColor="#9a9b98"
         android:textColor="#9a9b98"
         android:textSize="12sp"/>
         android:textSize="12sp"/>
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file