启屏广告优化

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.electric.chargingpile"
    android:versionCode="85"
    android:versionName="3.4.7">
    android:versionCode="86"
    android:versionName="3.4.8">
    <!-- 极光 -->
    <application
        android:name=".application.MainApplication"

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

@@ -29,10 +29,12 @@ import android.widget.Toast;
import com.alibaba.fastjson.JSON;
import com.amap.api.maps.MapsInitializer;
import com.andview.refreshview.utils.Utils;
import com.blankj.utilcode.util.CacheUtils;
import com.blankj.utilcode.util.EmptyUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.StringUtils;
import com.electric.chargingpile.BuildConfig;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.AdDetail;
@@ -138,31 +140,21 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
                case 9:
                    try {
                        String data = JsonUtils.getKeyResult(msg.obj.toString(), "data");
//                        Log.e("welcome===",data);
                        String ad_major = JsonUtils.getKeyResult(data, "ad_major");
//                        LogUtils.e(ad_major);
                        if (EmptyUtils.isNotEmpty(ad_major)) {
                            MainApplication.haveActivity = true;
                            MainApplication.ad_major = ad_major;
                            img = JsonUtils.getKeyResult(ad_major, "img");
//                            Log.e("img===", img);
                            url = JsonUtils.getKeyResult(ad_major, "url");
//                            Log.e("url===", url);
                            String content = JsonUtils.getKeyResult(ad_major, "content");
//                            Log.e("content===", content);
                            String icon = JsonUtils.getKeyResult(ad_major, "icon");
//                            Log.e("icon===", icon);
                            String title = JsonUtils.getKeyResult(ad_major, "title");
//                            Log.e("title===", title);
                            String is_dui = JsonUtils.getKeyResult(ad_major, "is_dui");
                            if (is_dui.equals("1")) {
                                MainApplication.current_url = url;
                            }
                            dealOperatorData();
//                            Log.e("!!!!!pic", MainApplication.url + "/zhannew//uploadfile/" + img);
                            imgUrl = MainApplication.url + "/zhannew//uploadfile/" + img;
                            if (!imgUrl.toString().equals("")) {
@@ -198,8 +190,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
                            MainApplication.list_addetail = JsonUtils.parseToObjectList(ad_detail, AdDetail.class);
                        }
                        String huodonglabel = JsonUtils.getKeyResult(data, "huodonglabel");
//                        Log.e("ad=====",ad);
                        String levellabel = JsonUtils.getKeyResult(data, "levellabel");
                        if (null == levellabel) {
@@ -243,22 +233,15 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
                        if (EmptyUtils.isNotEmpty(jsonArray) && jsonArray.size() > 0) {
                            String welcome_ad = jsonArray.getJSONObject(0).toString();
                            img = JsonUtils.getKeyResult(welcome_ad, "img");
//                            Log.e("img===", img);
                            url = JsonUtils.getKeyResult(welcome_ad, "url");
//                            Log.e("url===", url);
                            String content = JsonUtils.getKeyResult(welcome_ad, "content");
//                            Log.e("content===", content);
                            String icon = JsonUtils.getKeyResult(welcome_ad, "icon");
//                            Log.e("icon===", icon);
                            String title = JsonUtils.getKeyResult(welcome_ad, "title");
//                            Log.e("title===", title);
                            String is_dui = JsonUtils.getKeyResult(welcome_ad, "is_dui");
                            if (is_dui.equals("1")) {
                                MainApplication.current_url = url;
                            }
//                            Log.e("!!!!!pic", MainApplication.url + "/zhannew//uploadfile/" + img);
                            imgUrl = MainApplication.url + "/zhannew//uploadfile/" + img;
                            if (!imgUrl.toString().equals("")) {
@@ -423,9 +406,13 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
            public void run() {
                try {
                    // 创建Socket
                    // socket = new Socket("192.168.1.110",54321);
//                    socket = new Socket("192.168.3.147", 9503); // IP：10.14.114.127，端口54321
                    socket = new Socket("cdz.evcharge.cc", 9503); // IP：10.14.114.127，端口54321
                    String host = "";
                    if (MainApplication.url.contains("cdz.evcharge.cc")) {
                        host = "cdz.evcharge.cc";
                    } else {
                        host = "59.110.68.162";
                    }
                    socket = new Socket(host, 9503);
                    // 向服务器发送消息
                    PrintWriter out = new PrintWriter(new BufferedWriter(
                            new OutputStreamWriter(socket.getOutputStream())), true);
@@ -451,12 +438,24 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
//                    Log.e("timer===", time + "");
                    String Token = getMD5(String.valueOf((System.currentTimeMillis() / 1000 - MainMapActivity.cha) / 10) + "qwerty");
//                    Log.d("11111","{\"fun\":\"init\",\"timer\":" + "\"" + Token + "\"" + "}");
                    ete2("{\"fun\":\"init\",\"timer\":" + "\"" + Token + "\"" + "}");
                    StringBuffer initParams = new StringBuffer();
                    initParams.append("{\"fun\":\"init\",\"timer\":\"" + Token + "\"");
                    initParams.append(",\"w\":\"" + Utils.getScreenWidth(WelcomeActivity.this) + "\"");
                    initParams.append(",\"h\":\"" + Utils.getScreenHeight(WelcomeActivity.this) + "\"");
                    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("}");
                    ete2(initParams.toString());
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }
        }).start();
    }
@@ -466,9 +465,13 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
            public void run() {
                try {
                    // 创建Socket
                    // socket = new Socket("192.168.1.110",54321);
//                    socket = new Socket("192.168.3.147", 9503); // IP：10.14.114.127，端口54321
                    socket = new Socket("cdz.evcharge.cc", 9503); // IP：10.14.114.127，端口54321
                    String host = "";
                    if (MainApplication.url.contains("cdz.evcharge.cc")) {
                        host = "cdz.evcharge.cc";
                    } else {
                        host = "59.110.68.162";
                    }
                    socket = new Socket(host, 9503); // IP：10.14.114.127，端口54321
//                    SocketAddress socAddress = new InetSocketAddress("cdz.d1ev.com", 9503);
//                    socket.connect(socAddress, 5000);
                    // 向服务器发送消息
@@ -780,6 +783,9 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
        }
    }
    /**
     * 获取运营商信息
     */
    private void getOperatorData() {
        String url = MainApplication.url + "/zhannew/basic/web/index.php/suppiler/suppiler-list";
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {

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/";

app/src/main/res/layout/activity_main_map.xml

@@ -1769,7 +1769,7 @@
    </LinearLayout>
    <!-- 首页弹出广告布局 -->
    <!-- 首页弹出广告布局 start -->
    <com.zhy.autolayout.AutoRelativeLayout
        android:id="@+id/rl_ad"
        android:layout_width="match_parent"
@@ -1799,8 +1799,9 @@
            android:scaleType="fitXY" />
    </com.zhy.autolayout.AutoRelativeLayout>
    <!-- 首页弹出广告布局 end -->
    <!-- 首页首次启动弹出隐私协议 -->
    <!-- 首页首次启动弹出隐私协议 start -->
    <android.support.constraint.ConstraintLayout
        android:id="@+id/rl_privacy_protocol"
        android:layout_width="match_parent"
@@ -1846,6 +1847,7 @@
        </android.support.constraint.ConstraintLayout>
    </android.support.constraint.ConstraintLayout>
    <!-- 首页首次启动弹出隐私协议 end -->
</RelativeLayout>

app/src/main/res/layout/activity_welcome.xml

@@ -4,6 +4,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    <!-- logo start    -->
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
@@ -11,44 +12,37 @@
        android:layout_centerVertical="true"
        android:background="#ffffff"
        android:orientation="vertical">
        <ImageView
            android:id="@+id/img_welcome"
            android:layout_width="160dp"
            android:layout_height="59dp"
            android:contentDescription="@null"
            android:visibility="visible"
            android:layout_gravity="center_horizontal"
            android:layout_marginTop="240dp"
            android:src="@drawable/bg_welcome_text"/>
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
            android:layout_marginTop="25dp"
            android:text="充电桩"
            android:textSize="25sp"
            android:visibility="gone" />
            android:contentDescription="@null"
            android:src="@drawable/bg_welcome_text"
            android:visibility="visible" />
    </LinearLayout>
    <!-- logo end    -->
    <!-- 360 首发标识 -->
    <!-- 360 首发标识 start -->
    <!--<ImageView-->
        <!--android:src="@drawable/logo_360"-->
        <!--android:layout_width="wrap_content"-->
        <!--android:layout_centerHorizontal="true"-->
        <!--android:layout_alignParentBottom="true"-->
        <!--android:layout_marginBottom="80dp"-->
        <!--android:layout_height="wrap_content" />-->
    <!--android:src="@drawable/logo_360"-->
    <!--android:layout_width="wrap_content"-->
    <!--android:layout_centerHorizontal="true"-->
    <!--android:layout_alignParentBottom="true"-->
    <!--android:layout_marginBottom="80dp"-->
    <!--android:layout_height="wrap_content" />-->
    <!-- 360 首发标识 end -->
    <!-- guide start    -->
    <android.support.v4.view.ViewPager
        android:id="@+id/viewpager"
        android:layout_width="fill_parent"
        android:layout_height="fill_parent"
        android:visibility="gone"></android.support.v4.view.ViewPager>
        android:visibility="gone" />
    <!-- guide end    -->
    <!-- 版本信息 start    -->
    <TextView
        android:id="@+id/android"
        android:layout_width="wrap_content"
@@ -59,7 +53,9 @@
        android:text=""
        android:textColor="#AAAAAA"
        android:textSize="12sp" />
    <!-- 版本信息 end    -->
    <!-- 版权信息 start    -->
    <com.zhy.autolayout.AutoLinearLayout
        android:id="@+id/ll_1"
        android:layout_width="wrap_content"
@@ -84,6 +80,6 @@
            android:textColor="#AAAAAA"
            android:textSize="11sp" />
    </com.zhy.autolayout.AutoLinearLayout>
    <!-- 版权信息 end    -->
</RelativeLayout>