="lines-num lines-num-old"> 321 300
            enter.setOnClickListener(this);
322 301

@ -373,18 +352,14 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
373 352
                    }
374 353
                    socket = new Socket(host, 9503);
375 354
                    // 向服务器发送消息
376
                    PrintWriter out = new PrintWriter(new BufferedWriter(
377
                            new OutputStreamWriter(socket.getOutputStream())), true);
355
                    PrintWriter out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(socket.getOutputStream())), true);
378 356
                    out.println(params);
379 357
                    // out.println("{\"fun\":\"getcity\"}");
380 358
                    // 接收来自服务器的消息
381
                    BufferedReader br = new BufferedReader(new InputStreamReader(
382
                            socket.getInputStream()));
359
                    BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
383 360

384 361
                    String msg = br.readLine();
385
//                    Log.d("dddddss",msg);
386 362
                    String token = msg;
387
//                    Log.e("msg_init", msg);
388 363
                    int time = (int) (System.currentTimeMillis() / 1000);
389 364

390 365
                    MainMapActivity.cha = time - Integer.parseInt(msg);
@ -396,7 +371,7 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
396 371
                    initParams.append(",\"h\":\"" + Utils.getScreenHeight(WelcomeActivity.this) + "\"");
397 372
                    initParams.append(",\"version_name\":\"" + BuildConfig.VERSION_NAME + "\"");
398 373
                    initParams.append(",\"version_code\":\"" + BuildConfig.VERSION_CODE + "\"");
399
                    initParams.append(",\"os\":\"android "+ Build.VERSION.RELEASE +"\""); // 操作系统及版本
374
                    initParams.append(",\"os\":\"android " + Build.VERSION.RELEASE + "\""); // 操作系统及版本
400 375
                    initParams.append(",\"brand\":\"" + Build.BRAND + "\""); // 品牌
401 376
                    initParams.append(",\"model\":\"" + Build.MODEL + "\""); // 型号
402 377
                    initParams.append("}");
@ -422,18 +397,11 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
422 397
                        host = "59.110.68.162";
423 398
                    }
424 399
                    socket = new Socket(host, 9503); // IP:10.14.114.127,端口54321
425
//                    SocketAddress socAddress = new InetSocketAddress("cdz.d1ev.com", 9503);
426
//                    socket.connect(socAddress, 5000);
427 400
                    // 向服务器发送消息
428
                    PrintWriter out = new PrintWriter(new BufferedWriter(
429
                            new OutputStreamWriter(socket.getOutputStream())), true);
401
                    PrintWriter out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(socket.getOutputStream())), true);
430 402
                    out.println(params);
431
                    // out.println("{\"fun\":\"getcity\"}");
432 403
                    // 接收来自服务器的消息
433
                    BufferedReader br = new BufferedReader(new InputStreamReader(
434
                            socket.getInputStream()));
435

436

404
                    BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
437 405
                    String msg = br.readLine();
438 406
                    if (msg != null) {
439 407
                        Message mes = new Message();
@ -442,15 +410,11 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
442 410
                        handler.sendMessage(mes);
443 411
                        mTimer.cancel();
444 412
                    }
445

446

447 413
                } catch (Exception e) {
448 414
                    e.printStackTrace();
449

450 415
                }
451 416
            }
452 417
        }).start();
453

454 418
    }
455 419

456 420

@ -478,16 +442,11 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
478 442
        Drawable drawable = null;
479 443
        try {
480 444
            // 可以在这里通过文件名来判断,是否本地有此图片
481

482
            drawable = Drawable.createFromStream(
483
                    new URL(imageUrl).openStream(), "adout.jpg");
484

445
            drawable = Drawable.createFromStream(new URL(imageUrl).openStream(), "adout.jpg");
485 446
            Message msg = new Message();
486 447
            msg.obj = drawable;
487 448
            msg.what = 19;
488 449
            handler.sendMessage(msg);
489

490

491 450
        } catch (IOException e) {
492 451
            Log.d("test", e.getMessage());
493 452
        }
@ -501,7 +460,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
501 460
    }
502 461

503 462

504

505 463
    public void saveBitmap(Bitmap mBitmap) {
506 464
        String dir_path = Environment.getExternalStorageDirectory() + File.separator + "d1ev/";
507 465
        File directory = new File(dir_path);
@ -542,11 +500,8 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
542 500
                    long appTime1 = System.currentTimeMillis() / 1000;
543 501
                    long updatetime = appTime1 - 7200;
544 502
                    String token = String.valueOf(updatetime);
545

546 503
                    String replace = URLEncoder.encode(DES3.encode(token));
547

548 504
                    url = MainApplication.url + "/zhannew/basic/web/index.php/ad/get?timer=" + replace;
549

550 505
                } catch (Exception e) {
551 506
                    e.printStackTrace();
552 507
                }
@ -575,8 +530,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
575 530
                    msg.obj = json;
576 531
                    msg.what = 1;
577 532
                    handler.sendMessage(msg);
578
                    Log.e("url", json);
579
//                    Log.i("token解密:", DES3.decode(encode_token));
580 533
                } catch (Exception e) {
581 534
                    e.printStackTrace();
582 535
                    Message msg = new Message();
@ -628,10 +581,8 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
628 581
        String operator = ProfileManager.getInstance().getKeyOperator(getApplicationContext());
629 582
        String localOperators = "";
630 583
        if (StringUtils.isEmpty(operator)) {
631
//            LogUtils.e("读取本地");
632 584
            localOperators = getResources().getString(R.string.app_operator_list);
633 585
        } else {
634
//            LogUtils.e("读取缓存");
635 586
            localOperators = operator;
636 587
        }
637 588
        Gson gson = new Gson();
@ -661,7 +612,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
661 612
                if (code.equals("200")) {
662 613
                    String data = JsonUtils.getKeyResult(response, "data");
663 614
                    ProfileManager.getInstance().setAppOperator(getApplicationContext(), data);
664
//                    LogUtils.e(ProfileManager.getInstance().getKeyOperator(getApplicationContext()));
665 615
                    Gson gson = new Gson();
666 616
                    ll = gson.fromJson(data, new TypeToken<List<OperatorData>>() {
667 617
                    }.getType());
@ -676,9 +626,7 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
676 626
    }
677 627

678 628
    @Override
679
    public void onRequestPermissionsResult(int requestCode,
680
                                           @NonNull String[] permissions,
681
                                           @NonNull int[] grantResults) {
629
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
682 630
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
683 631
        // EasyPermissions handles the request result.
684 632
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
@ -686,7 +634,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
686 634

687 635
    @Override
688 636
    public void onPermissionsGranted(int requestCode, List<String> perms) {
689
        LogUtils.e("onPermissionsGranted");
690 637
        for (String s : perms) {
691 638
            if (s.equals(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
692 639
                new Handler().postDelayed(new Runnable() {
@ -702,7 +649,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
702 649

703 650
    @Override
704 651
    public void onPermissionsDenied(int requestCode, List<String> perms) {
705
        LogUtils.e("onPermissionsDenied");
706 652
        for (String s : perms) {
707 653
            if (s.equals(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
708 654
                AlertDialog.Builder builder = new AlertDialog.Builder(WelcomeActivity.this);
@ -722,16 +668,11 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
722 668
            }
723 669
            break;
724 670
        }
725

726

727 671
    }
728 672

729 673
    @AfterPermissionGranted(RC_CAMERA_PERM)
730 674
    public void cameraTask() {
731 675
        if (isPermissionOK()) {
732
            // Have permission, do the thing!
733
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
734
//            ifTimeout();
735 676
        } else {
736 677
            // Ask for one permission
737 678
            EasyPermissions.requestPermissions(
@ -754,8 +695,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
754 695
                }
755 696
            }, 1000);
756 697
            // Have permission, do the thing!
757
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
758
//            ifTimeout();
759 698
        } else {
760 699
            // Ask for one permission
761 700
            EasyPermissions.requestPermissions(
@ -804,6 +743,4 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
804 743
            }
805 744
        }
806 745
    }
807

808

809 746
}

+ 13 - 0
app/src/main/java/com/electric/chargingpile/wxapi/WXEntryActivity.java

@ -12,6 +12,11 @@ import android.content.Intent;
12 12
import android.os.Bundle;
13 13
import android.os.PersistableBundle;
14 14
import android.widget.Toast;
15
16
import com.tencent.mm.opensdk.constants.ConstantsAPI;
17
import com.tencent.mm.opensdk.modelbase.BaseResp;
18
import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
19
15 20
import cn.sharesdk.wechat.utils.WXAppExtendObject;
16 21
import cn.sharesdk.wechat.utils.WXMediaMessage;
17 22
import cn.sharesdk.wechat.utils.WechatHandlerActivity;
@ -57,5 +62,13 @@ public class WXEntryActivity extends WechatHandlerActivity {
57 62
        }
58 63
    }
59 64
65
    public void onResp(BaseResp resp) {
66
        if (resp.getType() == ConstantsAPI.COMMAND_LAUNCH_WX_MINIPROGRAM) {
67
            WXLaunchMiniProgram.Resp launchMiniProResp = (WXLaunchMiniProgram.Resp) resp;
68
            String extraData = launchMiniProResp.extMsg;
69
            System.out.println(extraData);
70
        }
71
    }
72
60 73
61 74
}

+ 4 - 1
app/src/main/res/layout/activity_welcome.xml

@ -1,5 +1,6 @@
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    xmlns:tools="http://schemas.android.com/tools"
3 4
    android:id="@+id/rl_welcome"
4 5
    android:layout_width="match_parent"
5 6
    android:layout_height="match_parent">
@ -12,6 +13,7 @@
12 13
        android:layout_centerVertical="true"
13 14
        android:background="#ffffff"
14 15
        android:orientation="vertical">
16

15 17
        <ImageView
16 18
            android:id="@+id/img_welcome"
17 19
            android:layout_width="160dp"
@ -20,7 +22,8 @@
20 22
            android:layout_marginTop="240dp"
21 23
            android:contentDescription="@null"
22 24
            android:src="@drawable/bg_welcome_text"
23
            android:visibility="visible" />
25
            android:visibility="visible"
26
            tools:visibility="gone" />
24 27
    </LinearLayout>
25 28
    <!-- logo end    -->
26 29


Забравена парола - Gogs: Go Git Service

Забравена парола

За съжаление потвърждението на регистрации е изключено.