From a046d5a804d6842796a718fba4e98c3259340a60 Mon Sep 17 00:00:00 2001
From: Runt <qingingrunt2010@qq.com>
Date: Sat, 04 Jun 2022 12:42:04 +0000
Subject: [PATCH] 接口参数问题 标题栏 添加收藏功能
---
app/src/main/java/com/auto/lyric/vm/MainViewModel.java | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/app/src/main/java/com/auto/lyric/vm/MainViewModel.java b/app/src/main/java/com/auto/lyric/vm/MainViewModel.java
index e83144f..4e3ec42 100644
--- a/app/src/main/java/com/auto/lyric/vm/MainViewModel.java
+++ b/app/src/main/java/com/auto/lyric/vm/MainViewModel.java
@@ -5,12 +5,6 @@
import com.auto.lyric.retrofit.api.CollectApiCenter;
import com.auto.lyric.retrofit.observable.LoadingHttpObserver;
import com.auto.lyric.retrofit.utils.RetrofitUtils;
-import com.auto.lyric.util.DeviceIdUtils;
-import com.auto.lyric.util.NetWorkUtils;
-import com.auto.lyric.util.SHA1UTIL;
-
-import java.util.Date;
-import java.util.UUID;
import io.reactivex.Observable;
@@ -26,26 +20,25 @@
}
public void checkActive(String userId,String activeKey,LoadingHttpObserver<ActiveResult> observer){
- String ip = NetWorkUtils.getNetIp();
- String random = UUID.randomUUID().toString();
- long time = new Date().getTime()/1000;
- String deviceId = DeviceIdUtils.getAndroidId(activity);
- String sign = String.format("%s%s%s%s%s%s",activeKey,ip,deviceId ,random,time,userId);
-
- Observable<ActiveResult> observable = apiCenter.loginCheck(activeKey, ip,deviceId, random, time, userId, SHA1UTIL.MD5(SHA1UTIL.getSHA(sign)));
+ Observable<ActiveResult> observable = apiCenter.loginCheck(getApiFileds(userId,activeKey));
httpObserverOn(observable,observer);
}
public void register(String activeKey,LoadingHttpObserver<ActiveResult> observer){
- String ip = NetWorkUtils.getNetIp();
- String random = UUID.randomUUID().toString();
- long time = new Date().getTime()/1000;
- int userId = 0;
- String deviceId = DeviceIdUtils.getAndroidId(activity);
- String sign = String.format("%s%s%s%s%s%s",activeKey,ip,deviceId ,random,time,userId);
-
- Observable<ActiveResult> observable = apiCenter.register(activeKey, ip,deviceId, random, time, userId, SHA1UTIL.MD5(SHA1UTIL.getSHA(sign)));
+ Observable<ActiveResult> observable = apiCenter.register(getApiFileds("0",activeKey));
httpObserverOn(observable,observer);
}
+ /**
+ *
+ * @param userId
+ * @param activeKey
+ * @param title 歌词标题
+ * @param lrc 歌词内容
+ * @param observer
+ */
+ public void addToCollect(String userId,String activeKey,String title,String lrc,LoadingHttpObserver<ActiveResult> observer){
+ httpObserverOn(apiCenter.addLrcToCollect(title,lrc,getApiFileds(userId,activeKey)),observer);
+ }
+
}
--
Gitblit v1.9.1