优化详情页

app/src/main/java/org/sifacai/vlcjellyfin/DetailActivity.java

@@ -107,7 +107,7 @@ public class DetailActivity extends BaseActivity implements JAdapter.OnItemClick
         String Genres = String.join(",", details.getGenres());
 
         tvTitle.setText(Name);
-        tvDetails.append(details.getProductionYear().equals("") ? "" : "年份：" + details.getProductionYear() + "  ");
+        tvDetails.append(details.getProductionYear() == null ? "" : "年份：" + details.getProductionYear() + "  ");
         tvDetails.append(Genres.equals("") ? "" : "风格：" + Genres + "\n");
         tvDetails.append(details.getCommunityRating() == null ? "" : "评分：" + details.getCommunityRating() + "  ");
         tvDetails.append(details.getOfficialRating() == null ? "" : "评级：" + details.getOfficialRating() + "\n");
@@ -133,8 +133,8 @@ public class DetailActivity extends BaseActivity implements JAdapter.OnItemClick
             tvDetails.append(audio.equals("") ? "" : "音频：" + audio + "\n");
             tvDetails.append(subtitle.equals("") ? "" : "字幕：" + subtitle + "\n");
         }
-
+        String overview = details.getOverview() == null ? "" : details.getOverview();
-        tvDetails.append("简介：  " + Html.fromHtml(details.getOverview()));
+        tvDetails.append("简介：  " + Html.fromHtml(overview));
 
         //填充列表
         String type = details.getType();
@@ -150,10 +150,8 @@ public class DetailActivity extends BaseActivity implements JAdapter.OnItemClick
         } else if (type.equals("Movie")) {
             fillMovie(details);
         } else if (type.equals("Person")) {
-            String ProductionLocations = details.getProductionLocations().toString();
+            tvDetails.append("\n出生日期：" + Utils.UtcToLocal(details.getPremiereDate()) + "\n");
-            String PremiereDate = String.join(",", details.getPremiereDate());
+            tvDetails.append("出生地：" + String.join(",",details.getProductionLocations()));
-            tvDetails.append("\n出生日期：" + Utils.UtcToLocal(PremiereDate) + "\n");
-            tvDetails.append("出生地：" + (ProductionLocations == null ? "" : ProductionLocations));
             fillItemsByPerson(Id);
         }
 

app/src/main/java/org/sifacai/vlcjellyfin/HomeActivity.java

@@ -39,43 +39,38 @@ public class HomeActivity extends BaseActivity{
 
         JfClient.init(getApplication());
 
-        Log.d(TAG, "onCreate: " + JfClient.config.getJellyfinUrl());
         if (JfClient.AccessToken.equals("") || JfClient.UserId.equals("")) {
             showLoadingDialog("正在验证服务器地址！");
             JfClient.VerityServerUrl(JfClient.config.getJellyfinUrl(), new JfClient.JJCallBack() {
                 @Override
                 public void onSuccess(Boolean bool) {
-                    dismissLoadingDialog();
+                    setLoadingText("正在验证用户名和密码！");
-                    if(bool){
-                        showLoadingDialog("正在验证用户名和密码！");
                     JfClient.AuthenticateByName(JfClient.config.getUserName(), JfClient.config.getPassWord(), new JfClient.JJCallBack() {
                         @Override
                         public void onSuccess(Boolean bool) {
                             dismissLoadingDialog();
-                                if(bool){
+                            initView();
-                                    initView(); //加载首页
+                        }
-                                }else{
+                    }, connErr, false);
-                                    showLoginDialog();
+                }
+            }, connErr);
         }
     }
-                        },null,false);
+
-                    }else{
+    private JfClient.JJCallBack connErr = new JfClient.JJCallBack() {
-                        ShowToask("服务器地址不正确！");
-                        showLoginDialog();
-                    }
-                }
-            },new JfClient.JJCallBack(){
         @Override
         public void onError(String str) {
             dismissLoadingDialog();
-                    ShowToask("服务器连接失败！");
+            ShowToask(str);
             showLoginDialog();
         }
-            });
+    };
-        }else{
+
+    @Override
+    protected void onResume() {
+        super.onResume();
         initView();
     }
-    }
 
     private void showLoginDialog() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -106,24 +101,22 @@ public class HomeActivity extends BaseActivity{
                 JfClient.VerityServerUrl(urlbox.getText().toString(), new JfClient.JJCallBack() {
                     @Override
                     public void onSuccess(Boolean bool) {
-                        dismissLoadingDialog();
+                        setLoadingText("正在验证用户名和密码！");
-                        if(bool){
-                            showLoadingDialog("正在验证用户名和密码！");
                         JfClient.AuthenticateByName(unbox.getText().toString(), pwbox.getText().toString(), new JfClient.JJCallBack() {
                             @Override
                             public void onSuccess(Boolean bool) {
                                 dismissLoadingDialog();
-                                    if(bool){
                                 alert.dismiss();
                                 initView(); //加载首页
-                                    }else{
-                                        ShowToask("用户名密码不正确！");
                             }
+                        }, new JfClient.JJCallBack(){
+                            @Override
+                            public void onError(String str) {
+                                dismissLoadingDialog();
+                                ShowToask("用户名密码验证失败！");
                             }
-                            },null,saveBox.isChecked());
+                        }, saveBox.isChecked());
-                        }else{
+
-                            ShowToask("服务器地址不正确！");
-                        }
                     }
                 }, new JfClient.JJCallBack() {
                     @Override
@@ -207,6 +200,7 @@ public class HomeActivity extends BaseActivity{
     }
 
     private long exitTime = 0;
+
     public void exit() {
         if ((System.currentTimeMillis() - exitTime) > 2000) {
             Toast.makeText(getApplicationContext(), "再按一次退出程序",

app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java

@@ -411,8 +411,8 @@ public class JfClient {
         SendPost(url, reqjson, new JJCallBack() {
             @Override
             public void onSuccess(String str) {
+                try {
                     JsonObject userObj = new Gson().fromJson(str, JsonObject.class);
-                if (userObj != null) {
                     if (userObj.has("User") && userObj.has("AccessToken")) {
                         String userId = userObj.get("User").getAsJsonObject().get("Id").getAsString();
                         String Token = userObj.get("AccessToken").getAsString();
@@ -426,13 +426,13 @@ public class JfClient {
                             SetHeaders();
                             cb.onSuccess(true);
                         } else {
-                            cb.onSuccess(false);
+                            err.onError("验证失败：" + str);
                         }
                     } else {
                         err.onError("验证失败：" + str);
                     }
-                } else {
+                } catch (Exception e) {
-                    cb.onSuccess(false);
+                    err.onError("验证失败：" + e.getMessage());
                 }
             }
         }, err);
@@ -466,25 +466,24 @@ public class JfClient {
                 SendGet(url + "/system/info/public", new JJCallBack() {
                     @Override
                     public void onSuccess(String str) {
+                        try {
                             JsonObject serverInfo = new Gson().fromJson(str, JsonObject.class);
-                        Log.d(TAG, "onSuccess: " + str);
                             String ServerId = "";
-                        if (serverInfo.has("Id")) {
                             ServerId = serverInfo.get("Id").getAsString();
                             if (ServerId == null || ServerId.length() == 0) {
-                                cb.onSuccess(false);
+                                err.onError("服务器连接失败！");
                             } else {
                                 config.setJellyfinUrl(url);
                                 cb.onSuccess(true);
                             }
-                        } else {
+                        } catch (Exception e) {
-                            err.onError("联系服务器失败！");
+                            err.onError(e.getMessage());
                         }
                     }
                 }, err);
             }
         } else {
-            cb.onSuccess(false);
+            err.onError("服务器地址不能为空！");
         }
     }
 

app/src/main/java/org/sifacai/vlcjellyfin/Utils.java

@@ -45,6 +45,7 @@ public class Utils {
      * @return
      */
     public static String UtcToLocal(String utcTime) {
+        if(utcTime == null || utcTime.length() == 0) return "";
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSSS'Z'");
         df.setTimeZone(TimeZone.getTimeZone("UTC"));
         String dt = "";