1.统计

app/build.gradle

@@ -13,7 +13,7 @@ android {
         versionName rootProject.application_version_name
         manifestPlaceholders = [
                 JPUSH_PKGNAME: 'com.quansu.heifengwuliu',
-                JPUSH_APPKEY : "fe6707d0979ba5e2059b8fb9",//值来自开发者平台取得的AppKey
+                JPUSH_APPKEY : "315cad416dd39b8a8e2b5a92",//值来自开发者平台取得的AppKey
                 JPUSH_CHANNEL: "default_developer",
         ]
         ndk {

app/src/main/java/com/quansu/heifengwuliu/fragment/AccountAnalysisFragment.kt

@@ -31,11 +31,17 @@ class AccountAnalysisFragment : MBFragment<AccountAnalysisVModel, FragmentAccoun
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
 
+        vm.getInfo()
         // 初始化表格manager
         mChartManager = LineChartManager(binding.chart)
         mMarkerView = MyMarkerView(context, R.layout.chart_marker_view)
         mChartManager!!.setMarkView(mMarkerView)
 
+        vm.info.observe(this, androidx.lifecycle.Observer {
+
+            initData(it)
+        })
+
 
 
     }
@@ -112,7 +118,14 @@ class AccountAnalysisFragment : MBFragment<AccountAnalysisVModel, FragmentAccoun
             mMarkerView!!.showMarkView(entry.x, entry.y)
             binding.chart.animateXY(800, 800)
             binding.chart.invalidate()
+        }else{//没有数据
+            if(mXData.size>0){//清空数据
+                binding.chart.clear()
+            }
+
+
         }
+
     }
 
 

app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerSingleFragment.kt

@@ -37,9 +37,6 @@ import com.ysnows.base.model.PositionBean
 import com.ysnows.base.route.IGaode
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
-import kotlinx.android.synthetic.main.fragment_ownersingle.*
-import kotlinx.android.synthetic.main.item_weather.*
-import kotlinx.android.synthetic.main.item_weather.view.*
 import java.text.DecimalFormat
 
 /**

app/src/main/java/com/quansu/heifengwuliu/mp/LineChartManager.java

@@ -91,7 +91,7 @@ public class LineChartManager {
             yAxisLeft.setValueFormatter(new ValueFormatter() {
                 @Override
                 public String getFormattedValue(float value) {
-                    return mDecimalFormat.format(value)+"%";
+                    return mDecimalFormat.format(value)+"元";
 
                 }
             });

app/src/main/java/com/quansu/heifengwuliu/utils/net/ApiService.kt

@@ -698,12 +698,25 @@ interface ApiService {
     suspend fun articleInfo(@Query("article_id") article_id: String?): Resp<ArticleInfo>
 
 
-
-
     /**
      * 删除收藏
      */
     @GET("api/driver/delDriver")
     suspend fun delDriver(@Query("arr") arr: String?): Resp<Any>
 
+
+    /**
+     * 统计折线-货主
+     * @return
+     */
+    @GET("api/amount/amountLine")
+    suspend fun amountLine(@Query("start_time") start_time: String?,
+                           @Query("end_time") end_time: String?,@Query("k") k: String?
+    ): Resp<IconData>
+
+
+
+
+
+
 }

app/src/main/java/com/quansu/heifengwuliu/vmodel/AccountAnalysisVModel.kt

@@ -1,12 +1,20 @@
 package com.quansu.heifengwuliu.vmodel
 
 import android.app.Application
+import android.text.TextUtils
+import android.view.inputmethod.EditorInfo
+import androidx.databinding.Bindable
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.quansu.heifengwuliu.BR
 import com.quansu.heifengwuliu.inte.ChoiceData
 import com.quansu.heifengwuliu.model.AmountCount
+import com.quansu.heifengwuliu.model.IconData
 import com.quansu.heifengwuliu.utils.dialog.ChoseTimeDialog
+import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
+import kotlinx.coroutines.launch
 
 /**
  *Created by shihuiyun
@@ -14,19 +22,62 @@ import com.ysnows.base.base.BViewModel
  */
 class AccountAnalysisVModel(application: Application) : BViewModel<BRepository>(application) {
 
+    val info: MutableLiveData<IconData> = MutableLiveData<IconData>()
 
     val timeData: MutableLiveData<String> = MutableLiveData<String>()
 
+    var start_time=""
+    var end_time=""
+
+
+    @Bindable
+    var k: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.k)
+        }
 
     fun  choseTime(){//选择时间
 
         ChoseTimeDialog.choseTime(repository().context!!,object: ChoiceData {
             override fun onRestuse(time: String?) {
                 timeData.value=time
+                var ss=time!!.split("至")
+                start_time=ss[0]
+                end_time=ss[1]
+                //刷新
+                getInfo()
             }
         })
 
     }
 
+    fun goSearch(){
+        getInfo()
+    }
+
+
+
+
+
+    fun getInfo(){
+
+
+        viewModelScope.launch {
+
+          var it=  repository().lreq { NetEngine.service.amountLine(start_time,end_time,k)  }
+            if(it.ok()){
+                info.value=it.data()
+            }
+        }
+    }
+
+
+    fun onAction(actionId: Int): Boolean {
+        if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+            getInfo()
+        }
+        return false;
+    }
 
 }

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

@@ -90,6 +90,8 @@
                        android:textColor="@color/text_title"
                        android:textColorHint="#95959A"
                        android:layout_marginStart="4dp"
+                       android:imeOptions="actionDone"
+                       app:on_action="@{(a,b,c)->vm.onAction(b)}"
                        android:layout_height="wrap_content"/>
 
 
@@ -102,6 +104,7 @@
                 android:layout_width="wrap_content"
                 android:textColor="#333333"
                 android:textSize="12sp"
+                android:onClick="@{v->vm.goSearch()}"
                 android:gravity="center_vertical"
                 android:text="搜索"
                 android:layout_marginStart="10dp"
@@ -129,6 +132,7 @@
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:layout_width="120dp"
                     app:qmui_radius="4dp"
+                    android:visibility="gone"
                     app:qmui_borderColor="#95959A"
                     app:qmui_borderWidth="1dp"
                     android:orientation="horizontal"

base/src/main/java/com/ysnows/base/binding/ImageBindingAdapter.kt

@@ -2,26 +2,31 @@ package com.ysnows.base.binding
 
 import android.graphics.drawable.Drawable
 import android.text.TextUtils
+import android.util.Log
 import android.widget.ImageView
 import androidx.databinding.BindingAdapter
 import coil.load
+import com.ysnows.base.R
 
 object ImageBindingAdapter {
 
     @BindingAdapter(value = ["url", "drawable"], requireAll = false)
     @JvmStatic
     fun setUrlWithDrawable(view: ImageView, url: String?, drawable: Drawable?) {
+
         if (!url.isNullOrEmpty()) {
-            view.load(url)
+            view.load(url){
+                placeholder(drawable)
+                error(drawable)
+            }
             return
         }
 
-
         if (drawable != null) {
+
             view.load(drawable)
         }
 
-
     }
 
     @BindingAdapter("android:src")

jpush/build.gradle

@@ -12,7 +12,7 @@ android {
         multiDexEnabled true
         manifestPlaceholders = [
                 JPUSH_PKGNAME: 'com.quansu.heifengwuliu',
-                JPUSH_APPKEY : "fe6707d0979ba5e2059b8fb9",//值来自开发者平台取得的AppKey
+                JPUSH_APPKEY : "315cad416dd39b8a8e2b5a92",//值来自开发者平台取得的AppKey
                 JPUSH_CHANNEL: "default_developer",
         ]
 //        ndk {