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,6 +1,8 @@
1 1
package com.electric.chargingpile.activity;
2 2
3 3
import android.Manifest;
4
import android.content.ClipData;
5
import android.content.ClipboardManager;
4 6
import android.content.Context;
5 7
import android.content.Intent;
6 8
import android.net.Uri;
@ -171,7 +173,8 @@ public class InputCodeActivity extends AutoLayoutActivity implements View.OnClic
171 173
                        .setPositiveButton("联系客服", new View.OnClickListener() {
172 174
                            @Override
173 175
                            public void onClick(View v) {
174
                                tellTask();
176
                                //tellTask();
177
                                wechatAlert();
175 178
                            }
176 179
                        }).setNegativeButton("取消", new View.OnClickListener() {
177 180
                    @Override
@ -185,7 +188,8 @@ public class InputCodeActivity extends AutoLayoutActivity implements View.OnClic
185 188
                        .setPositiveButton("联系客服", new View.OnClickListener() {
186 189
                            @Override
187 190
                            public void onClick(View v) {
188
                                tellTask();
191
                               // tellTask();
192
                                wechatAlert();
189 193
                            }
190 194
                        }).setNegativeButton("取消", new View.OnClickListener() {
191 195
                    @Override
@ -350,6 +354,21 @@ public class InputCodeActivity extends AutoLayoutActivity implements View.OnClic
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 372
    @AfterPermissionGranted(RC_TELL_PERM)
354 373
    public void tellTask() {
355 374
        if (hasTellPermission()) {

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

@ -5,6 +5,8 @@ import android.annotation.TargetApi;
5 5
import android.app.Activity;
6 6
import android.app.AlertDialog;
7 7
import android.content.ActivityNotFoundException;
8
import android.content.ClipData;
9
import android.content.ClipboardManager;
8 10
import android.content.Context;
9 11
import android.content.DialogInterface;
10 12
import android.content.Intent;
@ -44,6 +46,7 @@ import com.electric.chargingpile.util.DES3;
44 46
import com.electric.chargingpile.util.JsonUtils;
45 47
import com.electric.chargingpile.util.MediaUtility;
46 48
import com.electric.chargingpile.util.ToastUtil;
49
import com.electric.chargingpile.view.AlertDialogTwo;
47 50
import com.google.gson.Gson;
48 51
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
49 52
import com.umeng.analytics.MobclickAgent;
@ -440,7 +443,23 @@ public class MyWebViewActivity extends Activity implements PlatformActionListene
440 443
441 444
    @JavascriptInterface
442 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 465
    @JavascriptInterface

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

@ -56,13 +56,6 @@
56 56
            android:textSize="20sp"
57 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 60
        <com.zhy.autolayout.AutoLinearLayout
68 61
            android:layout_width="wrap_content"
@ -286,64 +279,6 @@
286 279
            android:textColor="@color/titleColor"
287 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 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 284
</com.zhy.autolayout.AutoLinearLayout>

+ 3 - 0
build.gradle

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

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

@ -2,6 +2,6 @@
2 2
distributionBase=GRADLE_USER_HOME
3 3
distributionPath=wrapper/dists
4 4
zipStoreBase=GRADLE_USER_HOME
5
org.gradle.jvmargs=-Xmx5120m -XX\:MaxPermSize\=5120m
5
org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=2048m
6 6
zipStorePath=wrapper/dists
7 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,6 +19,8 @@ package com.google.zxing.client.android;
19 19
import android.Manifest;
20 20
import android.app.Activity;
21 21
import android.app.AlertDialog;
22
import android.content.ClipData;
23
import android.content.ClipboardManager;
22 24
import android.content.Context;
23 25
import android.content.Intent;
24 26
import android.content.SharedPreferences;
@ -1166,7 +1168,8 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
1166 1168
                                @Override
1167 1169
                                public void onClick(View v) {
1168 1170
                                    try305Count = 1;
1169
                                    tellTask();
1171
                                    //tellTask();
1172
                                    wechatAlert();
1170 1173
                                }
1171 1174
                            }).setNegativeButton("取消", new View.OnClickListener() {
1172 1175
                        @Override
@ -1188,7 +1191,8 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
1188 1191
                                @Override
1189 1192
                                public void onClick(View v) {
1190 1193
                                    try309Count = 1;
1191
                                    tellTask();
1194
                                    //tellTask();
1195
                                    wechatAlert();
1192 1196
                                }
1193 1197
                            }).setNegativeButton("取消", new View.OnClickListener() {
1194 1198
                        @Override
@ -1325,6 +1329,21 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
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 1347
    @AfterPermissionGranted(RC_TELL_PERM)
1329 1348
    public void tellTask() {
1330 1349
        if (hasTellPermission()) {

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

@ -253,8 +253,8 @@
253 253
        android:id="@+id/ll_1"
254 254
        android:layout_width="wrap_content"
255 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 258
        android:paddingBottom="7dp"
259 259
        android:orientation="horizontal"
260 260
        android:layout_centerHorizontal="true"

cdzApp - Gogs: Go Git Service

充电桩app代码

huyuguo 598eb725e7 引用第三方gradle 升级 лет назад: 7
..
src 7082cc0853 remove лет назад: 7
build.gradle 598eb725e7 引用第三方gradle 升级 лет назад: 7