Sfoglia il codice sorgente

更新数据库,更新分享依赖库

hy 1 anno fa
parent
commit
a21d68e07f

+ 2 - 2
app/src/main/AndroidManifest.xml

@ -2,8 +2,8 @@
2 2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 3
    xmlns:tools="http://schemas.android.com/tools"
4 4
    package="com.electric.chargingpile"
5
    android:versionCode="109"
6
    android:versionName="3.5.23">
5
    android:versionCode="110"
6
    android:versionName="3.5.24">
7 7
8 8
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
9 9
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->

BIN
app/src/main/assets/zhan_list.db


+ 9 - 6
app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@ -34,6 +34,7 @@ import com.electric.chargingpile.gen.DaoSession;
34 34
import com.electric.chargingpile.manager.ProfileManager;
35 35
import com.electric.chargingpile.util.DES3;
36 36
import com.electric.chargingpile.util.JsonUtils;
37
import com.electric.chargingpile.util.MobSdkConfig;
37 38
import com.electric.chargingpile.util.PhotoUtils;
38 39
import com.electric.chargingpile.util.SharedPreferencesHelper;
39 40
import com.google.gson.Gson;
@ -102,13 +103,13 @@ public class MainApplication extends MultiDexApplication implements CameraXConfi
102 103
    public static String firstPoint = "";
103 104
    public static Boolean firstSsyd;
104 105
    public static String password = "";
105
    public static String url = "http://59.110.68.162";// 充电桩测试环境
106
    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
107
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
108
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
106
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
107
//    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
108
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
109
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
109 110

110
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
111
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
111
//        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
112
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
112 113

113 114
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
114 115
    public static String CDN = "https://cdn-fs.d1ev.com";
@ -423,8 +424,10 @@ public class MainApplication extends MultiDexApplication implements CameraXConfi
423 424
    public static void initSDK() {
424 425
        AMapLocationClient.updatePrivacyShow(context,true,true);
425 426
        AMapLocationClient.updatePrivacyAgree(context,true);
427
        MobSdkConfig.init();
426 428
        MobSDK.init(MainApplication.context);
427 429
        MobSDK.submitPolicyGrantResult(true,null);
430

428 431
        CrashReport.initCrashReport(MainApplication.context, AppKeyConstant.BUGLY_KEY, BuildConfig.DEBUG);
429 432
        CrashReport.setAppChannel(MainApplication.context, BuildConfig.FLAVOR);
430 433


+ 47 - 0
app/src/main/java/com/electric/chargingpile/util/Base64.java

@ -1,8 +1,12 @@
1 1
package com.electric.chargingpile.util;
2 2
3
import android.text.TextUtils;
4
3 5
import java.io.ByteArrayOutputStream;
4 6
import java.io.IOException;
5 7
import java.io.OutputStream;
8
import java.io.UnsupportedEncodingException;
9
import java.util.Arrays;
6 10
7 11
/**
8 12
 * Base64编码工具类
@ -120,6 +124,49 @@ public class Base64 {
120 124
            i += 4;
121 125
        }
122 126
    }
127
128
    public static String base64Encode(String content, String charsetName) {
129
        if (TextUtils.isEmpty(charsetName)) {
130
            charsetName = "UTF-8";
131
        }
132
        try {
133
            byte[] contentByte = null;
134
            if (charsetName == null || charsetName.equals("")){
135
                contentByte = content.getBytes();
136
            }else{
137
                contentByte = content.getBytes(charsetName);
138
            }
139
            return android.util.Base64.encodeToString(contentByte, android.util.Base64.DEFAULT);
140
        } catch (UnsupportedEncodingException e) {
141
            e.printStackTrace();
142
        }
143
        return "";
144
    }
145
146
    /**
147
     * Base64解密字符串
148
     * @param content -- 待解密字符串
149
     * @param charsetName -- 字符串编码方式
150
     * @return
151
     */
152
    public static String base64Decode(String content, String charsetName) {
153
        if (TextUtils.isEmpty(charsetName)) {
154
            charsetName = "UTF-8";
155
        }
156
        byte[] contentByte = android.util.Base64.decode(content, android.util.Base64.DEFAULT);
157
        try {
158
            if (charsetName == null || charsetName.equals("")){
159
                return Arrays.toString(contentByte);
160
            }else{
161
                return new String(contentByte, charsetName);
162
            }
163
164
        } catch (UnsupportedEncodingException e) {
165
            e.printStackTrace();
166
        }
167
        return "";
168
    }
169
123 170
}
124 171
125 172

+ 66 - 0
app/src/main/java/com/electric/chargingpile/util/MobSdkConfig.java

@ -0,0 +1,66 @@
1
package com.electric.chargingpile.util;
2
3
4
import java.util.HashMap;
5
6
import cn.sharesdk.framework.ShareSDK;
7
import cn.sharesdk.tencent.qq.QQ;
8
import cn.sharesdk.wechat.friends.Wechat;
9
import cn.sharesdk.wechat.moments.WechatMoments;
10
11
public class MobSdkConfig {
12
    private static final String idw = "d3g5ZWEwMjQ0MTY0YWM5ZmNm";
13
    private static final String appw = "MzcyYTQ0OWY2MzcxYmQ4ZjZkYWQxZWQ4YWQ3MGZhNmI=";
14
15
    private static final String idQ = "MTAxNjcxMDAz";
16
    private static final String appQ = "ZjVmOWM3ZGQyOTUwOWRkYWViZjFhODkzN2ZkNmI1NmU=";
17
    public static void init(){
18
        initWeChat();
19
        initWechatMoments();
20
        initQQ();
21
    }
22
23
    private static void initWeChat(){
24
25
        String appId = Base64.base64Decode(idw, null);
26
        String appSecret = Base64.base64Decode(appw, null);
27
28
        HashMap<String,Object> hashMap = new HashMap<String, Object>();
29
        hashMap.put("Id","1");
30
        hashMap.put("SortId","1");
31
        hashMap.put("AppId",appId);
32
        hashMap.put("AppSecret",appSecret);
33
        hashMap.put("BypassApproval","false");
34
        hashMap.put("Enable","true");
35
        ShareSDK.setPlatformDevInfo(Wechat.NAME,hashMap);
36
    }
37
    private static void initWechatMoments(){
38
        String appId = Base64.base64Decode(idw, null);
39
        String appSecret = Base64.base64Decode(appw, null);
40
41
        HashMap<String,Object> hashMap = new HashMap<String, Object>();
42
        hashMap.put("Id","2");
43
        hashMap.put("SortId","2");
44
        hashMap.put("AppId",appId);
45
        hashMap.put("AppSecret",appSecret);
46
        hashMap.put("BypassApproval","false");
47
        hashMap.put("Enable","true");
48
        ShareSDK.setPlatformDevInfo(WechatMoments.NAME,hashMap);
49
    }
50
    private static void initQQ(){
51
        String appId = Base64.base64Decode(idQ, null);
52
        String appSecret = Base64.base64Decode(appQ, null);
53
54
        HashMap<String,Object> hashMap = new HashMap<String, Object>();
55
        hashMap.put("Id","3");
56
        hashMap.put("SortId","3");
57
        hashMap.put("AppId",appId);
58
        hashMap.put("AppKey",appSecret);
59
        hashMap.put("ShareByAppClient","false");
60
        hashMap.put("BypassApproval","false");
61
        hashMap.put("Enable","true");
62
        ShareSDK.setPlatformDevInfo(QQ.NAME,hashMap);
63
    }
64
65
66
}

+ 2 - 1
build.gradle

@ -13,7 +13,8 @@ buildscript {
13 13
        maven {url 'https://maven.aliyun.com/repository/public/'}
14 14
        maven {url 'https://maven.aliyun.com/repository/gradle-plugin/'}
15 15
        maven { url "https://www.jitpack.io" }
16
        maven { url 'https://repo1.maven.org/maven2/' }
16
        maven {url 'https://repo1.maven.org/maven2/' }
17
        maven {url "https://mvn.mob.com/android"}
17 18
        mavenCentral()
18 19
    }
19 20

+ 1 - 0
tmpmob/ShareSDK/assets/ShareSDK.xml

@ -55,4 +55,5 @@
55 55
<Littleredbook Enable="false" />
56 56
<Watermelonvideo Enable="false" />
57 57
<Tiktok Enable="false" />
58
<Taptap Enable="false" />
58 59
</DevInfor>

BIN
tmpmob/ShareSDK/assets/zhan_list.db