支付宝sdk更新

app/build.gradle

@@ -18,7 +18,7 @@ android {
            storePassword 'd1ev123'
        }
    }
    compileSdkVersion 26
    compileSdkVersion 27
    buildToolsVersion '29.0.0'
    aaptOptions.cruncherEnabled = false
@@ -32,7 +32,7 @@ android {
    defaultConfig {
        applicationId "com.electric.chargingpile"
        minSdkVersion 19
        targetSdkVersion 26
        targetSdkVersion 27
        multiDexEnabled true
@@ -166,6 +166,7 @@ MobSDK {
dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
    implementation (name:'alipaySdk-15.6.8-20191021122514', ext:'aar')
    implementation project(':autolayout')
    implementation project(':library')
    implementation project(':zxing')
@@ -181,8 +182,8 @@ dependencies {
    //    compile 'com.squareup.okhttp:okhttp:3.14.0'
    implementation 'com.squareup.okhttp:okhttp:2.0.0'
    implementation 'com.zhy:okhttputils:2.4.1'
    implementation 'com.android.support:support-v4:26.1.0'
    implementation 'com.google.android.gms:play-services-appindexing:9.4.0'
    implementation 'com.android.support:support-v4:27.1.1'
    implementation 'com.google.firebase:firebase-appindexing:10.0.0'
    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
    implementation 'com.zhy:flowlayout-lib:1.0.3'
    implementation 'com.squareup:otto:+'
@@ -193,8 +194,8 @@ dependencies {
    implementation 'me.codeboy.android:align-text-view:2.3.0'
    implementation 'me.itangqi.waveloadingview:library:0.3.5'
    implementation 'com.yinglan.scrolllayout:scrolllayout:1.0.0'
    implementation 'com.android.support:appcompat-v7:26.1.0'
    implementation 'com.android.support:design:26.1.0'
    implementation 'com.android.support:appcompat-v7:27.1.1'
    implementation 'com.android.support:design:27.1.1'
    //    compile 'com.nineoldandroids:library:2.4.0'
//    compile 'com.github.bumptech.glide:glide:4.1.1'
    implementation 'com.github.bumptech.glide:glide:4.2.0'
@@ -215,7 +216,7 @@ dependencies {
    implementation 'org.zackratos:ultimatebar:1.1.1'
    implementation 'com.github.Aspsine:IRecyclerView:0.0.7'
    implementation 'com.upyun:upyun-android-sdk:+'
    implementation 'com.upyun:upyun-android-sdk:2.1.0'
    // 上下翻页
    implementation 'com.github.castorflex.verticalviewpager:library:19.0.1'

app/src/main/AndroidManifest.xml

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

app/src/main/assets/ShareSDK.xml

@@ -47,4 +47,5 @@
<Accountkit Enable="false" />
<Douyin Enable="false" />
<Wework Enable="false" />
<HWAccount Enable="false" />
</DevInfor>

app/src/main/java/com/electric/chargingpile/activity/AboutActivity.java

@@ -154,27 +154,6 @@ public class AboutActivity extends Activity implements OnClickListener, EasyPerm
        mContext.sendBroadcast(intent);
    }
    private void callPhoneShow() {
        new com.electric.chargingpile.view.AlertDialog(AboutActivity.this).builder()
                .setMsg("400-881-0405")
                .setPositiveButton("呼叫", new View.OnClickListener() {
                    @Override
                    public void onClick(View v) {
                        String telNum = "4008810405";
                        Intent intent = new Intent();
                        intent.setAction("android.intent.action.CALL");
                        intent.addCategory("android.intent.category.DEFAULT");
                        intent.setData(Uri.parse("tel:" + telNum));
                        AboutActivity.this.startActivity(intent);
                    }
                }).setNegativeButton("取消", new View.OnClickListener() {
            @Override
            public void onClick(View v) {
            }
        }).show();
    }
    @Override
    public void onPermissionsGranted(int requestCode, List<String> perms) {
@@ -191,20 +170,4 @@ public class AboutActivity extends Activity implements OnClickListener, EasyPerm
    private boolean hasCallPhonePermission() {
        return EasyPermissions.hasPermissions(this, Manifest.permission.CALL_PHONE);
    }
    @AfterPermissionGranted(RC_CALL_PERM)
    public void telTask() {
        if (hasCallPhonePermission()) {
            // Have permission, do the thing!
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
            callPhoneShow();
        } else {
            // Ask for one permission
            EasyPermissions.requestPermissions(
                    this,
                    "该功能需要开启拨号权限，是否前往开启？",
                    RC_CALL_PERM,
                    Manifest.permission.CALL_PHONE);
        }
    }
}

app/src/main/java/com/electric/chargingpile/activity/ForgetPasswordActivity.java

@@ -179,7 +179,6 @@ public class ForgetPasswordActivity extends Activity implements View.OnClickList
        username_clear.setOnClickListener(this);
        password_claer = (Button) findViewById(R.id.btn_clear);
        password_claer.setOnClickListener(this);
        rl_call = (RelativeLayout) findViewById(R.id.rl_call);
        rl_call.setOnClickListener(this);
        check = (CheckBox) findViewById(R.id.check);//取得CheckBox组件
@@ -262,26 +261,6 @@ public class ForgetPasswordActivity extends Activity implements View.OnClickList
                }
                break;
            case R.id.rl_call:
                new com.electric.chargingpile.view.AlertDialog(ForgetPasswordActivity.this).builder()
                        .setMsg("400-881-0405")
                        .setPositiveButton("呼叫", new View.OnClickListener() {
                            @Override
                            public void onClick(View v) {
                                String telNum = "4008810405";
                                Intent intent = new Intent();
                                intent.setAction("android.intent.action.CALL");
                                intent.addCategory("android.intent.category.DEFAULT");
                                intent.setData(Uri.parse("tel:" + telNum));
                                ForgetPasswordActivity.this.startActivity(intent);
                            }
                        }).setNegativeButton("取消", new View.OnClickListener() {
                    @Override
                    public void onClick(View v) {
                    }
                }).show();
                break;
        }
    }

app/src/main/java/com/electric/chargingpile/activity/InputCodeActivity.java

@@ -1,6 +1,8 @@
package com.electric.chargingpile.activity;
import android.Manifest;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
@@ -171,7 +173,8 @@ public class InputCodeActivity extends AutoLayoutActivity implements View.OnClic
                        .setPositiveButton("联系客服", new View.OnClickListener() {
                            @Override
                            public void onClick(View v) {
                                tellTask();
                                //tellTask();
                                wechatAlert();
                            }
                        }).setNegativeButton("取消", new View.OnClickListener() {
                    @Override
@@ -185,7 +188,8 @@ public class InputCodeActivity extends AutoLayoutActivity implements View.OnClic
                        .setPositiveButton("联系客服", new View.OnClickListener() {
                            @Override
                            public void onClick(View v) {
                                tellTask();
                               // tellTask();
                                wechatAlert();
                            }
                        }).setNegativeButton("取消", new View.OnClickListener() {
                    @Override
@@ -350,6 +354,21 @@ public class InputCodeActivity extends AutoLayoutActivity implements View.OnClic
        }
    }
    private void wechatAlert() {
        AlertDialogTwo wechatAlert = new AlertDialogTwo(InputCodeActivity.this);
        wechatAlert.builder().setTitle("温馨提示")
                .setMsg("客服微信：chongdianzhuang2")
                .setPositiveButton("复制", new View.OnClickListener(){
                    @Override
                    public void onClick(View view) {
                        ClipboardManager cm = (ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE);
                        ClipData cdzData = ClipData.newPlainText("Label", "chongdianzhuang2");
                        cm.setPrimaryClip(cdzData);
                        ToastUtil.showToast(getApplicationContext(), "微信号复制成功", Toast.LENGTH_SHORT);
                    }
                }).show();
    }
    @AfterPermissionGranted(RC_TELL_PERM)
    public void tellTask() {
        if (hasTellPermission()) {

app/src/main/java/com/electric/chargingpile/activity/MyWebViewActivity.java

@@ -5,6 +5,8 @@ import android.annotation.TargetApi;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.ActivityNotFoundException;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@@ -44,6 +46,7 @@ import com.electric.chargingpile.util.DES3;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.MediaUtility;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.view.AlertDialogTwo;
import com.google.gson.Gson;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.umeng.analytics.MobclickAgent;
@@ -440,7 +443,23 @@ public class MyWebViewActivity extends Activity implements PlatformActionListene
    @JavascriptInterface
    public void makeacall(final String s) {
        telTask(s);
        //telTask(s);
        wechatAlert();
    }
    private void wechatAlert() {
        AlertDialogTwo wechatAlert = new AlertDialogTwo(MyWebViewActivity.this);
        wechatAlert.builder().setTitle("温馨提示")
                .setMsg("客服微信：chongdianzhuang2")
                .setPositiveButton("复制", new View.OnClickListener(){
                    @Override
                    public void onClick(View view) {
                        ClipboardManager cm = (ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE);
                        ClipData cdzData = ClipData.newPlainText("Label", "chongdianzhuang2");
                        cm.setPrimaryClip(cdzData);
                        ToastUtil.showToast(getApplicationContext(), "微信号复制成功", Toast.LENGTH_SHORT);
                    }
                }).show();
    }
    @JavascriptInterface

app/src/main/res/layout/activity_forget_password.xml

@@ -56,13 +56,6 @@
            android:textSize="20sp"
            android:layout_gravity="center"/>
        <!--<ImageView-->
        <!--android:layout_width="wrap_content"-->
        <!--android:layout_height="wrap_content"-->
        <!--android:layout_gravity="center"-->
        <!--android:layout_marginTop="50dp"-->
        <!--android:src="@drawable/icon626" />-->
        <com.zhy.autolayout.AutoLinearLayout
            android:layout_width="wrap_content"
@@ -286,64 +279,6 @@
            android:textColor="@color/titleColor"
            android:textSize="16sp" />
        <!--<TextView-->
            <!--android:layout_width="wrap_content"-->
            <!--android:layout_height="wrap_content"-->
            <!--android:layout_marginTop="200dp"-->
            <!--android:text="服务热线:400-881-0405"-->
            <!--android:textSize="16sp"-->
            <!--android:textColor="@color/user_titlebar"-->
            <!--android:layout_gravity="center_horizontal" />-->
    </com.zhy.autolayout.AutoLinearLayout>
    <com.zhy.autolayout.AutoRelativeLayout
        android:id="@+id/rl_call"
        android:layout_width="wrap_content"
        android:layout_height="40dp"
        android:background="@color/white"
        android:layout_gravity="center"
        android:visibility="gone">
        <com.zhy.autolayout.AutoLinearLayout
            android:layout_width="wrap_content"
            android:layout_height="20dp">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="20dp"
                android:text="服务热线:"
                android:textSize="15sp"
                android:gravity="center"
                android:textColor="@color/ui_66"
                android:paddingBottom="0.5dp"
                android:layout_gravity="center_horizontal" />
            <com.zhy.autolayout.AutoLinearLayout
                android:layout_width="wrap_content"
                android:layout_height="20dp"
                android:orientation="vertical">
                <TextView
                    android:layout_width="100dp"
                    android:layout_height="19.5dp"
                    android:text="400-881-0405"
                    android:maxLines="1"
                    android:textSize="15sp"
                    android:gravity="center"
                    android:textColor="@color/ui_green"
                    android:layout_gravity="center_horizontal" />
                <View
                    android:layout_width="100dp"
                    android:layout_height="0.5dp"
                    android:background="@color/ui_green"/>
            </com.zhy.autolayout.AutoLinearLayout>
        </com.zhy.autolayout.AutoLinearLayout>
    </com.zhy.autolayout.AutoRelativeLayout>
</com.zhy.autolayout.AutoLinearLayout>

build.gradle

@@ -23,6 +23,9 @@ buildscript {
}
allprojects {
    repositories {
        flatDir {
            dirs 'libs'
        }
        jcenter()
        google()
        maven { url "https://jitpack.io" }

gradle/wrapper/gradle-wrapper.properties

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

zxing/src/main/java/com/google/zxing/client/android/CaptureActivity.java

@@ -19,6 +19,8 @@ package com.google.zxing.client.android;
import android.Manifest;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -1166,7 +1168,8 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
                                @Override
                                public void onClick(View v) {
                                    try305Count = 1;
                                    tellTask();
                                    //tellTask();
                                    wechatAlert();
                                }
                            }).setNegativeButton("取消", new View.OnClickListener() {
                        @Override
@@ -1188,7 +1191,8 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
                                @Override
                                public void onClick(View v) {
                                    try309Count = 1;
                                    tellTask();
                                    //tellTask();
                                    wechatAlert();
                                }
                            }).setNegativeButton("取消", new View.OnClickListener() {
                        @Override
@@ -1325,6 +1329,21 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
        }
    }
    private void wechatAlert() {
        AlertDialogTwo wechatAlert = new AlertDialogTwo(CaptureActivity.this);
        wechatAlert.builder().setTitle("温馨提示")
                .setMsg("客服微信：chongdianzhuang2")
                .setPositiveButton("复制", new View.OnClickListener(){
                    @Override
                    public void onClick(View view) {
                        ClipboardManager cm = (ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE);
                        ClipData cdzData = ClipData.newPlainText("Label", "chongdianzhuang2");
                        cm.setPrimaryClip(cdzData);
                        ToastUtil.showToast(getApplicationContext(), "微信号复制成功", Toast.LENGTH_SHORT);
                    }
                }).show();
    }
    @AfterPermissionGranted(RC_TELL_PERM)
    public void tellTask() {
        if (hasTellPermission()) {

zxing/src/main/res/layout/capture.xml

@@ -253,8 +253,8 @@
        android:id="@+id/ll_1"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="33dp"
        android:paddingTop="13dp"
        android:layout_marginTop="15dp"
        android:paddingTop="10dp"
        android:paddingBottom="7dp"
        android:orientation="horizontal"
        android:layout_centerHorizontal="true"