Browse Source

弹屏广告bug修复

huyuguo 4 years ago
parent
commit
002222945b

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


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

431
431
432
                            // 二手车广告
432
                            // 二手车广告
433
                            String adfloat = JsonUtils.getKeyResult(data, "ad_float");
433
                            String adfloat = JsonUtils.getKeyResult(data, "ad_float");
434
                            if (adfloat != null || !adfloat.equals("")) {
434
                            if (adfloat != null && !adfloat.equals("")) {
435
                                List<Adin> listAdfloat = JsonUtils.parseToObjectList(adfloat, Adin.class);
435
                                List<Adin> listAdfloat = JsonUtils.parseToObjectList(adfloat, Adin.class);
436
                                if (listAdfloat.size() > 0) {
436
                                if (listAdfloat.size() > 0) {
437
                                    loadAdfloatImg(listAdfloat.get(0));
437
                                    loadAdfloatImg(listAdfloat.get(0));

+ 0 - 140
app/src/main/java/com/electric/chargingpile/activity/WelcomeActivity.java

256
                                intent.putExtra("advertiser",advertiser);
256
                                intent.putExtra("advertiser",advertiser);
257
                                startActivity(intent);
257
                                startActivity(intent);
258
                                finish();
258
                                finish();
259
//                                mTimer.cancel();
260
                                overridePendingTransition(0, 0);
259
                                overridePendingTransition(0, 0);
261
                            } else {
260
                            } else {
262
                                new Handler().postDelayed(new Runnable() {
261
                                new Handler().postDelayed(new Runnable() {
265
                                        startActivity(new Intent(WelcomeActivity.this,
264
                                        startActivity(new Intent(WelcomeActivity.this,
266
                                                MainMapActivity.class));
265
                                                MainMapActivity.class));
267
                                        finish();
266
                                        finish();
268
//                                        mTimer.cancel();
269
                                    }
267
                                    }
270
                                }, 2000);
268
                                }, 2000);
271
                            }
269
                            }
275
                        e.printStackTrace();
273
                        e.printStackTrace();
276
                    }
274
                    }
277
                    break;
275
                    break;
278

279
//				case 19 :
280
//					try {
281
//						img_welcome = (ImageView) findViewById(R.id.img_welcome);
282
////						rl_w.setVisibility(View.VISIBLE);
283
//						img_welcome.setImageDrawable((Drawable) msg.obj);
284
//						img_welcome.setOnClickListener(new OnClickListener() {
285
//							@Override
286
//							public void onClick(View v) {
287
//								if (!url.equals("")){
288
//
289
//
290
//								}
291
//
292
//							}
293
//						});
294
////						rl_welcome.setOnClickListener(new OnClickListener() {
295
////							@Override
296
////							public void onClick(View v) {
297
//////								link();
298
//////								rl_ad.setVisibility(View.GONE);
299
////							}
300
////						});
301
//
302
//					} catch (Exception e) {
303
//						e.printStackTrace();
304
//					}
305
//					break;
306

307
                default:
276
                default:
308

309
                    break;
277
                    break;
310
            }
278
            }
311
        }
279
        }
326
        super.onCreate(savedInstanceState);
294
        super.onCreate(savedInstanceState);
327
        setContentView(R.layout.activity_welcome);
295
        setContentView(R.layout.activity_welcome);
328
        BarColorUtil.initStatusBarColor(WelcomeActivity.this);
296
        BarColorUtil.initStatusBarColor(WelcomeActivity.this);
329
//        BarUtils.setStatusBarAlpha(this);
330
        androidd = (TextView) findViewById(R.id.android);
297
        androidd = (TextView) findViewById(R.id.android);
331
        ll_1 = (LinearLayout) findViewById(R.id.ll_1);
298
        ll_1 = (LinearLayout) findViewById(R.id.ll_1);
332
        getVersion();
299
        getVersion();
333
        MapsInitializer.sdcardDir = MAP_FILE_PATH;
300
        MapsInitializer.sdcardDir = MAP_FILE_PATH;
334

301

335
//        boolean isClean = SPUtils.getInstance("DATA_CLEAN").getBoolean("isClean");
336
//        if (isClean == false){
337
//            DeleteFile(new File("/mnt/sdcard/amap"));
338
//            SPUtils.getInstance("DATA_CLEAN").put("isClean",true);
339
//        }
340

341
        mTimer = new Timer();
302
        mTimer = new Timer();
342
        if (ProfileManager.getInstance().getGuide(this)) {
303
        if (ProfileManager.getInstance().getGuide(this)) {
343
            saveTask();
304
            saveTask();
375
            PackageManager manager = getApplication().getPackageManager();
336
            PackageManager manager = getApplication().getPackageManager();
376
            PackageInfo info = manager.getPackageInfo(getApplication().getPackageName(), 0);
337
            PackageInfo info = manager.getPackageInfo(getApplication().getPackageName(), 0);
377
            app_version = info.versionName;
338
            app_version = info.versionName;
378
//                  return this.getString(R.string.version_name) + version;
379
            androidd.setText("For Android V" + app_version);
339
            androidd.setText("For Android V" + app_version);
380
        } catch (Exception e) {
340
        } catch (Exception e) {
381
            e.printStackTrace();
341
            e.printStackTrace();
382
//                    return this.getString(R.string.can_not_find_version_name);
383
        }
342
        }
384
    }
343
    }
385

344

429
//                    Log.e("msg_init", msg);
388
//                    Log.e("msg_init", msg);
430
                    int time = (int) (System.currentTimeMillis() / 1000);
389
                    int time = (int) (System.currentTimeMillis() / 1000);
431

390

432
//                    if (time >= 1484841600 && time <= 1486569599 ){
433
//                        MainApplication.festival_time = "1";
434
//                    }else if (time >= 1486569600 && time <= 1486915199){
435
//                        MainApplication.festival_time = "2";
436
//                    }
437
//                    cha = String.valueOf(time - Integer.parseInt(msg));
438
                    MainMapActivity.cha = time - Integer.parseInt(msg);
391
                    MainMapActivity.cha = time - Integer.parseInt(msg);
439
//                    Log.e("timer===", time + "");
440
                    String Token = getMD5(String.valueOf((System.currentTimeMillis() / 1000 - MainMapActivity.cha) / 10) + "qwerty");
392
                    String Token = getMD5(String.valueOf((System.currentTimeMillis() / 1000 - MainMapActivity.cha) / 10) + "qwerty");
441
//                    Log.d("11111","{\"fun\":\"init\",\"timer\":" + "\"" + Token + "\"" + "}");
442
                    StringBuffer initParams = new StringBuffer();
393
                    StringBuffer initParams = new StringBuffer();
443
                    initParams.append("{\"fun\":\"init\",\"timer\":\"" + Token + "\"");
394
                    initParams.append("{\"fun\":\"init\",\"timer\":\"" + Token + "\"");
444

395

524
        return builder.toString().toLowerCase();
475
        return builder.toString().toLowerCase();
525
    }
476
    }
526

477

527

528
//		getStartPic();
529
//		img_welcome = (ImageView) findViewById(R.id.img_welcome);
530
//		new Thread(new Runnable() {
531
//			@Override
532
//			public void run() {
533
//				bitmap = ImageLoader.getInstance().loadImageSync(MainApplication.userIcon);
534
//
535
//			}
536
//		}).start();
537
//		saveBitmap(bitmap);
538
//
539
//		String dir_path=Environment.getExternalStorageDirectory()+File.separator+"d1ev/";
540
//		File f = new File(dir_path, "welcome_pic");
541
//		img_welcome.setImageURI(Uri.fromFile(f));
542

543

544
    private Drawable loadImageFromNetwork(String imageUrl) {
478
    private Drawable loadImageFromNetwork(String imageUrl) {
545
        Drawable drawable = null;
479
        Drawable drawable = null;
546
        try {
480
        try {
567
        return drawable;
501
        return drawable;
568
    }
502
    }
569

503

570
//    private void getAdout() {
571
//
572
//        new Thread(new Runnable() {
573
//            @Override
574
//            public void run() {
575
//                try {
576
//
577
//                    String url = null;
578
//
579
//                    long appTime1 = System.currentTimeMillis() / 1000;
580
//                    Log.i("appTime(long)---", appTime1 + "");
581
//                    long updatetime = appTime1 - 7200;
582
//                    String token = String.valueOf(updatetime);
583
//
584
//                    String replace = URLEncoder.encode(DES3.encode(token));
585
//
586
//                    url = MainApplication.url + "/zhannew/basic/web/index.php/ad/get?timer=" + replace;
587
//
588
//                    getAdoutt(url);
589
//                } catch (Exception e) {
590
//                    e.printStackTrace();
591
//                }
592
//
593
//            }
594
//        }).start();
595
//    }
596
//
597
//    private void getAdoutt(String sms) {
598
//
599
//        Log.e("url", sms);
600
//        Request request = new Request.Builder().url(sms).build();
601
//        Response response = null;
602
//        try {
603
//            if (request == null) {
604
//                Message msg = new Message();
605
//                msg.what = 3;
606
//                handler.sendMessage(msg);
607
//                return;
608
//            }
609
//            response = OkHttpUtil.execute(request);
610
//            if (response.code() == 200) {
611
//                String json = "";
612
//                try {
613
//                    json = response.body().string();
614
//                    Message msg = new Message();
615
//                    msg.obj = json;
616
//                    msg.what = 9;
617
//                    handler.sendMessage(msg);
618
//                    Log.e("url", json);
619
////                    Log.i("token解密:", DES3.decode(encode_token));
620
//                } catch (Exception e) {
621
//                    e.printStackTrace();
622
//                    Message msg = new Message();
623
//                    msg.what = 3;
624
//                    handler.sendMessage(msg);
625
//                }
626
//            }
627
//        } catch (Exception e) {
628
//            e.printStackTrace();
629
//            Message msg = new Message();
630
//            msg.what = 3;
631
//            handler.sendMessage(msg);
632
//        }
633
//    }
634

504

635

505

636
    public void saveBitmap(Bitmap mBitmap) {
506
    public void saveBitmap(Bitmap mBitmap) {
671
                String url = null;
541
                String url = null;
672
                try {
542
                try {
673
                    long appTime1 = System.currentTimeMillis() / 1000;
543
                    long appTime1 = System.currentTimeMillis() / 1000;
674
//                    Log.i("appTime(long)---", appTime1 + "");
675
                    long updatetime = appTime1 - 7200;
544
                    long updatetime = appTime1 - 7200;
676
                    String token = String.valueOf(updatetime);
545
                    String token = String.valueOf(updatetime);
677

546

689
    }
558
    }
690

559

691
    private void submitPic(String sms) {
560
    private void submitPic(String sms) {
692

693
//        Log.e("url", sms);
694
        Request request = new Request.Builder().url(sms).build();
561
        Request request = new Request.Builder().url(sms).build();
695
        Response response = null;
562
        Response response = null;
696
        try {
563
        try {
751
                break;
618
                break;
752
            case R.id.guidethree:
619
            case R.id.guidethree:
753
                viewPager.setCurrentItem(3);
620
                viewPager.setCurrentItem(3);
754
//			ProfileManager.getInstance().setGuide(this, true);
755
//			startActivity(new Intent(this, MainActicity.class));
756
//			finish();
757
            case R.id.bt_enter:
621
            case R.id.bt_enter:
758
//                Log.e("@@@","@!@@");
759
//				ProfileManager.getInstance().setGuide(this, true);
760
                startActivity(new Intent(this, MainMapActivity.class));
622
                startActivity(new Intent(this, MainMapActivity.class));
761
                finish();
623
                finish();
762
                break;
624
                break;
819
                                           @NonNull String[] permissions,
681
                                           @NonNull String[] permissions,
820
                                           @NonNull int[] grantResults) {
682
                                           @NonNull int[] grantResults) {
821
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
683
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
822

823
        // EasyPermissions handles the request result.
684
        // EasyPermissions handles the request result.
824
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
685
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
825

826
    }
686
    }
827

687

828
    @Override
688
    @Override

+ 1 - 1
app/src/main/java/com/electric/chargingpile/manager/ProfileManager.java

371

371

372
    public String getDataUptime(Context context) {
372
    public String getDataUptime(Context context) {
373
        return PreferenceManager.getInstance(context).getString(KEY_DATA_UPTIME,
373
        return PreferenceManager.getInstance(context).getString(KEY_DATA_UPTIME,
374
                "1564379612");
374
                "1590993968");
375
    }
375
    }
376

376

377
    public String getFirstPoint(Context context) {
377
    public String getFirstPoint(Context context) {