Clean code

thunder/src/main/java/com/xunlei/downloadlib/XLLoader.java

@@ -1,8 +1,9 @@
 package com.xunlei.downloadlib;
 
+import android.content.Context;
+
 import com.xunlei.downloadlib.parameter.BtIndexSet;
 import com.xunlei.downloadlib.parameter.BtSubTaskDetail;
-import com.xunlei.downloadlib.parameter.GetDownloadLibVersion;
 import com.xunlei.downloadlib.parameter.GetFileName;
 import com.xunlei.downloadlib.parameter.GetTaskId;
 import com.xunlei.downloadlib.parameter.ThunderUrlInfo;
@@ -13,7 +14,6 @@ import com.xunlei.downloadlib.parameter.XLTaskLocalUrl;
 class XLLoader {
 
     public XLLoader() {
-        System.loadLibrary("xl_stat");
         System.loadLibrary("xl_thunder_sdk");
     }
 
@@ -29,8 +29,6 @@ class XLLoader {
 
     public native int getBtSubTaskInfo(long j, int i, BtSubTaskDetail btSubTaskDetail);
 
-    public native int getDownloadLibVersion(GetDownloadLibVersion getDownloadLibVersion);
-
     public native int getFileNameFromUrl(String str, GetFileName getFileName);
 
     public native int getLocalUrl(String str, XLTaskLocalUrl xLTaskLocalUrl);
@@ -39,27 +37,25 @@ class XLLoader {
 
     public native int getTorrentInfo(String str, TorrentInfo torrentInfo);
 
-    public native int init(String str, String str2, String str3, String str4, String str5, String str6, String str7, String str8, int i, int i2, int i3);
+    public native int init(Context context, String str, String str2, String str3, String str4, String str5, String str6, String str7, int i, int i2);
 
     public native int parserThunderUrl(String str, ThunderUrlInfo thunderUrlInfo);
 
     public native int releaseTask(long j);
 
-    public native int setDownloadTaskOrigin(long j, String str);
+    public native int setAccelerateToken(long j, int i, long j2, int i2, String str);
 
-    public native int setLocalProperty(String str, String str2);
-
-    public native int setMiUiVersion(String str);
+    public native int setDownloadTaskOrigin(long j, String str);
 
     public native int setOriginUserAgent(long j, String str);
 
     public native int setSpeedLimit(long j, long j2);
 
-    public native int setStatReportSwitch(boolean z);
+    public native int setTaskLxState(long j, int i, int i2);
 
-    public native int setTaskGsState(long j, int i, int i2);
+    public native int setUserId(String str);
 
-    public native int startTask(long j);
+    public native int startTask(long j, boolean z);
 
     public native int stopTask(long j);
 

thunder/src/main/java/com/xunlei/downloadlib/android/XLUtil.java

@@ -1,7 +1,5 @@
 package com.xunlei.downloadlib.android;
 
-import android.util.Base64;
-
 import java.util.Random;
 import java.util.UUID;
 
@@ -31,17 +29,4 @@ public class XLUtil {
     public static String getGuid() {
         return getIMEI() + "_" + getMAC();
     }
-
-    public static String generateAppKey(String str, short s, byte b) {
-        int length = str.length();
-        int i = length + 1;
-        byte[] bArr = new byte[(i + 2 + 1)];
-        byte[] bytes = str.getBytes();
-        System.arraycopy(bytes, 0, bArr, 0, bytes.length);
-        bArr[length] = 0;
-        bArr[i] = (byte) (s & 255);
-        bArr[length + 2] = (byte) ((s >> 8) & 255);
-        bArr[length + 3] = b;
-        return new String(Base64.encode(bArr, 0)).trim();
-    }
 }

thunder/src/main/java/com/xunlei/downloadlib/parameter/InitParam.java

@@ -1,33 +1,20 @@
 package com.xunlei.downloadlib.parameter;
 
-import android.util.Base64;
-
-import com.xunlei.downloadlib.android.XLUtil;
-
-import java.nio.charset.StandardCharsets;
-
 public class InitParam {
 
-    public String mAppKey;
+    public String mGuid;
     public String mAppVersion;
-    public int mPermissionLevel;
-    public int mQueryConfOnInit;
+    public String mLogSavePath;
     public String mStatSavePath;
     public String mStatCfgSavePath;
+    public int mPermissionLevel;
 
     public InitParam(String path) {
-        this.mAppKey = "xzNjAwMQ^^yb==0^852^083dbcff^cee25055f125a2fde";
-        this.mAppVersion = "21.01.07.800002";
-        this.mPermissionLevel = 1;
-        this.mQueryConfOnInit = 0;
+        this.mGuid = "000000000000000000";
+        this.mAppVersion = "1.18.2";
+        this.mLogSavePath = path;
         this.mStatSavePath = path;
         this.mStatCfgSavePath = path;
-    }
-
-    public String getSoKey() {
-        String[] split = mAppKey.split("==");
-        String replace = split[0].replace('^', '=');
-        String str = new String(Base64.decode(replace.substring(2, replace.length() - 2), 0), StandardCharsets.UTF_8);
-        return XLUtil.generateAppKey("com.android.providers.downloads", Short.parseShort(str.split(";")[0]), (byte) 1);
+        this.mPermissionLevel = 3;
     }
 }

thunder/src/main/java/com/xunlei/downloadlib/parameter/XLTaskInfo.java

@@ -2,31 +2,38 @@ package com.xunlei.downloadlib.parameter;
 
 public class XLTaskInfo {
 
+    public String mCid;
+    public String mFileName;
+    public String mGcid;
+    public int mAddedHighSourceState;
     public int mAdditionalResCount;
+    public int mAdditionalResType;
+    public int mDcdnState;
+    public int mErrorCode;
+    public int mInfoLen;
+    public int mLanPeerResState;
+    public int mOriginErrcode;
+    public int mQueryIndexStatus;
+    public int mTaskStatus;
+    public long mAdditionalResDCDNBytes;
+    public long mAdditionalResDCDNSpeed;
     public long mAdditionalResPeerBytes;
     public long mAdditionalResPeerSpeed;
-    public int mAdditionalResType;
     public long mAdditionalResVipRecvBytes;
     public long mAdditionalResVipSpeed;
-    public String mCid;
+    public long mCheckedSize;
+    public long mDownloadFileCount;
     public long mDownloadSize;
     public long mDownloadSpeed;
-    public int mErrorCode;
-    public String mFileName;
     public long mFileSize;
-    public String mGcid;
-    public int mInfoLen;
     public long mOriginRecvBytes;
     public long mOriginSpeed;
     public long mP2PRecvBytes;
     public long mP2PSpeed;
     public long mP2SRecvBytes;
     public long mP2SSpeed;
-    public int mQueryIndexStatus;
-    public long mScdnRecvBytes;
-    public long mScdnSpeed;
     public long mTaskId;
-    public int mTaskStatus;
+    public long mTotalFileCount;
 
     public int getTaskStatus() {
         return mTaskStatus;