From 549a487148522fa4a459967cd6546e22a315ae52 Mon Sep 17 00:00:00 2001
From: Runt <qingingrunt2010@qq.com>
Date: Mon, 26 Dec 2022 15:17:52 +0000
Subject: [PATCH] 上传歌词
---
app/src/main/java/com/auto/lyric/vm/MainViewModel.java | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 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 ad1aad3..d646f38 100644
--- a/app/src/main/java/com/auto/lyric/vm/MainViewModel.java
+++ b/app/src/main/java/com/auto/lyric/vm/MainViewModel.java
@@ -5,14 +5,13 @@
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 java.io.File;
import io.reactivex.Observable;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
/**
* Created by Runt (qingingrunt2010@qq.com) on 2022/3/20.
@@ -25,28 +24,38 @@
apiCenter = RetrofitUtils.getInstance().getRetrofit(CollectApiCenter.class);
}
- public void checkActive(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)));
+ public void checkActive(String userId,String activeKey,LoadingHttpObserver<ActiveResult> observer){
+ 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);
}
+ public void uploadFile(String userId,String activeKey,File file){
+ RequestBody body = RequestBody.create(MediaType.parse("text/plain; charset=utf-8"),file);
+ MultipartBody.Part part = MultipartBody.Part.createFormData("file", file.getName(), body);
+ httpObserverOn(apiCenter.uploadLrc(part, getApiMultiFileds(userId, activeKey)), new LoadingHttpObserver<ActiveResult>(activity) {
+ @Override
+ public void onComplete(ActiveResult error) {
+
+ }
+
+ });
+ }
+
+ /**
+ *
+ * @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