mirror/VlcJellyfin
1
0
Fork 0
mirror of https://github.com/sifacaii/VlcJellyfin synced 2025-06-03 00:58:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

修复登录框

Browse Source
This commit is contained in:
sifacaii 2022-08-27 16:35:09 +08:00
parent 68cc5eee2c
commit 0f726843a6
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/sifacai/vlcjellyfin/MainActivity.java
View File

@ -313,9 +313,8 @@ public class MainActivity extends BaseActivity {
if (valid) { if (valid) {
String publicUrl = url + "/system/info/public"; String publicUrl = url + "/system/info/public";
String publicInfo = Utils.okhttpSend(publicUrl); String publicInfo = Utils.okhttpSend(publicUrl);
if (publicInfo != null && publicInfo.length() > 0) { JsonObject serverInfo = Utils.JsonToObj(publicInfo,JsonObject.class);
JsonObject serverInfo = null; if (serverInfo != null) {
serverInfo = new Gson().fromJson(publicInfo, JsonObject.class);
String ServerId = serverInfo.get("Id").getAsString(); String ServerId = serverInfo.get("Id").getAsString();
if (ServerId == null || ServerId.length() == 0) { if (ServerId == null || ServerId.length() == 0) {
return false; return false;
@ -339,9 +338,10 @@ public class MainActivity extends BaseActivity {
String url = "/Users/authenticatebyname"; String url = "/Users/authenticatebyname";
String reqjson = "{\"Username\":\"" + username + "\",\"Pw\":\"" + password + "\"}"; String reqjson = "{\"Username\":\"" + username + "\",\"Pw\":\"" + password + "\"}";
String userinfo = Utils.okhttpSend(url, reqjson); String userinfo = Utils.okhttpSend(url, reqjson);
if (userinfo.length() > 0) { Log.d(TAG, "authenticateByName: userinf:" + userinfo);
JsonObject userObj = new Gson().fromJson(userinfo, JsonObject.class); JsonObject userObj = Utils.JsonToObj(userinfo,JsonObject.class);
String userId = userObj.getAsJsonObject("User").get("Id").getAsString(); if (userObj != null) {
String userId = Utils.getJsonString(userObj,"User").getAsJsonObject().get("Id").getAsString();
String Token = userObj.get("AccessToken").getAsString(); String Token = userObj.get("AccessToken").getAsString();
if (Token != null) { if (Token != null) {
Utils.UserId = userId; Utils.UserId = userId;

11
app/src/main/java/org/sifacai/vlcjellyfin/Utils.java
View File

@ -116,6 +116,17 @@ public class Utils {
return url; return url;
} }
public static <T> T JsonToObj(String jsonStr,Class<T> tClass){
if(jsonStr != null && jsonStr.length() > 0){
try {
return new Gson().fromJson(jsonStr,tClass);
}catch (Exception e){
return null;
}
}
return null;
}
/** /**
* 获取Json项 * 获取Json项
* @param jo * @param jo