Browse Source

1.添加gson混淆。

石慧云 4 years ago
parent
commit
6f2873c3db

+ 6 - 0
app/src/main/java/com/quansu/heifengwuliu/activity/CommentListActivity.kt

@@ -1,5 +1,6 @@
 package com.quansu.heifengwuliu.activity
 
+import android.os.Bundle
 import com.quansu.heifengwuliu.adapter.CommentListAdapter
 import com.quansu.heifengwuliu.base.MBRActivity
 import com.quansu.heifengwuliu.databinding.ActivityCommentListBinding
@@ -11,6 +12,11 @@ import com.quansu.heifengwuliu.vmodel.CommentListVModel
  */
 class CommentListActivity : MBRActivity<CommentListVModel, CommentListAdapter, ActivityCommentListBinding>(){
 
+    override fun initCreate(savedInstanceState: Bundle?) {
+        super.initCreate(savedInstanceState)
+        vm.getTotalInfo()
+    }
+
     override fun binding(): ActivityCommentListBinding {
         return ActivityCommentListBinding.inflate(layoutInflater)
     }

+ 3 - 2
app/src/main/java/com/quansu/heifengwuliu/adapter/CommentListAdapter.kt

@@ -5,10 +5,11 @@ import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.databinding.ItemBillBinding
 import com.quansu.heifengwuliu.databinding.ItemCommentListBinding
 import com.quansu.heifengwuliu.model.AmountList
+import com.quansu.heifengwuliu.model.OrderEva
 import com.ysnows.base.base.BAdapter
 
-class CommentListAdapter() : BAdapter<AmountList, BaseDataBindingHolder<ItemCommentListBinding>>(R.layout.item_comment_list) {
-    override fun convert(holder: BaseDataBindingHolder<ItemCommentListBinding>, item: AmountList) {
+class CommentListAdapter() : BAdapter<OrderEva, BaseDataBindingHolder<ItemCommentListBinding>>(R.layout.item_comment_list) {
+    override fun convert(holder: BaseDataBindingHolder<ItemCommentListBinding>, item: OrderEva) {
         holder.dataBinding?.item = item
 
     }

+ 4 - 1
app/src/main/java/com/quansu/heifengwuliu/model/AmountCount.kt

@@ -5,7 +5,10 @@ import com.ysnows.base.inter.IModel
 /**
  *Created by shihuiyun
  *on 2020/9/22
+ * total,avg->评论统计
  */
 data class AmountCount(var money:String,var frozen:String,var can_use:String,
-                       var money_in:String,var money_out:String) : IModel {
+                       var money_in:String,var money_out:String,
+                       var avg:String,var total:String
+                       ) : IModel {
 }

+ 2 - 1
app/src/main/java/com/quansu/heifengwuliu/model/OrderEva.kt

@@ -8,5 +8,6 @@ import com.ysnows.base.inter.IModel
  */
 data class OrderEva(var eva_id:String,var uid:String,var info_id:String,
                     var order_id:String,var content:String,var score:Int,
-                    var create_time:String,var update_time:String): IModel {
+                    var create_time:String,var update_time:String,
+                    var info_sn:String): IModel {
 }

+ 1 - 0
app/src/main/java/com/quansu/heifengwuliu/model/WaybillDetails.kt

@@ -17,6 +17,7 @@ data class WaybillDetails(var order: OrderBean,var info:DataInfoBean.OrderBean,v
     }
 
     data class DriverBean(var uid: String,var name: String, var avatar: String,
+                          var car_cate: String,var car_long: String,
                           var mobile: String, var number: String, var is_collect: Int):IModel{}
 
 

+ 15 - 0
app/src/main/java/com/quansu/heifengwuliu/utils/net/ApiService.kt

@@ -573,6 +573,21 @@ interface ApiService {
 
 
 
+    /**
+     *统计-评论列表
+     * @return
+     */
+    @GET("api/evaluate/evaCount")
+    fun evaCount( @Query("p") p: Int): Observable<Response<AmountCount>>
+
+
+    /**
+     * 明细列表-资金
+     * @return
+     */
+    @GET("api/evaluate/evaList")
+    fun evaList(@Query("p") p: Int): Observable<Response<List<OrderEva>>>
+
 
 
 }

+ 2 - 6
app/src/main/java/com/quansu/heifengwuliu/vmodel/CommentListVModel.kt

@@ -14,15 +14,11 @@ class CommentListVModel : BRViewModel<BRRepository>() {
 
     val info: MutableLiveData<AmountCount> = MutableLiveData<AmountCount>()
 
-    var type="0"
-    var status="0"
-
 
     fun getTotalInfo() {
-        //添加司机
 
         repository()
-                .lreq(NetEngine.service.amountTotal(type,status,repository().autoPage()))
+                .lreq(NetEngine.service.evaCount(repository().autoPage()))
                 .doOnNext {
                     if (it.ok(false)) {
                         var bean=it.data() as AmountCount
@@ -35,7 +31,7 @@ class CommentListVModel : BRViewModel<BRRepository>() {
 
 
     override fun api(): Observable<out IResponse<*>> {
-        return NetEngine.service.amountList(type,status,repository().autoPage())
+        return NetEngine.service.evaList(repository().autoPage())
     }
 
 }

BIN
app/src/main/res/drawable-xxhdpi/ic_star_off_two.webp


+ 3 - 2
app/src/main/res/layout/activity_comment_list.xml

@@ -45,6 +45,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     tools:text="48"
+                    android:text="@{vm.info.total}"
                     android:textSize="16sp"
                     android:textColor="#3D3F4E"
                     android:layout_height="wrap_content"/>
@@ -81,14 +82,14 @@
                   />
                 <TextView
                     android:layout_width="wrap_content"
-                    android:text="4.9分"
+                    tools:text="4.9分"
+                    android:text="@{vm.info.avg+@string/branch}"
                     android:textSize="12sp"
                     android:layout_marginStart="3dp"
                     android:textColor="#939393"
                     android:layout_height="wrap_content"/>
 
 
-
             </LinearLayout>
 
 

+ 2 - 0
app/src/main/res/layout/activity_waybilldetails.xml

@@ -341,6 +341,7 @@
                                         android:layout_height="wrap_content"
                                         android:textColor="#979899"
                                         android:textSize="@dimen/sp_13"
+                                        android:text="@{vm.info.driver.car_cate}"
                                         tools:text="鲁QAA888"></TextView>
 
                                     <TextView
@@ -358,6 +359,7 @@
                                         android:layout_weight="1"
                                         android:textColor="#979899"
                                         android:textSize="@dimen/sp_13"
+                                        android:text="@{vm.info.driver.car_long}"
                                         tools:text="平板车 13米"></TextView>
 
 

+ 1 - 0
app/src/main/res/layout/fragment_mine.xml

@@ -407,6 +407,7 @@
 
                         <LinearLayout
                             style="@style/mine_list"
+                            android:onClick="@{v->vm.goComment()}"
                             android:visibility="@{vm.user.isDriver()?View.GONE:View.VISIBLE}"
                             >
 

+ 14 - 7
app/src/main/res/layout/item_comment_list.xml

@@ -7,7 +7,7 @@
 
         <variable
             name="item"
-            type="com.quansu.heifengwuliu.model.AmountList" />
+            type="com.quansu.heifengwuliu.model.OrderEva" />
 
     </data>
 
@@ -34,37 +34,42 @@
             
             <ImageView
                 android:layout_width="13dp"
-                android:src="@drawable/ic_star_on"
+                tools:src="@drawable/ic_star_on"
+                android:src="@{item.score>0?@drawable/ic_star_on:@drawable/ic_star_off_two}"
                 android:layout_marginEnd="3dp"
                 android:layout_height="13dp"/>
             <ImageView
                 android:layout_width="13dp"
-                android:src="@drawable/ic_star_on"
+                tools:src="@drawable/ic_star_on"
+                android:src="@{item.score>1?@drawable/ic_star_on:@drawable/ic_star_off_two}"
                 android:layout_marginEnd="3dp"
                 android:layout_height="13dp"/>
             <ImageView
                 android:layout_width="13dp"
-                android:src="@drawable/ic_star_on"
+                tools:src="@drawable/ic_star_on"
+                android:src="@{item.score>2?@drawable/ic_star_on:@drawable/ic_star_off_two}"
                 android:layout_marginEnd="3dp"
                 android:layout_height="13dp"/>
             <ImageView
                 android:layout_width="13dp"
-                android:src="@drawable/ic_star_on"
+                tools:src="@drawable/ic_star_on"
+                android:src="@{item.score>3?@drawable/ic_star_on:@drawable/ic_star_off_two}"
                 android:layout_marginEnd="3dp"
                 android:layout_height="13dp"/>
             <ImageView
                 android:layout_width="13dp"
-                android:src="@drawable/ic_star_on"
+                tools:src="@drawable/ic_star_on"
+                android:src="@{item.score>4?@drawable/ic_star_on:@drawable/ic_star_off_two}"
                 android:layout_marginEnd="9dp"
                 android:layout_height="13dp"/>
             <TextView
                 android:layout_width="wrap_content"
                 tools:text="5分"
+                android:text="@{item.score+@string/branch}"
                 android:textSize="12sp"
                 android:textColor="#939393"
                 android:layout_height="wrap_content"/>
 
-
         </LinearLayout>
 
         <LinearLayout
@@ -88,6 +93,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     tools:text="运单号YD2020009122211"
+                    android:text="@{@string/waybill_number+item.info_sn}"
                     android:textColor="#3D3F4E"
                     android:textSize="14sp"
                     android:layout_height="wrap_content"/>
@@ -97,6 +103,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="#A7A7B4"
                     android:textSize="12sp"
+                    android:text="@{item.create_time}"
                     android:layout_marginTop="4dp"
                     tools:text="2020-09-15 12:30:20" />
 

+ 10 - 5
app/src/main/res/layout/item_each_other.xml

@@ -53,27 +53,32 @@
 
                 <ImageView
                     android:layout_width="13dp"
-                    android:src="@drawable/ic_star_on"
+                    tools:src="@drawable/ic_star_on"
+                    android:src="@{item.score>0?@drawable/ic_star_on:@drawable/ic_star_off_two}"
                     android:layout_marginEnd="3dp"
                     android:layout_height="13dp"/>
                 <ImageView
                     android:layout_width="13dp"
-                    android:src="@drawable/ic_star_on"
+                    tools:src="@drawable/ic_star_on"
+                    android:src="@{item.score>1?@drawable/ic_star_on:@drawable/ic_star_off_two}"
                     android:layout_marginEnd="3dp"
                     android:layout_height="13dp"/>
                 <ImageView
                     android:layout_width="13dp"
-                    android:src="@drawable/ic_star_on"
+                    tools:src="@drawable/ic_star_on"
+                    android:src="@{item.score>2?@drawable/ic_star_on:@drawable/ic_star_off_two}"
                     android:layout_marginEnd="3dp"
                     android:layout_height="13dp"/>
                 <ImageView
                     android:layout_width="13dp"
-                    android:src="@drawable/ic_star_on"
+                    tools:src="@drawable/ic_star_on"
+                    android:src="@{item.score>3?@drawable/ic_star_on:@drawable/ic_star_off_two}"
                     android:layout_marginEnd="3dp"
                     android:layout_height="13dp"/>
                 <ImageView
                     android:layout_width="13dp"
-                    android:src="@drawable/ic_star_on"
+                    tools:src="@drawable/ic_star_on"
+                    android:src="@{item.score>4?@drawable/ic_star_on:@drawable/ic_star_off_two}"
                     android:layout_marginEnd="9dp"
                     android:layout_height="13dp"/>
                 <TextView

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -502,4 +502,5 @@ Api 已达到使用限制
 
 
 
+
 </resources >