代码修改

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

@@ -9,6 +9,7 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.andview.refreshview.utils.Utils;
import com.blankj.utilcode.util.EmptyUtils;
@@ -17,18 +18,25 @@ import com.blankj.utilcode.util.ScreenUtils;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.util.Util;
import com.squareup.picasso.Callback;
import com.squareup.picasso.Picasso;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import java.util.Timer;
import java.util.TimerTask;
import okhttp3.Call;
public class HomeAdActivity extends Activity implements View.OnClickListener {
    private static final String TAG = "HomeAdActivity";
    private RelativeLayout rl_time, rl_skip;
    private ImageView iv_bg;
    private TextView tv_time;
    private String imgUrl, url, content, text, icon, is_dui;
    private String imgUrl, url, content, text, icon, is_dui,advertiser,click_url;
    private int time = 3;
    private Timer timer = new Timer();
    private TimerTask task;
@@ -99,9 +107,45 @@ public class HomeAdActivity extends Activity implements View.OnClickListener {
        icon = getIntent().getStringExtra("icon");
        content = getIntent().getStringExtra("content");
        is_dui = getIntent().getStringExtra("is_dui");
        advertiser = getIntent().getStringExtra("advertiser");
        if (imgUrl != null) {
            loadAdImage();
        }
        if (advertiser != null && advertiser.equals("1")) {
            loadDmpData();
        }
    }
    private void loadDmpData() {
        OkHttpUtils.get().url(MainApplication.url + "/zhannew/xd_url.php").build().connTimeOut(3000).readTimeOut(3000)
                .execute(new StringCallback() {
                    @Override
                    public void onError(Call call, Exception e) {
                        e.printStackTrace();
                    }
                    @Override
                    public void onResponse(String response) {
                        String show_url = JsonUtils.getKeyResult(response, "show_url");
                        click_url = JsonUtils.getKeyResult(response, "click_url");
                        uploadDmpShow(show_url);
                    }
                });
    }
    private void uploadDmpShow(String url) {
        url = Util.generateDmpUrl(url, getApplicationContext());
        OkHttpUtils.get().url(url).build().connTimeOut(3000).readTimeOut(3000)
                .execute(new StringCallback() {
                    @Override
                    public void onError(Call call, Exception e) {
                        e.printStackTrace();
                    }
                    @Override
                    public void onResponse(String response) {
                    }
                });
    }
    private void loadAdImage() {
@@ -144,6 +188,8 @@ public class HomeAdActivity extends Activity implements View.OnClickListener {
            }
            Intent intent = new Intent(getApplicationContext(), MyWebViewActivity.class);
            intent.putExtra("url", url);
            intent.putExtra("advertiser", advertiser);
            intent.putExtra("click_url", click_url);
            startActivity(intent);
            flag = 1;
        }

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

@@ -2383,8 +2383,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                        hand.sendMessage(mes);
                    }
                    Toast.makeText(getApplication(), msg, Toast.LENGTH_SHORT).show();
                    Toast.makeText(getApplication(), "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Toast.LENGTH_SHORT).show();
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }
        }).start();

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

@@ -83,6 +83,8 @@ public class MyWebViewActivity extends Activity implements PlatformActionListene
    private String canRefresh = "false";
    private String index = "0";
    private String mUrl = "";
    private String advertiser;
    private String click_url;
    private ArrayList<String> list = new ArrayList<>();
    private String refreshUrl = "";
    private String currentUrl = "";
@@ -107,7 +109,25 @@ public class MyWebViewActivity extends Activity implements PlatformActionListene
    private void getIntentData() {
        mUrl = getIntent().getStringExtra("url");
        advertiser = getIntent().getStringExtra("advertiser");
        click_url = getIntent().getStringExtra("click_url");
        Log.e(TAG, "getIntentData: " + mUrl);
        if (advertiser!=null && advertiser.equals("1")) {
            uploadDmpClick(click_url);
        }
    }
    private void uploadDmpClick(String url) {
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000)
                .execute(new StringCallback() {
                    @Override
                    public void onError(Call call, Exception e) {
                        e.printStackTrace();
                    }
                    @Override
                    public void onResponse(String response) {
                    }
                });
    }
    private void initView() {

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

@@ -238,6 +238,7 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
                            String icon = JsonUtils.getKeyResult(welcome_ad, "icon");
                            String title = JsonUtils.getKeyResult(welcome_ad, "title");
                            String is_dui = JsonUtils.getKeyResult(welcome_ad, "is_dui");
                            String advertiser = JsonUtils.getKeyResult(welcome_ad, "advertiser");
                            if (is_dui.equals("1")) {
                                MainApplication.current_url = url;
                            }
@@ -252,6 +253,7 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
                                intent.putExtra("icon", icon);
                                intent.putExtra("title", title);
                                intent.putExtra("is_dui", is_dui);
                                intent.putExtra("advertiser",advertiser);
                                startActivity(intent);
                                finish();
//                                mTimer.cancel();
@@ -446,7 +448,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
                    initParams.append(",\"version_name\":\"" + BuildConfig.VERSION_NAME + "\"");
                    initParams.append(",\"version_code\":\"" + BuildConfig.VERSION_CODE + "\"");
                    initParams.append(",\"os\":\"android "+ Build.VERSION.RELEASE +"\""); // 操作系统及版本
//                    initParams.append(",\"version\":\"" + Build.VERSION.RELEASE + "\""); // 操作系统版本
                    initParams.append(",\"brand\":\"" + Build.BRAND + "\""); // 品牌
                    initParams.append(",\"model\":\"" + Build.MODEL + "\""); // 型号
                    initParams.append("}");

app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@@ -75,8 +75,8 @@ public class MainApplication extends MultiDexApplication {
    public static String firstPoint = "";
    public static Boolean firstSsyd;
    public static String password = "";
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
        public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
    public static String url = "http://59.110.68.162";// 充电桩测试环境
//        public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
//    public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";