加密解密aar更新

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -21,13 +21,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONArray;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-import com.google.gson.Gson;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.react.ConfigUtil;

app/src/main/java/com/kfzs/duanduan/utils/net/APIRequest.java

@@ -9,7 +9,6 @@ import com.android.volleyplus.Request;
 import com.android.volleyplus.Response;
 import com.android.volleyplus.toolbox.HttpHeaderParser;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.kfzs.appstore.utils.string.HexUtils;
 import com.kfzs.duanduan.KFZSApp;
 import com.kfzs.duanduan.bll.UrlBll;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
@@ -22,6 +21,7 @@ import java.util.Map;
 
 import go.kfzssafe.Kfzssafe;
 
+
 /**
  * <pre>
  *     sinlov
@@ -66,8 +66,7 @@ public class APIRequest extends Request<ApiResponseOuterClass.ApiResponse> {
     @Override
     public byte[] getBody() throws AuthFailureError {
         if (null != bodyByte) {
-            String hexStr = HexUtils.bytes2HexStr(Kfzssafe.XByteEncode(bodyByte));
-            return hexStr.getBytes();
+            return Kfzssafe.xByteEncode(bodyByte);
         } else {
             return super.getBody();
         }
@@ -78,9 +77,7 @@ public class APIRequest extends Request<ApiResponseOuterClass.ApiResponse> {
         try {
             String hexString = new String(networkResponse.data,
                     HttpHeaderParser.parseCharset(networkResponse.headers));
-            byte[] bytes = HexUtils.hexStr2Bytes(hexString);
-            byte[] byteDecode = Kfzssafe.XByteDecode(bytes);
-            ApiResponseOuterClass.ApiResponse apiResponse = ApiResponseOuterClass.ApiResponse.parseFrom(byteDecode);
+            ApiResponseOuterClass.ApiResponse apiResponse = ApiResponseOuterClass.ApiResponse.parseFrom(Kfzssafe.xDecodeS2B(hexString));
             return Response.success(apiResponse, HttpHeaderParser.parseCacheHeaders(networkResponse));
         } catch (UnsupportedEncodingException e) {
             return Response.error(new ParseError(e));
@@ -88,6 +85,8 @@ public class APIRequest extends Request<ApiResponseOuterClass.ApiResponse> {
             return Response.error(new ParseError(e));
         } catch (NumberFormatException e) {
             return Response.error(new ParseError(e));
+        } catch (Exception e) {
+            return Response.error(new ParseError(e));
         }
     }
 

app/src/main/java/com/kfzs/duanduan/utils/net/APIRequestV2.java

@@ -10,12 +10,11 @@ import com.android.volleyplus.ParseError;
 import com.android.volleyplus.Request;
 import com.android.volleyplus.Response;
 import com.android.volleyplus.toolbox.HttpHeaderParser;
-import com.kfzs.appstore.utils.string.HexUtils;
 import com.kfzs.duanduan.KFZSApp;
+import com.kfzs.duanduan.bean.BaseMsg;
 import com.kfzs.duanduan.bll.UrlBll;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.db.DataSave;
-import com.kfzs.duanduan.bean.BaseMsg;
 
 import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
@@ -23,6 +22,7 @@ import java.util.Map;
 
 import go.kfzssafe.Kfzssafe;
 
+
 /**
  * <pre>
  *     sinlov
@@ -65,8 +65,7 @@ public class APIRequestV2 extends Request<BaseMsg> {
     @Override
     public byte[] getBody() throws AuthFailureError {
         if (null != bodyByte) {
-            String hexStr = HexUtils.bytes2HexStr(Kfzssafe.XByteEncode(bodyByte));
-            return hexStr.getBytes();
+            return Kfzssafe.xByteEncode(bodyByte);
         } else {
             return super.getBody();
         }
@@ -77,10 +76,7 @@ public class APIRequestV2 extends Request<BaseMsg> {
         try {
             String hexString = new String(networkResponse.data,
                     HttpHeaderParser.parseCharset(networkResponse.headers));
-            byte[] bytes = HexUtils.hexStr2Bytes(hexString);
-            byte[] byteDecode = Kfzssafe.XByteDecode(bytes);
-
-            BaseMsg apiResponse = JSON.parseObject(new String(byteDecode, "utf8"), BaseMsg.class);
+            BaseMsg apiResponse = JSON.parseObject(Kfzssafe.xDecodeS2B(hexString), BaseMsg.class);
             return Response.success(apiResponse, HttpHeaderParser.parseCacheHeaders(networkResponse));
         } catch (UnsupportedEncodingException e) {
             return Response.error(new ParseError(e));
@@ -88,6 +84,8 @@ public class APIRequestV2 extends Request<BaseMsg> {
             return Response.error(new ParseError(e));
         } catch (NumberFormatException e) {
             return Response.error(new ParseError(e));
+        } catch (Exception e) {
+            return Response.error(new ParseError(e));
         }
     }
 

app/src/main/java/com/sheep/gamegroup/absBase/AbsChooseImageActivity.java

@@ -5,9 +5,9 @@ import android.net.Uri;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
-import com.kfzs.appstore.utils.string.HexUtils;
 import com.kfzs.duanduan.react.upfile.UpFileListener;
 import com.kfzs.duanduan.react.upfile.UpFileUtils;
+import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.model.entity.UploadResult;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.view.dialog.DialogProgress;
@@ -18,7 +18,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import go.kfzssafe.Kfzssafe;
 import me.iwf.photopicker.PhotoPicker;
 
 /**
@@ -185,9 +184,7 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
             json = msg;
         } else {
             try {
-                byte[] bytes = HexUtils.hexStr2Bytes(msg);
-                byte[] byteDecode = Kfzssafe.XByteDecode(bytes);
-                json = new String(byteDecode);
+                json = BaseMessageConverter.decrypt(msg);
             } catch (Exception e) {
                 e.printStackTrace();
                 return null;