Merge pull request nining377#320 from yujincheng08/fix

Fix two issues

Author: nining377

app/src/main/java/com/raincat/dolby_beta/helper/ScriptHelper.java

@@ -136,7 +136,7 @@ public static SSLSocketFactory getSSLSocketFactory(Context context) {
         SSLContext sslContext = null;
         try {
             File ca = new File(getScriptPath(context) + File.separator + "ca.crt");
-            if (ca.exists()) {
+            if (!SettingHelper.getInstance().getSetting(SettingHelper.proxy_server_key) && ca.exists()) {
                 InputStream certificate = new FileInputStream(ca);
                 Certificate certificate1 = CertificateFactory.getInstance("X.509").generateCertificate(certificate);
                 KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
@@ -164,4 +164,4 @@ public static SSLSocketFactory getSSLSocketFactory(Context context) {
         else
             return null;
     }
-}
+}

app/src/main/java/com/raincat/dolby_beta/model/NeteaseSongListBean.java

@@ -53,6 +53,8 @@ public static class DataBean {
         private FreeTrialInfoBean freeTrialInfo;
         private String level;
         private String encodeType;
+        private int peak;
+        private int time;
 
         public long getId() {
             return id;
@@ -190,6 +192,22 @@ public void setEncodeType(String encodeType) {
             this.encodeType = encodeType;
         }
 
+        public int getPeak() {
+            return peak;
+        }
+
+        public void setPeak(int peak) {
+            this.peak = peak;
+        }
+
+        public int getTime() {
+            return time;
+        }
+
+        public void setTime(int time) {
+            this.time = time;
+        }
+
         public static class FreeTrialInfoBean {
             private int start;
             private int end;