From fcdddf8b9b34f9930bec454b5fffe41c0e33ba3c Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期一, 24 四月 2023 21:17:05 +0800
Subject: [PATCH] 功能模块大部分
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivityViewModel.java | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivityViewModel.java
index 8fa8936..d7d8806 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivityViewModel.java
@@ -5,22 +5,18 @@
import android.app.Application;
import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import com.android.app_base.base.StateViewEnum;
import com.android.app_base.base.viewmodel.BaseViewModel;
import com.android.app_base.http.ResultData;
import com.android.app_base.utils.RxUtils;
-import com.application.zhangshi_app_android.bean.FamilyAssetsBean;
-import com.application.zhangshi_app_android.bean.FamilyAssetsResponseBean;
import com.application.zhangshi_app_android.bean.HomeDevicesBean;
import com.application.zhangshi_app_android.bean.HomeDevicesResponseBean;
import com.application.zhangshi_app_android.data.DataRepository;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
@@ -48,14 +44,6 @@
}
public void getHomeDevices(){
- List<HomeDevicesBean> list = new ArrayList<>();
- list.add(new HomeDevicesBean(1,"鐢佃","2023-04-03","寮犱笁","澶忔櫘娑叉櫠鐢佃","瀹㈠巺","4k瓒呴珮娓�",""));
- list.add(new HomeDevicesBean(1,"鐢佃","2023-04-02","寮犱笁","澶忔櫘娑叉櫠鐢佃","瀹㈠巺","4k瓒呴珮娓�",""));
- list.add(new HomeDevicesBean(1,"鐢佃","2023-04-01","寮犱笁","澶忔櫘娑叉櫠鐢佃","瀹㈠巺","4k瓒呴珮娓�",""));
- if (list != null && !list.isEmpty()){
- dataListLiveData.postValue(list);
- return;
- }
model.getHomeDevices(new HashMap<>())
.compose(RxUtils.schedulersTransformer())
.subscribe(new Observer<ResultData<HomeDevicesResponseBean>>() {
@@ -118,8 +106,8 @@
Date date1 = null;
Date date2 = null;
try {
- date1 = format.parse(o1.getCreateTime());
- date2 = format.parse(o2.getCreateTime());
+ date1 = format.parse(o1.getCreateDate());
+ date2 = format.parse(o2.getCreateDate());
} catch (ParseException e) {
throw new RuntimeException(e);
}
--
Gitblit v1.9.1