Browse Source

代码修改

huyuguo 5 years ago
parent
commit
b107dbc225

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

9
import android.widget.ImageView;
9
import android.widget.ImageView;
10
import android.widget.RelativeLayout;
10
import android.widget.RelativeLayout;
11
import android.widget.TextView;
11
import android.widget.TextView;
12
import android.widget.Toast;
12
13
13
import com.andview.refreshview.utils.Utils;
14
import com.andview.refreshview.utils.Utils;
14
import com.blankj.utilcode.util.EmptyUtils;
15
import com.blankj.utilcode.util.EmptyUtils;
17
import com.electric.chargingpile.R;
18
import com.electric.chargingpile.R;
18
import com.electric.chargingpile.application.MainApplication;
19
import com.electric.chargingpile.application.MainApplication;
19
import com.electric.chargingpile.util.BarColorUtil;
20
import com.electric.chargingpile.util.BarColorUtil;
21
import com.electric.chargingpile.util.JsonUtils;
22
import com.electric.chargingpile.util.ToastUtil;
23
import com.electric.chargingpile.util.Util;
20
import com.squareup.picasso.Callback;
24
import com.squareup.picasso.Callback;
21
import com.squareup.picasso.Picasso;
25
import com.squareup.picasso.Picasso;
26
import com.zhy.http.okhttp.OkHttpUtils;
27
import com.zhy.http.okhttp.callback.StringCallback;
22
28
23
import java.util.Timer;
29
import java.util.Timer;
24
import java.util.TimerTask;
30
import java.util.TimerTask;
25
31
32
import okhttp3.Call;
33
26
public class HomeAdActivity extends Activity implements View.OnClickListener {
34
public class HomeAdActivity extends Activity implements View.OnClickListener {
27
    private static final String TAG = "HomeAdActivity";
35
    private static final String TAG = "HomeAdActivity";
28
    private RelativeLayout rl_time, rl_skip;
36
    private RelativeLayout rl_time, rl_skip;
29
    private ImageView iv_bg;
37
    private ImageView iv_bg;
30
    private TextView tv_time;
38
    private TextView tv_time;
31
    private String imgUrl, url, content, text, icon, is_dui;
39
    private String imgUrl, url, content, text, icon, is_dui,advertiser,click_url;
32
    private int time = 3;
40
    private int time = 3;
33
    private Timer timer = new Timer();
41
    private Timer timer = new Timer();
34
    private TimerTask task;
42
    private TimerTask task;
99
        icon = getIntent().getStringExtra("icon");
107
        icon = getIntent().getStringExtra("icon");
100
        content = getIntent().getStringExtra("content");
108
        content = getIntent().getStringExtra("content");
101
        is_dui = getIntent().getStringExtra("is_dui");
109
        is_dui = getIntent().getStringExtra("is_dui");
110
        advertiser = getIntent().getStringExtra("advertiser");
102
        if (imgUrl != null) {
111
        if (imgUrl != null) {
103
            loadAdImage();
112
            loadAdImage();
104
        }
113
        }
114
115
        if (advertiser != null && advertiser.equals("1")) {
116
            loadDmpData();
117
        }
118
    }
119
120
    private void loadDmpData() {
121
        OkHttpUtils.get().url(MainApplication.url + "/zhannew/xd_url.php").build().connTimeOut(3000).readTimeOut(3000)
122
                .execute(new StringCallback() {
123
                    @Override
124
                    public void onError(Call call, Exception e) {
125
                        e.printStackTrace();
126
                    }
127
128
                    @Override
129
                    public void onResponse(String response) {
130
                        String show_url = JsonUtils.getKeyResult(response, "show_url");
131
                        click_url = JsonUtils.getKeyResult(response, "click_url");
132
                        uploadDmpShow(show_url);
133
                    }
134
                });
135
    }
136
137
    private void uploadDmpShow(String url) {
138
        url = Util.generateDmpUrl(url, getApplicationContext());
139
        OkHttpUtils.get().url(url).build().connTimeOut(3000).readTimeOut(3000)
140
                .execute(new StringCallback() {
141
                    @Override
142
                    public void onError(Call call, Exception e) {
143
                        e.printStackTrace();
144
                    }
145
                    @Override
146
                    public void onResponse(String response) {
147
                    }
148
                });
105
    }
149
    }
106
150
107
    private void loadAdImage() {
151
    private void loadAdImage() {
144
            }
188
            }
145
            Intent intent = new Intent(getApplicationContext(), MyWebViewActivity.class);
189
            Intent intent = new Intent(getApplicationContext(), MyWebViewActivity.class);
146
            intent.putExtra("url", url);
190
            intent.putExtra("url", url);
191
            intent.putExtra("advertiser", advertiser);
192
            intent.putExtra("click_url", click_url);
147
            startActivity(intent);
193
            startActivity(intent);
148
            flag = 1;
194
            flag = 1;
149
        }
195
        }

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

2383
                        hand.sendMessage(mes);
2383
                        hand.sendMessage(mes);
2384
                    }
2384
                    }
2385
                    Toast.makeText(getApplication(), msg, Toast.LENGTH_SHORT).show();
2385
                    Toast.makeText(getApplication(), msg, Toast.LENGTH_SHORT).show();
2386
                    Toast.makeText(getApplication(), "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Toast.LENGTH_SHORT).show();
2387
                } catch (Exception e) {
2386
                } catch (Exception e) {
2387
                    e.printStackTrace();
2388
                }
2388
                }
2389
            }
2389
            }
2390
        }).start();
2390
        }).start();

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

83
    private String canRefresh = "false";
83
    private String canRefresh = "false";
84
    private String index = "0";
84
    private String index = "0";
85
    private String mUrl = "";
85
    private String mUrl = "";
86
    private String advertiser;
87
    private String click_url;
86
    private ArrayList<String> list = new ArrayList<>();
88
    private ArrayList<String> list = new ArrayList<>();
87
    private String refreshUrl = "";
89
    private String refreshUrl = "";
88
    private String currentUrl = "";
90
    private String currentUrl = "";
107
109
108
    private void getIntentData() {
110
    private void getIntentData() {
109
        mUrl = getIntent().getStringExtra("url");
111
        mUrl = getIntent().getStringExtra("url");
112
        advertiser = getIntent().getStringExtra("advertiser");
113
        click_url = getIntent().getStringExtra("click_url");
110
        Log.e(TAG, "getIntentData: " + mUrl);
114
        Log.e(TAG, "getIntentData: " + mUrl);
115
        if (advertiser!=null && advertiser.equals("1")) {
116
            uploadDmpClick(click_url);
117
        }
118
    }
119
120
    private void uploadDmpClick(String url) {
121
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000)
122
                .execute(new StringCallback() {
123
                    @Override
124
                    public void onError(Call call, Exception e) {
125
                        e.printStackTrace();
126
                    }
127
                    @Override
128
                    public void onResponse(String response) {
129
                    }
130
                });
111
    }
131
    }
112
132
113
    private void initView() {
133
    private void initView() {

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

238
                            String icon = JsonUtils.getKeyResult(welcome_ad, "icon");
238
                            String icon = JsonUtils.getKeyResult(welcome_ad, "icon");
239
                            String title = JsonUtils.getKeyResult(welcome_ad, "title");
239
                            String title = JsonUtils.getKeyResult(welcome_ad, "title");
240
                            String is_dui = JsonUtils.getKeyResult(welcome_ad, "is_dui");
240
                            String is_dui = JsonUtils.getKeyResult(welcome_ad, "is_dui");
241
                            String advertiser = JsonUtils.getKeyResult(welcome_ad, "advertiser");
241
                            if (is_dui.equals("1")) {
242
                            if (is_dui.equals("1")) {
242
                                MainApplication.current_url = url;
243
                                MainApplication.current_url = url;
243
                            }
244
                            }
252
                                intent.putExtra("icon", icon);
253
                                intent.putExtra("icon", icon);
253
                                intent.putExtra("title", title);
254
                                intent.putExtra("title", title);
254
                                intent.putExtra("is_dui", is_dui);
255
                                intent.putExtra("is_dui", is_dui);
256
                                intent.putExtra("advertiser",advertiser);
255
                                startActivity(intent);
257
                                startActivity(intent);
256
                                finish();
258
                                finish();
257
//                                mTimer.cancel();
259
//                                mTimer.cancel();
446
                    initParams.append(",\"version_name\":\"" + BuildConfig.VERSION_NAME + "\"");
448
                    initParams.append(",\"version_name\":\"" + BuildConfig.VERSION_NAME + "\"");
447
                    initParams.append(",\"version_code\":\"" + BuildConfig.VERSION_CODE + "\"");
449
                    initParams.append(",\"version_code\":\"" + BuildConfig.VERSION_CODE + "\"");
448
                    initParams.append(",\"os\":\"android "+ Build.VERSION.RELEASE +"\""); // 操作系统及版本
450
                    initParams.append(",\"os\":\"android "+ Build.VERSION.RELEASE +"\""); // 操作系统及版本
449
//                    initParams.append(",\"version\":\"" + Build.VERSION.RELEASE + "\""); // 操作系统版本
450
                    initParams.append(",\"brand\":\"" + Build.BRAND + "\""); // 品牌
451
                    initParams.append(",\"brand\":\"" + Build.BRAND + "\""); // 品牌
451
                    initParams.append(",\"model\":\"" + Build.MODEL + "\""); // 型号
452
                    initParams.append(",\"model\":\"" + Build.MODEL + "\""); // 型号
452
                    initParams.append("}");
453
                    initParams.append("}");

+ 2 - 2
app/src/main/java/com/electric/chargingpile/application/MainApplication.java

75
    public static String firstPoint = "";
75
    public static String firstPoint = "";
76
    public static Boolean firstSsyd;
76
    public static Boolean firstSsyd;
77
    public static String password = "";
77
    public static String password = "";
78
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
79
        public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78
    public static String url = "http://59.110.68.162";// 充电桩测试环境
79
//        public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
80
//    public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
80
//    public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
81
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
81
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
82
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
82
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";