diff --git a/README.md b/README.md index 5093455..077e826 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,22 @@ FindMaimaiUltra 是一个 Android 应用程序，用于查询和展示 Maimai（ 5. **查看歌曲详情**： - 在歌曲成绩列表中点击某首歌曲，将弹出详细信息对话框。 +## 排卡功能开发 +目前Host: https://mais.godserver.cn + + +| 功能描述 | 请求方式 | 请求 URL | 参数说明 | 返回值示例 | +|--------------|----------|---------------------------------------------------------------------|-----------------------------------------------------|------| +| 获取party的排卡队列 | `GET` | `/api/mai/v1/party?party={party}` | `party`: 房间名称 | `["a1","a2","a3"}]` | +| 排卡 | `POST` | `/api/mai/v1/party?party={party}&people={people}` | `party`: 房间名称 `people`:排卡名称 | `["a1","a2","a3"}]` | +| 排卡插队位置 | `PUT` | `/api/mai/v1/party?party={party}&people={people}&changeToPeople={changeToPeople}` | `party`: 房间名称 `people`:排卡名称 `changeToPeople`:插队对象名称 | `["a1","a2","a3"}]` | +| 退勤 | `DELETE` | `/api/mai/v1/party?party={party}&people={people}` | `party`: 房间名称 `people`:排卡名称 | `["a1","a2","a3"}]` | +| 完成一次上机 | `POST` | `/api/mai/v1/partyPlay?party={party}` | `party`: 房间名称 | `["a2","a3","a1"}]` | +| 指定对象上机 | `DELETE` | `/api/mai/v1/partyPlay?party={party}&people={people}` | `party`: 房间名称 `people`:上机对象 | `a3` | +| 获取房间正在上机对象 | `GET` | `/api/mai/v1/partyPlay?party={party}` | `party`: 房间名称 | `["a2","a3","a1"}]` | +| 获取排卡对象的卡 | `GET` | `/api/mai/v1/player?party={party}&people={people}` | `party`: 房间名称 `people`:上机对象 | `default` | +| 提交排卡对象的卡 | `POST` | `/api/mai/v1/player?party={party}&people={people}&card={card}` | `party`: 房间名称 `people`:上机对象 `card`:卡名 | `default` | + ## 依赖项 - `com.google.android.gms:play-services-location:21.0.1` diff --git a/app/src/main/java/org/astral/findmaimaiultra/ui/LinkQQBot.java b/app/src/main/java/org/astral/findmaimaiultra/ui/LinkQQBot.java index 626aaed..2202bca 100644 --- a/app/src/main/java/org/astral/findmaimaiultra/ui/LinkQQBot.java +++ b/app/src/main/java/org/astral/findmaimaiultra/ui/LinkQQBot.java @@ -185,7 +185,7 @@ public class LinkQQBot extends AppCompatActivity { String json = response.body().string(); UserData userData = new Gson().fromJson(json, UserData.class); SharedPreferences.Editor editor = sp.edit(); - editor.putString("paikaname", userData.getUserName()); + editor.putString("https://mais.godserver.cn", userData.getUserName()); editor.putInt("iconId",userData.getIconId()); editor.putString("rating", userData.getPlayerRating() + ""); editor.apply(); diff --git a/app/src/main/java/org/astral/findmaimaiultra/ui/PageActivity.java b/app/src/main/java/org/astral/findmaimaiultra/ui/PageActivity.java index ca0f9d0..60c8951 100644 --- a/app/src/main/java/org/astral/findmaimaiultra/ui/PageActivity.java +++ b/app/src/main/java/org/astral/findmaimaiultra/ui/PageActivity.java @@ -457,7 +457,7 @@ public class PageActivity extends AppCompatActivity { RequestBody body = RequestBody.create(json, MediaType.parse("application/json; charset=utf-8")); Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/mai/v1/placeContent") + .url("https://mais.godserver.cn/api/mai/v1/placeContent") .post(body) .build(); @@ -489,7 +489,7 @@ public class PageActivity extends AppCompatActivity { OkHttpClient client = new OkHttpClient(); Log.d("TAG", "fetchReviewsFromApi: " + id); Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/mai/v1/placeContent?id=" + id) + .url("https://mais.godserver.cn/api/mai/v1/placeContent?id=" + id) .build(); client.newCall(request).enqueue(new Callback() { @@ -523,7 +523,7 @@ public class PageActivity extends AppCompatActivity { private void checkAndIntial() { String androidId = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - String url = "http://mai.godserver.cn:11451/api/mai/v1/check?androidId=" + androidId; + String url = "https://mais.godserver.cn/api/mai/v1/check?androidId=" + androidId; Request request = new Request.Builder() .url(url) .build(); @@ -682,7 +682,7 @@ public class PageActivity extends AppCompatActivity { } public void update(Place place) { String androidId = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - String url = "http://mai.godserver.cn:11451/api/mai/v1/place?androidId=" + androidId; + String url = "https://mais.godserver.cn/api/mai/v1/place?androidId=" + androidId; String json = new Gson().toJson(place); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), json); Request request = new Request.Builder() @@ -837,7 +837,7 @@ public class PageActivity extends AppCompatActivity { @Override protected String doInBackground(Void... voids) { OkHttpClient client = new OkHttpClient(); - String web = "http://mai.godserver.cn:11451/api/" + type_code + "/v1/place?id=" + id + "&type=" + type; + String web = "https://mais.godserver.cn/api/" + type_code + "/v1/place?id=" + id + "&type=" + type; System.out.println(web); @SuppressLint("StaticFieldLeak") Request request = new Request.Builder() .url(web) @@ -871,7 +871,7 @@ public class PageActivity extends AppCompatActivity { @Override protected String doInBackground(Void... voids) { OkHttpClient client = new OkHttpClient(); - String web = "http://mai.godserver.cn:11451/api/" + type_code + "/v1/near?id=" + place_centor.getId(); + String web = "https://mais.godserver.cn/api/" + type_code + "/v1/near?id=" + place_centor.getId(); Log.d("Web", web); @SuppressLint("StaticFieldLeak") Request request = new Request.Builder() .url(web) @@ -949,7 +949,7 @@ public class PageActivity extends AppCompatActivity { @Override protected String doInBackground(Void... voids) { OkHttpClient client = new OkHttpClient(); - String web = "http://mai.godserver.cn:11451/api/" + type_code + "/v1/num?id=" + id + "&num=" + num + "&numJ=" + numJ; + String web = "https://mais.godserver.cn/api/" + type_code + "/v1/num?id=" + id + "&num=" + num + "&numJ=" + numJ; Log.d("Web", numJ + ""); @SuppressLint("StaticFieldLeak") Request request = new Request.Builder() .url(web) @@ -1069,7 +1069,7 @@ public class PageActivity extends AppCompatActivity { // 创建请求 Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/" + type_code + "/v1/near") + .url("https://mais.godserver.cn/api/" + type_code + "/v1/near") .post(body) .build(); @@ -1166,10 +1166,10 @@ public class PageActivity extends AppCompatActivity { this.douyin = douyin; RequestBody body = RequestBody.create(meituan, MediaType.parse("application/json; charset=utf-8")); Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/" + type_code + "/v1/updateLink?id=" + id + "&meituan=" + meituan + "&douyin=" + douyin) + .url("https://mais.godserver.cn/api/" + type_code + "/v1/updateLink?id=" + id + "&meituan=" + meituan + "&douyin=" + douyin) .post(body) .build(); - Log.d("url",("http://mai.godserver.cn:11451/api/" + type_code + "/v1/updateLink?id=" + id + "&meituan=" + meituan + "&douyin=" + douyin)); + Log.d("url",("https://mais.godserver.cn/api/" + type_code + "/v1/updateLink?id=" + id + "&meituan=" + meituan + "&douyin=" + douyin)); client.newCall(request).enqueue(new Callback() { @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { diff --git a/app/src/main/java/org/astral/findmaimaiultra/ui/PaikaActivity.java b/app/src/main/java/org/astral/findmaimaiultra/ui/PaikaActivity.java index ee198f6..58692d1 100644 --- a/app/src/main/java/org/astral/findmaimaiultra/ui/PaikaActivity.java +++ b/app/src/main/java/org/astral/findmaimaiultra/ui/PaikaActivity.java @@ -417,7 +417,7 @@ public class PaikaActivity extends AppCompatActivity { private void getData() { Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/mai/v1/party?party=" + use_party) + .url("https://mais.godserver.cn/api/mai/v1/party?party=" + use_party) .build(); OkHttpClient client = new OkHttpClient(); client.newCall(request).enqueue(new Callback() { @@ -445,7 +445,7 @@ public class PaikaActivity extends AppCompatActivity { return; } Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/mai/v1/party?party=" + use_party + "&people=" + use_name + "()" + iconId) + .url("https://mais.godserver.cn/api/mai/v1/party?party=" + use_party + "&people=" + use_name + "()" + iconId) .post(RequestBody.create("", MediaType.parse("application/json"))) .build(); OkHttpClient client = new OkHttpClient(); @@ -467,7 +467,7 @@ public class PaikaActivity extends AppCompatActivity { private void remove() { Log.d("123456", "remove"); Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/mai/v1/party?party=" + use_party + "&people=" + use_name + "()" + iconId) + .url("https://mais.godserver.cn/api/mai/v1/party?party=" + use_party + "&people=" + use_name + "()" + iconId) .delete(RequestBody.create("", MediaType.parse("application/json"))) .build(); OkHttpClient client = new OkHttpClient(); @@ -489,7 +489,7 @@ public class PaikaActivity extends AppCompatActivity { } private void play() { Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/mai/v1/partyPlay?party=" + use_party ) + .url("https://mais.godserver.cn/api/mai/v1/partyPlay?party=" + use_party ) .post(RequestBody.create("", MediaType.parse("application/json"))) .build(); OkHttpClient client = new OkHttpClient(); @@ -594,7 +594,7 @@ public class PaikaActivity extends AppCompatActivity { }); removeButton.setOnClickListener(v2->{ Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/mai/v1/party?party=" + use_party + "&people=" +players.get(finalI)) + .url("https://mais.godserver.cn/api/mai/v1/party?party=" + use_party + "&people=" +players.get(finalI)) .delete(RequestBody.create("", MediaType.parse("application/json"))) .build(); OkHttpClient client = new OkHttpClient(); @@ -617,7 +617,7 @@ public class PaikaActivity extends AppCompatActivity { fuzhushangji.setOnClickListener(v2->{ if (finalI == 2 ) { Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/mai/v1/partyPlay?party=" + use_party ) + .url("https://mais.godserver.cn/api/mai/v1/partyPlay?party=" + use_party ) .post(RequestBody.create("", MediaType.parse("application/json"))) .build(); OkHttpClient client = new OkHttpClient(); @@ -668,11 +668,11 @@ public class PaikaActivity extends AppCompatActivity { private void change(String to) { Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/mai/v1/party?party=" + use_party + "&people=" + use_name + "()" + iconResId + "&changeToPeople=" + to) + .url("https://mais.godserver.cn/api/mai/v1/party?party=" + use_party + "&people=" + use_name + "()" + iconResId + "&changeToPeople=" + to) .put(RequestBody.create("", MediaType.parse("application/json"))) .build(); OkHttpClient client = new OkHttpClient(); - Log.d("123456", "http://mai.godserver.cn:11451/api/mai/v1/party?party=" + use_party + "&people=" + use_name + "()" + iconResId + "&changeToPeople=" + to); + Log.d("123456", "https://mais.godserver.cn/api/mai/v1/party?party=" + use_party + "&people=" + use_name + "()" + iconResId + "&changeToPeople=" + to); client.newCall(request).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -692,17 +692,17 @@ public class PaikaActivity extends AppCompatActivity { } private void change(String to,int type) { Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/mai/v1/party?party=" + use_party + "&people=" + use_name + "()" + iconResId + "&changeToPeople=" + to) + .url("https://mais.godserver.cn/api/mai/v1/party?party=" + use_party + "&people=" + use_name + "()" + iconResId + "&changeToPeople=" + to) .put(RequestBody.create("", MediaType.parse("application/json"))) .build(); OkHttpClient client = new OkHttpClient(); - Log.d("123456", "http://mai.godserver.cn:11451/api/mai/v1/party?party=" + use_party + "&people=" + use_name + "()" + iconResId + "&changeToPeople=" + to); + Log.d("123456", "https://mais.godserver.cn/api/mai/v1/party?party=" + use_party + "&people=" + use_name + "()" + iconResId + "&changeToPeople=" + to); client.newCall(request).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { if (response.isSuccessful()) { Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/mai/v1/partyPlay?party=" + use_party ) + .url("https://mais.godserver.cn/api/mai/v1/partyPlay?party=" + use_party ) .post(RequestBody.create("", MediaType.parse("application/json"))) .build(); OkHttpClient client = new OkHttpClient(); diff --git a/app/src/main/java/org/astral/findmaimaiultra/ui/home/HomeFragment.java b/app/src/main/java/org/astral/findmaimaiultra/ui/home/HomeFragment.java index 3d2773e..32a26e1 100644 --- a/app/src/main/java/org/astral/findmaimaiultra/ui/home/HomeFragment.java +++ b/app/src/main/java/org/astral/findmaimaiultra/ui/home/HomeFragment.java @@ -272,16 +272,16 @@ public class HomeFragment extends Fragment { String web = ""; try { tag = city.split("市")[0]; - web = "http://mai.godserver.cn:11451/api/mai/v1/search?prompt1=" + tag+ "&status=市"; + web = "https://mais.godserver.cn/api/mai/v1/search?prompt1=" + tag+ "&status=市"; }catch ( Exception e) { tag = "xy("+ x +","+ y +")"; - web = "http://mai.godserver.cn:11451/api/mai/v1/search?prompt1=" + tag+ "&status=xy"; + web = "https://mais.godserver.cn/api/mai/v1/search?prompt1=" + tag+ "&status=xy"; } Log.d("WebWebWebWebWebWebWebWebWebWeb ", web); if (!isFlag) { - web = "http://mai.godserver.cn:11451/api/mai/v1/search?data_place=" + tagplace; + web = "https://mais.godserver.cn/api/mai/v1/search?data_place=" + tagplace; } Request request = new Request.Builder() @@ -624,7 +624,7 @@ public class HomeFragment extends Fragment { } private void addPlace(Place place) { - String url = "http://mai.godserver.cn:11451/api/mai/v1/place"; + String url = "https://mais.godserver.cn/api/mai/v1/place"; String body = new Gson().toJson(place,Place.class); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), body); Request request = new Request.Builder() diff --git a/app/src/main/java/org/astral/findmaimaiultra/ui/music/MusicFragment.java b/app/src/main/java/org/astral/findmaimaiultra/ui/music/MusicFragment.java index 3530a9e..4187547 100644 --- a/app/src/main/java/org/astral/findmaimaiultra/ui/music/MusicFragment.java +++ b/app/src/main/java/org/astral/findmaimaiultra/ui/music/MusicFragment.java @@ -121,7 +121,7 @@ public class MusicFragment extends Fragment { private void updateScores() { OkHttpClient client = new OkHttpClient(); - String url = "http://mai.godserver.cn:11451/api/qq/getAAALLL?qq=" + userId; + String url = "https://mais.godserver.cn/api/qq/getAAALLL?qq=" + userId; RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), ""); Request request = new Request.Builder() .url(url) diff --git a/app/src/main/java/org/astral/findmaimaiultra/ui/pixiv/PixivFragment.java b/app/src/main/java/org/astral/findmaimaiultra/ui/pixiv/PixivFragment.java index a3103a4..1bd71bc 100644 --- a/app/src/main/java/org/astral/findmaimaiultra/ui/pixiv/PixivFragment.java +++ b/app/src/main/java/org/astral/findmaimaiultra/ui/pixiv/PixivFragment.java @@ -174,7 +174,7 @@ public class PixivFragment extends Fragment { private void fetchDataMai(String query, int i, Snackbar snackbar) { OkHttpClient client = new OkHttpClient(); Request request = new Request.Builder() - .url("http://mai.godserver.cn:11451/api/mai/v1/searchAll?query=" + query ) + .url("https://mais.godserver.cn/api/mai/v1/searchAll?query=" + query ) .build(); snackbar.dismiss(); client.newCall(request).enqueue(new Callback() {