Browse Source

支付宝sdk更新

huyuguo 5 years ago
parent
commit
3f53132d2f

+ 8 - 7
app/build.gradle

18
            storePassword 'd1ev123'
18
            storePassword 'd1ev123'
19
        }
19
        }
20
    }
20
    }
21
    compileSdkVersion 26
21
    compileSdkVersion 27
22
    buildToolsVersion '29.0.0'
22
    buildToolsVersion '29.0.0'
23
23
24
    aaptOptions.cruncherEnabled = false
24
    aaptOptions.cruncherEnabled = false
32
    defaultConfig {
32
    defaultConfig {
33
        applicationId "com.electric.chargingpile"
33
        applicationId "com.electric.chargingpile"
34
        minSdkVersion 19
34
        minSdkVersion 19
35
        targetSdkVersion 26
35
        targetSdkVersion 27
36
36
37
        multiDexEnabled true
37
        multiDexEnabled true
38
38
166
166
167
dependencies {
167
dependencies {
168
    implementation fileTree(dir: 'libs', include: ['*.jar'])
168
    implementation fileTree(dir: 'libs', include: ['*.jar'])
169
    implementation (name:'alipaySdk-15.6.8-20191021122514', ext:'aar')
169
    implementation project(':autolayout')
170
    implementation project(':autolayout')
170
    implementation project(':library')
171
    implementation project(':library')
171
    implementation project(':zxing')
172
    implementation project(':zxing')
181
    //    compile 'com.squareup.okhttp:okhttp:3.14.0'
182
    //    compile 'com.squareup.okhttp:okhttp:3.14.0'
182
    implementation 'com.squareup.okhttp:okhttp:2.0.0'
183
    implementation 'com.squareup.okhttp:okhttp:2.0.0'
183
    implementation 'com.zhy:okhttputils:2.4.1'
184
    implementation 'com.zhy:okhttputils:2.4.1'
184
    implementation 'com.android.support:support-v4:26.1.0'
185
    implementation 'com.google.android.gms:play-services-appindexing:9.4.0'
185
    implementation 'com.android.support:support-v4:27.1.1'
186
    implementation 'com.google.firebase:firebase-appindexing:10.0.0'
186
    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
187
    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
187
    implementation 'com.zhy:flowlayout-lib:1.0.3'
188
    implementation 'com.zhy:flowlayout-lib:1.0.3'
188
    implementation 'com.squareup:otto:+'
189
    implementation 'com.squareup:otto:+'
193
    implementation 'me.codeboy.android:align-text-view:2.3.0'
194
    implementation 'me.codeboy.android:align-text-view:2.3.0'
194
    implementation 'me.itangqi.waveloadingview:library:0.3.5'
195
    implementation 'me.itangqi.waveloadingview:library:0.3.5'
195
    implementation 'com.yinglan.scrolllayout:scrolllayout:1.0.0'
196
    implementation 'com.yinglan.scrolllayout:scrolllayout:1.0.0'
196
    implementation 'com.android.support:appcompat-v7:26.1.0'
197
    implementation 'com.android.support:design:26.1.0'
197
    implementation 'com.android.support:appcompat-v7:27.1.1'
198
    implementation 'com.android.support:design:27.1.1'
198
    //    compile 'com.nineoldandroids:library:2.4.0'
199
    //    compile 'com.nineoldandroids:library:2.4.0'
199
//    compile 'com.github.bumptech.glide:glide:4.1.1'
200
//    compile 'com.github.bumptech.glide:glide:4.1.1'
200
    implementation 'com.github.bumptech.glide:glide:4.2.0'
201
    implementation 'com.github.bumptech.glide:glide:4.2.0'
215
    implementation 'org.zackratos:ultimatebar:1.1.1'
216
    implementation 'org.zackratos:ultimatebar:1.1.1'
216
217
217
    implementation 'com.github.Aspsine:IRecyclerView:0.0.7'
218
    implementation 'com.github.Aspsine:IRecyclerView:0.0.7'
218
    implementation 'com.upyun:upyun-android-sdk:+'
219
    implementation 'com.upyun:upyun-android-sdk:2.1.0'
219
220
220
    // 上下翻页
221
    // 上下翻页
221
    implementation 'com.github.castorflex.verticalviewpager:library:19.0.1'
222
    implementation 'com.github.castorflex.verticalviewpager:library:19.0.1'

BIN
app/libs/alipaySdk-15.6.8-20191021122514.aar


BIN
app/libs/alipaySdk-20160427.jar


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

1
<?xml version="1.0" encoding="utf-8"?>
1
<?xml version="1.0" encoding="utf-8"?>
2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
    package="com.electric.chargingpile"
3
    package="com.electric.chargingpile"
4
    android:versionCode="81"
5
    android:versionName="3.4.3">
4
    android:versionCode="82"
5
    android:versionName="3.4.4">
6
    <!-- 极光 -->
6
    <!-- 极光 -->
7
    <application
7
    <application
8
        android:name=".application.MainApplication"
8
        android:name=".application.MainApplication"

+ 1 - 0
app/src/main/assets/ShareSDK.xml

47
<Accountkit Enable="false" />
47
<Accountkit Enable="false" />
48
<Douyin Enable="false" />
48
<Douyin Enable="false" />
49
<Wework Enable="false" />
49
<Wework Enable="false" />
50
<HWAccount Enable="false" />
50
</DevInfor>
51
</DevInfor>

+ 0 - 37
app/src/main/java/com/electric/chargingpile/activity/AboutActivity.java

154
        mContext.sendBroadcast(intent);
154
        mContext.sendBroadcast(intent);
155
    }
155
    }
156

156

157
    private void callPhoneShow() {
158
        new com.electric.chargingpile.view.AlertDialog(AboutActivity.this).builder()
159
                .setMsg("400-881-0405")
160
                .setPositiveButton("呼叫", new View.OnClickListener() {
161
                    @Override
162
                    public void onClick(View v) {
163
                        String telNum = "4008810405";
164
                        Intent intent = new Intent();
165
                        intent.setAction("android.intent.action.CALL");
166
                        intent.addCategory("android.intent.category.DEFAULT");
167
                        intent.setData(Uri.parse("tel:" + telNum));
168
                        AboutActivity.this.startActivity(intent);
169
                    }
170
                }).setNegativeButton("取消", new View.OnClickListener() {
171
            @Override
172
            public void onClick(View v) {
173

174
            }
175
        }).show();
176
    }
177

178
    @Override
157
    @Override
179
    public void onPermissionsGranted(int requestCode, List<String> perms) {
158
    public void onPermissionsGranted(int requestCode, List<String> perms) {
180

159

191
    private boolean hasCallPhonePermission() {
170
    private boolean hasCallPhonePermission() {
192
        return EasyPermissions.hasPermissions(this, Manifest.permission.CALL_PHONE);
171
        return EasyPermissions.hasPermissions(this, Manifest.permission.CALL_PHONE);
193
    }
172
    }
194

195
    @AfterPermissionGranted(RC_CALL_PERM)
196
    public void telTask() {
197
        if (hasCallPhonePermission()) {
198
            // Have permission, do the thing!
199
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
200
            callPhoneShow();
201
        } else {
202
            // Ask for one permission
203
            EasyPermissions.requestPermissions(
204
                    this,
205
                    "该功能需要开启拨号权限,是否前往开启?",
206
                    RC_CALL_PERM,
207
                    Manifest.permission.CALL_PHONE);
208
        }
209
    }
210
}
173
}

+ 0 - 21
app/src/main/java/com/electric/chargingpile/activity/ForgetPasswordActivity.java

179
        username_clear.setOnClickListener(this);
179
        username_clear.setOnClickListener(this);
180
        password_claer = (Button) findViewById(R.id.btn_clear);
180
        password_claer = (Button) findViewById(R.id.btn_clear);
181
        password_claer.setOnClickListener(this);
181
        password_claer.setOnClickListener(this);
182
        rl_call = (RelativeLayout) findViewById(R.id.rl_call);
183
        rl_call.setOnClickListener(this);
182
        rl_call.setOnClickListener(this);
184
183
185
        check = (CheckBox) findViewById(R.id.check);//取得CheckBox组件
184
        check = (CheckBox) findViewById(R.id.check);//取得CheckBox组件
262
261
263
                }
262
                }
264
                break;
263
                break;
265
            case R.id.rl_call:
266
                new com.electric.chargingpile.view.AlertDialog(ForgetPasswordActivity.this).builder()
267
                        .setMsg("400-881-0405")
268
                        .setPositiveButton("呼叫", new View.OnClickListener() {
269
                            @Override
270
                            public void onClick(View v) {
271
                                String telNum = "4008810405";
272
                                Intent intent = new Intent();
273
                                intent.setAction("android.intent.action.CALL");
274
                                intent.addCategory("android.intent.category.DEFAULT");
275
                                intent.setData(Uri.parse("tel:" + telNum));
276
                                ForgetPasswordActivity.this.startActivity(intent);
277
                            }
278
                        }).setNegativeButton("取消", new View.OnClickListener() {
279
                    @Override
280
                    public void onClick(View v) {
281
282
                    }
283
                }).show();
284
                break;
285
        }
264
        }
286
    }
265
    }
287
266

+ 21 - 2
app/src/main/java/com/electric/chargingpile/activity/InputCodeActivity.java

1
package com.electric.chargingpile.activity;
1
package com.electric.chargingpile.activity;
2
2
3
import android.Manifest;
3
import android.Manifest;
4
import android.content.ClipData;
5
import android.content.ClipboardManager;
4
import android.content.Context;
6
import android.content.Context;
5
import android.content.Intent;
7
import android.content.Intent;
6
import android.net.Uri;
8
import android.net.Uri;
171
                        .setPositiveButton("联系客服", new View.OnClickListener() {
173
                        .setPositiveButton("联系客服", new View.OnClickListener() {
172
                            @Override
174
                            @Override
173
                            public void onClick(View v) {
175
                            public void onClick(View v) {
174
                                tellTask();
176
                                //tellTask();
177
                                wechatAlert();
175
                            }
178
                            }
176
                        }).setNegativeButton("取消", new View.OnClickListener() {
179
                        }).setNegativeButton("取消", new View.OnClickListener() {
177
                    @Override
180
                    @Override
185
                        .setPositiveButton("联系客服", new View.OnClickListener() {
188
                        .setPositiveButton("联系客服", new View.OnClickListener() {
186
                            @Override
189
                            @Override
187
                            public void onClick(View v) {
190
                            public void onClick(View v) {
188
                                tellTask();
191
                               // tellTask();
192
                                wechatAlert();
189
                            }
193
                            }
190
                        }).setNegativeButton("取消", new View.OnClickListener() {
194
                        }).setNegativeButton("取消", new View.OnClickListener() {
191
                    @Override
195
                    @Override
350
        }
354
        }
351
    }
355
    }
352
356
357
    private void wechatAlert() {
358
        AlertDialogTwo wechatAlert = new AlertDialogTwo(InputCodeActivity.this);
359
        wechatAlert.builder().setTitle("温馨提示")
360
                .setMsg("客服微信:chongdianzhuang2")
361
                .setPositiveButton("复制", new View.OnClickListener(){
362
                    @Override
363
                    public void onClick(View view) {
364
                        ClipboardManager cm = (ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE);
365
                        ClipData cdzData = ClipData.newPlainText("Label", "chongdianzhuang2");
366
                        cm.setPrimaryClip(cdzData);
367
                        ToastUtil.showToast(getApplicationContext(), "微信号复制成功", Toast.LENGTH_SHORT);
368
                    }
369
                }).show();
370
    }
371
353
    @AfterPermissionGranted(RC_TELL_PERM)
372
    @AfterPermissionGranted(RC_TELL_PERM)
354
    public void tellTask() {
373
    public void tellTask() {
355
        if (hasTellPermission()) {
374
        if (hasTellPermission()) {

+ 20 - 1
app/src/main/java/com/electric/chargingpile/activity/MyWebViewActivity.java

5
import android.app.Activity;
5
import android.app.Activity;
6
import android.app.AlertDialog;
6
import android.app.AlertDialog;
7
import android.content.ActivityNotFoundException;
7
import android.content.ActivityNotFoundException;
8
import android.content.ClipData;
9
import android.content.ClipboardManager;
8
import android.content.Context;
10
import android.content.Context;
9
import android.content.DialogInterface;
11
import android.content.DialogInterface;
10
import android.content.Intent;
12
import android.content.Intent;
44
import com.electric.chargingpile.util.JsonUtils;
46
import com.electric.chargingpile.util.JsonUtils;
45
import com.electric.chargingpile.util.MediaUtility;
47
import com.electric.chargingpile.util.MediaUtility;
46
import com.electric.chargingpile.util.ToastUtil;
48
import com.electric.chargingpile.util.ToastUtil;
49
import com.electric.chargingpile.view.AlertDialogTwo;
47
import com.google.gson.Gson;
50
import com.google.gson.Gson;
48
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
51
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
49
import com.umeng.analytics.MobclickAgent;
52
import com.umeng.analytics.MobclickAgent;
440
443
441
    @JavascriptInterface
444
    @JavascriptInterface
442
    public void makeacall(final String s) {
445
    public void makeacall(final String s) {
443
        telTask(s);
446
        //telTask(s);
447
        wechatAlert();
448
    }
449
450
    private void wechatAlert() {
451
        AlertDialogTwo wechatAlert = new AlertDialogTwo(MyWebViewActivity.this);
452
        wechatAlert.builder().setTitle("温馨提示")
453
                .setMsg("客服微信:chongdianzhuang2")
454
                .setPositiveButton("复制", new View.OnClickListener(){
455
                    @Override
456
                    public void onClick(View view) {
457
                        ClipboardManager cm = (ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE);
458
                        ClipData cdzData = ClipData.newPlainText("Label", "chongdianzhuang2");
459
                        cm.setPrimaryClip(cdzData);
460
                        ToastUtil.showToast(getApplicationContext(), "微信号复制成功", Toast.LENGTH_SHORT);
461
                    }
462
                }).show();
444
    }
463
    }
445
464
446
    @JavascriptInterface
465
    @JavascriptInterface

+ 0 - 65
app/src/main/res/layout/activity_forget_password.xml

56
            android:textSize="20sp"
56
            android:textSize="20sp"
57
            android:layout_gravity="center"/>
57
            android:layout_gravity="center"/>
58
58
59
        <!--<ImageView-->
60
        <!--android:layout_width="wrap_content"-->
61
        <!--android:layout_height="wrap_content"-->
62
        <!--android:layout_gravity="center"-->
63
        <!--android:layout_marginTop="50dp"-->
64
        <!--android:src="@drawable/icon626" />-->
65
66
59
67
        <com.zhy.autolayout.AutoLinearLayout
60
        <com.zhy.autolayout.AutoLinearLayout
68
            android:layout_width="wrap_content"
61
            android:layout_width="wrap_content"
286
            android:textColor="@color/titleColor"
279
            android:textColor="@color/titleColor"
287
            android:textSize="16sp" />
280
            android:textSize="16sp" />
288
281
289
290
        <!--<TextView-->
291
            <!--android:layout_width="wrap_content"-->
292
            <!--android:layout_height="wrap_content"-->
293
            <!--android:layout_marginTop="200dp"-->
294
            <!--android:text="服务热线:400-881-0405"-->
295
            <!--android:textSize="16sp"-->
296
            <!--android:textColor="@color/user_titlebar"-->
297
            <!--android:layout_gravity="center_horizontal" />-->
298
    </com.zhy.autolayout.AutoLinearLayout>
282
    </com.zhy.autolayout.AutoLinearLayout>
299
283
300
    <com.zhy.autolayout.AutoRelativeLayout
301
        android:id="@+id/rl_call"
302
        android:layout_width="wrap_content"
303
        android:layout_height="40dp"
304
        android:background="@color/white"
305
        android:layout_gravity="center"
306
        android:visibility="gone">
307
        <com.zhy.autolayout.AutoLinearLayout
308
            android:layout_width="wrap_content"
309
            android:layout_height="20dp">
310
            <TextView
311
                android:layout_width="wrap_content"
312
                android:layout_height="20dp"
313
                android:text="服务热线:"
314
                android:textSize="15sp"
315
                android:gravity="center"
316
                android:textColor="@color/ui_66"
317
                android:paddingBottom="0.5dp"
318
                android:layout_gravity="center_horizontal" />
319
            <com.zhy.autolayout.AutoLinearLayout
320
                android:layout_width="wrap_content"
321
                android:layout_height="20dp"
322
                android:orientation="vertical">
323
                <TextView
324
                    android:layout_width="100dp"
325
                    android:layout_height="19.5dp"
326
                    android:text="400-881-0405"
327
                    android:maxLines="1"
328
                    android:textSize="15sp"
329
                    android:gravity="center"
330
                    android:textColor="@color/ui_green"
331
                    android:layout_gravity="center_horizontal" />
332
                <View
333
                    android:layout_width="100dp"
334
                    android:layout_height="0.5dp"
335
                    android:background="@color/ui_green"/>
336
337
            </com.zhy.autolayout.AutoLinearLayout>
338
339
        </com.zhy.autolayout.AutoLinearLayout>
340
    </com.zhy.autolayout.AutoRelativeLayout>
341
342
343
344
345
346
347
348
349
</com.zhy.autolayout.AutoLinearLayout>
284
</com.zhy.autolayout.AutoLinearLayout>

+ 3 - 0
build.gradle

23
}
23
}
24
allprojects {
24
allprojects {
25
    repositories {
25
    repositories {
26
        flatDir {
27
            dirs 'libs'
28
        }
26
        jcenter()
29
        jcenter()
27
        google()
30
        google()
28
        maven { url "https://jitpack.io" }
31
        maven { url "https://jitpack.io" }

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

2
distributionBase=GRADLE_USER_HOME
2
distributionBase=GRADLE_USER_HOME
3
distributionPath=wrapper/dists
3
distributionPath=wrapper/dists
4
zipStoreBase=GRADLE_USER_HOME
4
zipStoreBase=GRADLE_USER_HOME
5
org.gradle.jvmargs=-Xmx5120m -XX\:MaxPermSize\=5120m
5
org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=2048m
6
zipStorePath=wrapper/dists
6
zipStorePath=wrapper/dists
7
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
7
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

+ 21 - 2
zxing/src/main/java/com/google/zxing/client/android/CaptureActivity.java

19
import android.Manifest;
19
import android.Manifest;
20
import android.app.Activity;
20
import android.app.Activity;
21
import android.app.AlertDialog;
21
import android.app.AlertDialog;
22
import android.content.ClipData;
23
import android.content.ClipboardManager;
22
import android.content.Context;
24
import android.content.Context;
23
import android.content.Intent;
25
import android.content.Intent;
24
import android.content.SharedPreferences;
26
import android.content.SharedPreferences;
1166
                                @Override
1168
                                @Override
1167
                                public void onClick(View v) {
1169
                                public void onClick(View v) {
1168
                                    try305Count = 1;
1170
                                    try305Count = 1;
1169
                                    tellTask();
1171
                                    //tellTask();
1172
                                    wechatAlert();
1170
                                }
1173
                                }
1171
                            }).setNegativeButton("取消", new View.OnClickListener() {
1174
                            }).setNegativeButton("取消", new View.OnClickListener() {
1172
                        @Override
1175
                        @Override
1188
                                @Override
1191
                                @Override
1189
                                public void onClick(View v) {
1192
                                public void onClick(View v) {
1190
                                    try309Count = 1;
1193
                                    try309Count = 1;
1191
                                    tellTask();
1194
                                    //tellTask();
1195
                                    wechatAlert();
1192
                                }
1196
                                }
1193
                            }).setNegativeButton("取消", new View.OnClickListener() {
1197
                            }).setNegativeButton("取消", new View.OnClickListener() {
1194
                        @Override
1198
                        @Override
1325
        }
1329
        }
1326
    }
1330
    }
1327
1331
1332
    private void wechatAlert() {
1333
        AlertDialogTwo wechatAlert = new AlertDialogTwo(CaptureActivity.this);
1334
        wechatAlert.builder().setTitle("温馨提示")
1335
                .setMsg("客服微信:chongdianzhuang2")
1336
                .setPositiveButton("复制", new View.OnClickListener(){
1337
                    @Override
1338
                    public void onClick(View view) {
1339
                        ClipboardManager cm = (ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE);
1340
                        ClipData cdzData = ClipData.newPlainText("Label", "chongdianzhuang2");
1341
                        cm.setPrimaryClip(cdzData);
1342
                        ToastUtil.showToast(getApplicationContext(), "微信号复制成功", Toast.LENGTH_SHORT);
1343
                    }
1344
                }).show();
1345
    }
1346
1328
    @AfterPermissionGranted(RC_TELL_PERM)
1347
    @AfterPermissionGranted(RC_TELL_PERM)
1329
    public void tellTask() {
1348
    public void tellTask() {
1330
        if (hasTellPermission()) {
1349
        if (hasTellPermission()) {

+ 2 - 2
zxing/src/main/res/layout/capture.xml

253
        android:id="@+id/ll_1"
253
        android:id="@+id/ll_1"
254
        android:layout_width="wrap_content"
254
        android:layout_width="wrap_content"
255
        android:layout_height="wrap_content"
255
        android:layout_height="wrap_content"
256
        android:layout_marginTop="33dp"
257
        android:paddingTop="13dp"
256
        android:layout_marginTop="15dp"
257
        android:paddingTop="10dp"
258
        android:paddingBottom="7dp"
258
        android:paddingBottom="7dp"
259
        android:orientation="horizontal"
259
        android:orientation="horizontal"
260
        android:layout_centerHorizontal="true"
260
        android:layout_centerHorizontal="true"