弹屏广告bug修复

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

@@ -431,7 +431,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                            // 二手车广告
                            String adfloat = JsonUtils.getKeyResult(data, "ad_float");
                            if (adfloat != null || !adfloat.equals("")) {
                            if (adfloat != null && !adfloat.equals("")) {
                                List<Adin> listAdfloat = JsonUtils.parseToObjectList(adfloat, Adin.class);
                                if (listAdfloat.size() > 0) {
                                    loadAdfloatImg(listAdfloat.get(0));

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

@@ -256,7 +256,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
                                intent.putExtra("advertiser",advertiser);
                                startActivity(intent);
                                finish();
//                                mTimer.cancel();
                                overridePendingTransition(0, 0);
                            } else {
                                new Handler().postDelayed(new Runnable() {
@@ -265,7 +264,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
                                        startActivity(new Intent(WelcomeActivity.this,
                                                MainMapActivity.class));
                                        finish();
//                                        mTimer.cancel();
                                    }
                                }, 2000);
                            }
@@ -275,37 +273,7 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
                        e.printStackTrace();
                    }
                    break;
//				case 19 :
//					try {
//						img_welcome = (ImageView) findViewById(R.id.img_welcome);
////						rl_w.setVisibility(View.VISIBLE);
//						img_welcome.setImageDrawable((Drawable) msg.obj);
//						img_welcome.setOnClickListener(new OnClickListener() {
//							@Override
//							public void onClick(View v) {
//								if (!url.equals("")){
//
//
//								}
//
//							}
//						});
////						rl_welcome.setOnClickListener(new OnClickListener() {
////							@Override
////							public void onClick(View v) {
//////								link();
//////								rl_ad.setVisibility(View.GONE);
////							}
////						});
//
//					} catch (Exception e) {
//						e.printStackTrace();
//					}
//					break;
                default:
                    break;
            }
        }
@@ -326,18 +294,11 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_welcome);
        BarColorUtil.initStatusBarColor(WelcomeActivity.this);
//        BarUtils.setStatusBarAlpha(this);
        androidd = (TextView) findViewById(R.id.android);
        ll_1 = (LinearLayout) findViewById(R.id.ll_1);
        getVersion();
        MapsInitializer.sdcardDir = MAP_FILE_PATH;
//        boolean isClean = SPUtils.getInstance("DATA_CLEAN").getBoolean("isClean");
//        if (isClean == false){
//            DeleteFile(new File("/mnt/sdcard/amap"));
//            SPUtils.getInstance("DATA_CLEAN").put("isClean",true);
//        }
        mTimer = new Timer();
        if (ProfileManager.getInstance().getGuide(this)) {
            saveTask();
@@ -375,11 +336,9 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
            PackageManager manager = getApplication().getPackageManager();
            PackageInfo info = manager.getPackageInfo(getApplication().getPackageName(), 0);
            app_version = info.versionName;
//                  return this.getString(R.string.version_name) + version;
            androidd.setText("For Android V" + app_version);
        } catch (Exception e) {
            e.printStackTrace();
//                    return this.getString(R.string.can_not_find_version_name);
        }
    }
@@ -429,16 +388,8 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
//                    Log.e("msg_init", msg);
                    int time = (int) (System.currentTimeMillis() / 1000);
//                    if (time >= 1484841600 && time <= 1486569599 ){
//                        MainApplication.festival_time = "1";
//                    }else if (time >= 1486569600 && time <= 1486915199){
//                        MainApplication.festival_time = "2";
//                    }
//                    cha = String.valueOf(time - Integer.parseInt(msg));
                    MainMapActivity.cha = time - Integer.parseInt(msg);
//                    Log.e("timer===", time + "");
                    String Token = getMD5(String.valueOf((System.currentTimeMillis() / 1000 - MainMapActivity.cha) / 10) + "qwerty");
//                    Log.d("11111","{\"fun\":\"init\",\"timer\":" + "\"" + Token + "\"" + "}");
                    StringBuffer initParams = new StringBuffer();
                    initParams.append("{\"fun\":\"init\",\"timer\":\"" + Token + "\"");
@@ -524,23 +475,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
        return builder.toString().toLowerCase();
    }
//		getStartPic();
//		img_welcome = (ImageView) findViewById(R.id.img_welcome);
//		new Thread(new Runnable() {
//			@Override
//			public void run() {
//				bitmap = ImageLoader.getInstance().loadImageSync(MainApplication.userIcon);
//
//			}
//		}).start();
//		saveBitmap(bitmap);
//
//		String dir_path=Environment.getExternalStorageDirectory()+File.separator+"d1ev/";
//		File f = new File(dir_path, "welcome_pic");
//		img_welcome.setImageURI(Uri.fromFile(f));
    private Drawable loadImageFromNetwork(String imageUrl) {
        Drawable drawable = null;
        try {
@@ -567,70 +501,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
        return drawable;
    }
//    private void getAdout() {
//
//        new Thread(new Runnable() {
//            @Override
//            public void run() {
//                try {
//
//                    String url = null;
//
//                    long appTime1 = System.currentTimeMillis() / 1000;
//                    Log.i("appTime(long)---", appTime1 + "");
//                    long updatetime = appTime1 - 7200;
//                    String token = String.valueOf(updatetime);
//
//                    String replace = URLEncoder.encode(DES3.encode(token));
//
//                    url = MainApplication.url + "/zhannew/basic/web/index.php/ad/get?timer=" + replace;
//
//                    getAdoutt(url);
//                } catch (Exception e) {
//                    e.printStackTrace();
//                }
//
//            }
//        }).start();
//    }
//
//    private void getAdoutt(String sms) {
//
//        Log.e("url", sms);
//        Request request = new Request.Builder().url(sms).build();
//        Response response = null;
//        try {
//            if (request == null) {
//                Message msg = new Message();
//                msg.what = 3;
//                handler.sendMessage(msg);
//                return;
//            }
//            response = OkHttpUtil.execute(request);
//            if (response.code() == 200) {
//                String json = "";
//                try {
//                    json = response.body().string();
//                    Message msg = new Message();
//                    msg.obj = json;
//                    msg.what = 9;
//                    handler.sendMessage(msg);
//                    Log.e("url", json);
////                    Log.i("token解密：", DES3.decode(encode_token));
//                } catch (Exception e) {
//                    e.printStackTrace();
//                    Message msg = new Message();
//                    msg.what = 3;
//                    handler.sendMessage(msg);
//                }
//            }
//        } catch (Exception e) {
//            e.printStackTrace();
//            Message msg = new Message();
//            msg.what = 3;
//            handler.sendMessage(msg);
//        }
//    }
    public void saveBitmap(Bitmap mBitmap) {
@@ -671,7 +541,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
                String url = null;
                try {
                    long appTime1 = System.currentTimeMillis() / 1000;
//                    Log.i("appTime(long)---", appTime1 + "");
                    long updatetime = appTime1 - 7200;
                    String token = String.valueOf(updatetime);
@@ -689,8 +558,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
    }
    private void submitPic(String sms) {
//        Log.e("url", sms);
        Request request = new Request.Builder().url(sms).build();
        Response response = null;
        try {
@@ -751,12 +618,7 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
                break;
            case R.id.guidethree:
                viewPager.setCurrentItem(3);
//			ProfileManager.getInstance().setGuide(this, true);
//			startActivity(new Intent(this, MainActicity.class));
//			finish();
            case R.id.bt_enter:
//                Log.e("@@@","@!@@");
//				ProfileManager.getInstance().setGuide(this, true);
                startActivity(new Intent(this, MainMapActivity.class));
                finish();
                break;
@@ -819,10 +681,8 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
                                           @NonNull String[] permissions,
                                           @NonNull int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
        // EasyPermissions handles the request result.
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
    }
    @Override

app/src/main/java/com/electric/chargingpile/manager/ProfileManager.java

@@ -371,7 +371,7 @@ public class ProfileManager {
    public String getDataUptime(Context context) {
        return PreferenceManager.getInstance(context).getString(KEY_DATA_UPTIME,
                "1564379612");
                "1590993968");
    }
    public String getFirstPoint(Context context) {