版本升级到2.0.0；修复不能升级的bug；删除xxxtea相关代码

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.sheep.jiuyan.samllsheep"
         minSdkVersion 18
         targetSdkVersion 27
-        versionCode 200000
-        versionName "2.0.0"
+        versionCode VERSION_CODE as int
+        versionName VERSION_NAME
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk {

app/src/main/AndroidManifest.xml

@@ -3,7 +3,6 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="com.sheep.jiuyan.samllsheep">
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW"/>

app/src/main/java/com/sheep/gamegroup/presenter/PhonePresenter.java

@@ -13,7 +13,6 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.gamegroup.util.XXTEA;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 
@@ -50,9 +49,6 @@ public class PhonePresenter implements PhoneContract.Presenter {
             Log.e("hash-map", map.toString());
             com.alibaba.fastjson.JSONObject j = new com.alibaba.fastjson.JSONObject();
             j.put("account", telphone);
-//        String encry = XXTEA.Encrypt(j.toString(),XXTEA.KEY);
-            String encry = XXTEA.bytes2HexStr(XXTEA.Encrypt(j.toString(), XXTEA.KEY).getBytes("utf-8"));
-            Log.e("encry----", com.alibaba.fastjson.JSONObject.toJSONString(encry));
 
             apiService.getCaptcha(j)
                     .subscribeOn(Schedulers.io())

app/src/main/java/com/sheep/gamegroup/util/XXTEA.java

@@ -1,228 +0,0 @@
-package com.sheep.gamegroup.util;
-
-import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * XXTEA 加密算法
- * Created by ljy on 2018/3/16.
- */
-
-public class XXTEA {
-//    public final static String KEY = "bbu423&(gBUjX#$s";
-    public final static String KEY = "bbu423&(gBUjX#$s";
-
-    /**
-     * 加密
-     * @param data
-     * @param key
-     * @return
-     */
-    public static String Encrypt(String data, String key) {
-        return ToHexString(TEAEncrypt(
-                ToLongArray(PadRight(data, MIN_LENGTH).getBytes(
-                        Charset.forName("UTF8"))),
-                ToLongArray(PadRight(key, MIN_LENGTH).getBytes(
-                        Charset.forName("UTF8")))));
-    }
-
-    /**
-     * 解密
-     * @param data
-     * @param key
-     * @return
-     */
-    public static String Decrypt(String data, String key) {
-        if (data == null || data.length() < MIN_LENGTH) {
-            return data;
-        }
-        byte[] code = ToByteArray(TEADecrypt(
-                ToLongArray(data),
-                ToLongArray(PadRight(key, MIN_LENGTH).getBytes(
-                        Charset.forName("UTF8")))));
-        return new String(code, Charset.forName("UTF8"));
-    }
-
-    private static long[] TEAEncrypt(long[] data, long[] key) {
-        int n = data.length;
-        if (n < 1) {
-            return data;
-        }
-
-        long z = data[data.length - 1], y = data[0], sum = 0, e, p, q;
-        q = 6 + 52 / n;
-        while (q-- > 0) {
-            sum += DELTA;
-            e = (sum >> 2) & 3;
-            for (p = 0; p < n - 1; p++) {
-                y = data[(int) (p + 1)];
-                z = data[(int) p] += (z >> 5 ^ y << 2) + (y >> 3 ^ z << 4)
-                        ^ (sum ^ y) + (key[(int) (p & 3 ^ e)] ^ z);
-            }
-            y = data[0];
-            z = data[n - 1] += (z >> 5 ^ y << 2) + (y >> 3 ^ z << 4)
-                    ^ (sum ^ y) + (key[(int) (p & 3 ^ e)] ^ z);
-        }
-
-        return data;
-    }
-
-    private static long[] TEADecrypt(long[] data, long[] key) {
-        int n = data.length;
-        if (n < 1) {
-            return data;
-        }
-
-        long z = data[data.length - 1], y = data[0], sum = 0, e, p, q;
-        q = 6 + 52 / n;
-        sum = q * DELTA;
-        while (sum != 0) {
-            e = (sum >> 2) & 3;
-            for (p = n - 1; p > 0; p--) {
-                z = data[(int) (p - 1)];
-                y = data[(int) p] -= (z >> 5 ^ y << 2) + (y >> 3 ^ z << 4)
-                        ^ (sum ^ y) + (key[(int) (p & 3 ^ e)] ^ z);
-            }
-            z = data[n - 1];
-            y = data[0] -= (z >> 5 ^ y << 2) + (y >> 3 ^ z << 4) ^ (sum ^ y)
-                    + (key[(int) (p & 3 ^ e)] ^ z);
-            sum -= DELTA;
-        }
-
-        return data;
-    }
-
-    private static long[] ToLongArray(byte[] data) {
-        int n = (data.length % 8 == 0 ? 0 : 1) + data.length / 8;
-        long[] result = new long[n];
-
-        for (int i = 0; i < n - 1; i++) {
-            result[i] = bytes2long(data, i * 8);
-        }
-
-        byte[] buffer = new byte[8];
-        for (int i = 0, j = (n - 1) * 8; j < data.length; i++, j++) {
-            buffer[i] = data[j];
-        }
-        result[n - 1] = bytes2long(buffer, 0);
-
-        return result;
-    }
-
-    private static byte[] ToByteArray(long[] data) {
-        List<Byte> result = new ArrayList<Byte>();
-
-        for (int i = 0; i < data.length; i++) {
-            byte[] bs = long2bytes(data[i]);
-            for (int j = 0; j < 8; j++) {
-                result.add(bs[j]);
-            }
-        }
-
-        while (result.get(result.size() - 1) == SPECIAL_CHAR) {
-            result.remove(result.size() - 1);
-        }
-
-        byte[] ret = new byte[result.size()];
-        for (int i = 0; i < ret.length; i++) {
-            ret[i] = result.get(i);
-        }
-        return ret;
-    }
-
-    public static byte[] long2bytes(long num) {
-        ByteBuffer buffer = ByteBuffer.allocate(8).order(
-                ByteOrder.LITTLE_ENDIAN);
-        buffer.putLong(num);
-        return buffer.array();
-    }
-
-    public static long bytes2long(byte[] b, int index) {
-        ByteBuffer buffer = ByteBuffer.allocate(8).order(
-                ByteOrder.LITTLE_ENDIAN);
-        buffer.put(b, index, 8);
-        return buffer.getLong(0);
-    }
-
-    private static String ToHexString(long[] data) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < data.length; i++) {
-            sb.append(PadLeft(Long.toHexString(data[i]), 16));
-        }
-        return sb.toString();
-    }
-
-
-
-
-    private static long[] ToLongArray(String data) {
-        int len = data.length() / 16;
-        long[] result = new long[len];
-        for (int i = 0; i < len; i++) {
-            result[i] = new BigInteger(data.substring(i * 16, i * 16 + 16), 16)
-                    .longValue();
-        }
-        return result;
-    }
-
-    private static String PadRight(String source, int length) {
-        while (source.length() < length) {
-            source += SPECIAL_CHAR;
-        }
-        return source;
-    }
-
-    private static String PadLeft(String source, int length) {
-        while (source.length() < length) {
-            source = '0' + source;
-        }
-        return source;
-    }
-
-    private static long DELTA = 0x9E3779B9;
-    private static int MIN_LENGTH = 32;
-    private static char SPECIAL_CHAR = '\0';
-
-    //byte转为hex串
-    public static String bytes2HexStr(byte[] byteArr) {
-        if (null == byteArr || byteArr.length < 1) return "";
-        StringBuilder sb = new StringBuilder();
-        for (byte t : byteArr) {
-            if ((t & 0xF0) == 0) sb.append("0");
-            sb.append(Integer.toHexString(t & 0xFF));  //t & 0xFF 操作是为去除Integer高位多余的符号位（java数据是用补码表示）
-        }
-        return sb.toString();
-    }
-
-    //hex串转为byte
-    static byte[] hexStr2Bytes(String hexStr) {
-        if (null == hexStr || hexStr.length() < 1) return null;
-
-        int byteLen = hexStr.length() / 2;
-        byte[] result = new byte[byteLen];
-        char[] hexChar = hexStr.toCharArray();
-        for(int i=0 ;i<byteLen;i++){
-            result[i] = (byte)(Character.digit(hexChar[i*2],16)<<4 | Character.digit(hexChar[i*2+1],16));
-        }
-
-        return result;
-    }
-
-    /**
-     * 将map转换成加密的字符串
-     * @param map
-     * @return
-     * @throws UnsupportedEncodingException
-     */
-    public  static String  mapToHashString (Map map) throws UnsupportedEncodingException {
-        return XXTEA.bytes2HexStr(XXTEA.Encrypt(FastJsonUtils.collectToString(map), XXTEA.KEY).getBytes("utf-8"))    ;
-    }
-
-
-}

app/src/main/java/com/sheep/gamegroup/view/activity/PhoneAct.java

@@ -29,12 +29,10 @@ import com.sheep.gamegroup.presenter.PersonalCenterPresenter;
 import com.sheep.gamegroup.presenter.PhoneContract;
 import com.sheep.gamegroup.presenter.PhonePresenter;
 import com.sheep.gamegroup.util.ActivityManager;
-import com.sheep.gamegroup.util.FastJsonUtils;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
 
-import com.sheep.gamegroup.util.XXTEA;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -22,7 +22,7 @@ public class Config {
    public String mBaseUrl = "http://api.task.bandaimi.com";
 //    public String mBaseUrl = "http://test.ss.shouyouquan.com";
     public final static String WX_APPID = "wx3c0376c4fcc8b723";
-    public final static String BUGLY_APPID = "0dd9 98212c";
+    public final static String BUGLY_APPID = "0dd998212c";
     public String[] mUrlList = new String[]{"http://10.8.220.213:8088", "http://10.8.220.132:8088", "http://test.ss.shouyouquan.com", "http://10.8.220.130:8088", "http://api.task.bandaimi.com"};
     public void setBaseUrl(String url) {
         this.mBaseUrl = url;

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -18,6 +18,7 @@ import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.tencent.bugly.Bugly;
+import com.tencent.bugly.beta.Beta;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.umeng.analytics.MobclickAgent;
 
@@ -58,7 +59,7 @@ public class SheepApp extends BaseApplication {
         regWx();
         registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
         initGoble();
-        Bugly.init(getApplicationContext(), Config.BUGLY_APPID, true);
+        Bugly.init(getApplicationContext(), Config.BUGLY_APPID, BuildConfig.DEBUG);
         initNet();
         createFileDownloader();//创建FileDownloader
         httpComponent = DaggerHttpComponent.builder().httpModule(new HttpModule()).build();

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/XXTea.java

@@ -1,174 +0,0 @@
-package com.sheep.jiuyan.samllsheep.utils;
-
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by kemllor on 2018/1/23.
- */
-
-
-public class XXTea {
-    public static String Encrypt(String data, String key) {
-        return ToHexString(TEAEncrypt(
-                ToLongArray(PadRight(data, MIN_LENGTH).getBytes(
-                        Charset.forName("UTF8"))),
-                ToLongArray(PadRight(key, MIN_LENGTH).getBytes(
-                        Charset.forName("UTF8")))));
-    }
-
-    public static String Decrypt(String data, String key) {
-        if (data == null || data.length() < MIN_LENGTH) {
-            return data;
-        }
-        byte[] code = ToByteArray(TEADecrypt(
-                ToLongArray(data),
-                ToLongArray(PadRight(key, MIN_LENGTH).getBytes(
-                        Charset.forName("UTF8")))));
-        return new String(code, Charset.forName("UTF8"));
-    }
-
-    private static long[] TEAEncrypt(long[] data, long[] key) {
-        int n = data.length;
-        if (n < 1) {
-            return data;
-        }
-
-        long z = data[data.length - 1], y = data[0], sum = 0, e, p, q;
-        q = 6 + 52 / n;
-        while (q-- > 0) {
-            sum += DELTA;
-            e = (sum >> 2) & 3;
-            for (p = 0; p < n - 1; p++) {
-                y = data[(int) (p + 1)];
-                z = data[(int) p] += (z >> 5 ^ y << 2) + (y >> 3 ^ z << 4)
-                        ^ (sum ^ y) + (key[(int) (p & 3 ^ e)] ^ z);
-            }
-            y = data[0];
-            z = data[n - 1] += (z >> 5 ^ y << 2) + (y >> 3 ^ z << 4)
-                    ^ (sum ^ y) + (key[(int) (p & 3 ^ e)] ^ z);
-        }
-
-        return data;
-    }
-
-    private static long[] TEADecrypt(long[] data, long[] key) {
-        int n = data.length;
-        if (n < 1) {
-            return data;
-        }
-
-        long z = data[data.length - 1], y = data[0], sum = 0, e, p, q;
-        q = 6 + 52 / n;
-        sum = q * DELTA;
-        while (sum != 0) {
-            e = (sum >> 2) & 3;
-            for (p = n - 1; p > 0; p--) {
-                z = data[(int) (p - 1)];
-                y = data[(int) p] -= (z >> 5 ^ y << 2) + (y >> 3 ^ z << 4)
-                        ^ (sum ^ y) + (key[(int) (p & 3 ^ e)] ^ z);
-            }
-            z = data[n - 1];
-            y = data[0] -= (z >> 5 ^ y << 2) + (y >> 3 ^ z << 4) ^ (sum ^ y)
-                    + (key[(int) (p & 3 ^ e)] ^ z);
-            sum -= DELTA;
-        }
-
-        return data;
-    }
-
-    private static long[] ToLongArray(byte[] data) {
-        int n = (data.length % 8 == 0 ? 0 : 1) + data.length / 8;
-        long[] result = new long[n];
-
-        for (int i = 0; i < n - 1; i++) {
-            result[i] = bytes2long(data, i * 8);
-        }
-
-        byte[] buffer = new byte[8];
-        for (int i = 0, j = (n - 1) * 8; j < data.length; i++, j++) {
-            buffer[i] = data[j];
-        }
-        result[n - 1] = bytes2long(buffer, 0);
-
-        return result;
-    }
-
-    private static byte[] ToByteArray(long[] data) {
-        List<Byte> result = new ArrayList<Byte>();
-
-        for (int i = 0; i < data.length; i++) {
-            byte[] bs = long2bytes(data[i]);
-            for (int j = 0; j < 8; j++) {
-                result.add(bs[j]);
-            }
-        }
-
-        while (result.get(result.size() - 1) == SPECIAL_CHAR) {
-            result.remove(result.size() - 1);
-        }
-
-        byte[] ret = new byte[result.size()];
-        for (int i = 0; i < ret.length; i++) {
-            ret[i] = result.get(i);
-        }
-        return ret;
-    }
-
-    public static byte[] long2bytes(long num) {
-        ByteBuffer buffer = ByteBuffer.allocate(8).order(
-                ByteOrder.LITTLE_ENDIAN);
-        buffer.putLong(num);
-        return buffer.array();
-    }
-
-    public static long bytes2long(byte[] b, int index) {
-        ByteBuffer buffer = ByteBuffer.allocate(8).order(
-                ByteOrder.LITTLE_ENDIAN);
-        buffer.put(b, index, 8);
-        return buffer.getLong(0);
-    }
-
-    private static String ToHexString(long[] data) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < data.length; i++) {
-            sb.append(PadLeft(Long.toHexString(data[i]), 16));
-        }
-        return sb.toString();
-    }
-
-
-
-
-    private static long[] ToLongArray(String data) {
-        int len = data.length() / 16;
-        long[] result = new long[len];
-        for (int i = 0; i < len; i++) {
-            result[i] = new BigInteger(data.substring(i * 16, i * 16 + 16), 16)
-                    .longValue();
-        }
-        return result;
-    }
-
-    private static String PadRight(String source, int length) {
-        while (source.length() < length) {
-            source += SPECIAL_CHAR;
-        }
-        return source;
-    }
-
-    private static String PadLeft(String source, int length) {
-        while (source.length() < length) {
-            source = '0' + source;
-        }
-        return source;
-    }
-
-    private static long DELTA = 0x9E3779B9;
-    private static int MIN_LENGTH = 32;
-    private static char SPECIAL_CHAR = '\0';
-}

gradle.properties

@@ -17,6 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
+#VERSION_NAME=1.1.2
+#VERSION_CODE=101002
 VERSION_NAME=2.0.0
 VERSION_CODE=200000
 ANDROID_COMPILE_SDK_VERSION=27