詹子聪 5 лет назад
Родитель
Сommit
c98074d025

+ 1 - 0
app/src/main/java/com/miekir/eden/tool/StringTool.java

@@ -5,6 +5,7 @@ import android.text.TextUtils;
 import android.util.Base64;
 
 import com.miekir.common.utils.ContextManager;
+import com.miekir.eden.tool.secure.MD5Tool;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

+ 2 - 2
app/src/main/java/com/miekir/eden/kawayi/AES.java

@@ -1,4 +1,4 @@
-package com.miekir.eden.kawayi;
+package com.miekir.eden.tool.secure;
 
 import com.miekir.common.utils.Base64;
 
@@ -14,7 +14,7 @@ import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
 
-public class AES {
+public class AESTool {
 
     private static SecretKeySpec secretKey;
     private static byte[] key;

+ 1 - 1
app/src/main/java/com/miekir/eden/tool/Base64Tool.java

@@ -1,4 +1,4 @@
-package com.miekir.eden.tool;
+package com.miekir.eden.tool.secure;
 
 import android.content.Context;
 import android.graphics.Bitmap;

+ 1 - 1
app/src/main/java/com/miekir/eden/tool/MD5Tool.java

@@ -1,4 +1,4 @@
-package com.miekir.eden.tool;
+package com.miekir.eden.tool.secure;
 
 
 import java.nio.charset.Charset;

+ 2 - 2
app/src/main/java/com/miekir/eden/ui/home/coupon/TemplatePresenter.java

@@ -4,13 +4,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.miekir.eden.base.ApiService;
 import com.miekir.eden.constant.EdenError;
-import com.miekir.eden.kawayi.AES;
 import com.miekir.eden.kawayi.KwyAPI;
 import com.miekir.eden.kawayi.WalkApp;
 import com.miekir.eden.kawayi.bean.BaseKwyBean;
 import com.miekir.eden.kawayi.bean.EncryptKwyPhotoBean;
 import com.miekir.eden.manager.EdenManager;
 import com.miekir.eden.net.RetrofitHelper;
+import com.miekir.eden.tool.secure.AESTool;
 import com.miekir.mvp.presenter.BasePresenter;
 import com.miekir.network.core.base.BaseObserver;
 
@@ -55,7 +55,7 @@ public class TemplatePresenter extends BasePresenter<ITemplateView<String>> {
                             if (photoResult != null) {
                                 String detailJson = null;
                                 try {
-                                    detailJson = AES.decryptKawayi(photoResult.getJson(), WalkApp.KEY_SECRET);
+                                    detailJson = AESTool.decryptKawayi(photoResult.getJson(), WalkApp.KEY_SECRET);
                                     List<EncryptKwyPhotoBean> photoBeanList = JSON.parseObject(detailJson, new TypeReference<List<EncryptKwyPhotoBean>>() {});
                                     if (photoBeanList != null && photoBeanList.size() > 0) {
                                         for (EncryptKwyPhotoBean bean : photoBeanList) {

+ 2 - 2
app/src/main/java/com/miekir/eden/ui/welcome/WelcomeActivity.java

@@ -13,7 +13,6 @@ import com.miekir.eden.R;
 import com.miekir.eden.base.BaseBeiActivity;
 import com.miekir.eden.bean.BeiUser;
 import com.miekir.eden.bean.SystemBean;
-import com.miekir.eden.kawayi.AES;
 import com.miekir.eden.kawayi.KwyAPI;
 import com.miekir.eden.kawayi.WalkApp;
 import com.miekir.eden.kawayi.bean.BaseKwyBean;
@@ -21,6 +20,7 @@ import com.miekir.eden.kawayi.bean.EncryptKwyPhotoBean;
 import com.miekir.eden.manager.EdenManager;
 import com.miekir.eden.net.RetrofitHelper;
 import com.miekir.eden.tool.StringTool;
+import com.miekir.eden.tool.secure.AESTool;
 import com.miekir.eden.ui.TabActivity;
 import com.miekir.eden.ui.home.tool.ISystemView;
 import com.miekir.eden.ui.home.tool.SystemPresenter;
@@ -88,7 +88,7 @@ public class WelcomeActivity extends BaseBeiActivity implements ILoginView, ISys
                     if (photoResult != null) {
                         String detailJson = null;
                         try {
-                            detailJson = AES.decryptKawayi(photoResult.getJson(), WalkApp.KEY_SECRET);
+                            detailJson = AESTool.decryptKawayi(photoResult.getJson(), WalkApp.KEY_SECRET);
                             List<EncryptKwyPhotoBean> photoList = JSON.parseObject(detailJson, new TypeReference<List<EncryptKwyPhotoBean>>() {});
                             if (photoList != null && photoList.size() > 0) {
                                 EdenManager.getInstance().setKwyPhotoReady(true);