消息推送修改

app/src/main/AndroidManifest.xml

@@ -11,14 +11,17 @@
 If your app targets Android 9 or lower, you can declare
         ACCESS_COARSE_LOCATION instead.
    -->
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 往SDCard写入数据权限 -->
    <permission
        android:name="${applicationId}.permission.JPUSH_MESSAGE"
        android:protectionLevel="signature" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 往SDCard写入数据权限 -->
    <uses-feature android:name="android.hardware.camera" />
    <uses-feature android:name="android.hardware.camera.autofocus" />
    <uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" />
    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
@@ -44,7 +47,6 @@
    <uses-permission android:name="android.permission.VIBRATE" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
    <uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" />
    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- 极光 -->
@@ -547,22 +549,6 @@
     App Indexing.  See https://g.co/AppIndexing/AndroidStudio for more information.
        -->
        <activity
            android:name="cn.jpush.android.ui.PopWinActivity"
            android:exported="false"
            android:theme="@style/MyDialogStyle" />
        <activity
            android:name="cn.jpush.android.ui.PushActivity"
            android:configChanges="orientation|keyboardHidden"
            android:exported="false"
            android:theme="@android:style/Theme.NoTitleBar">
            <intent-filter>
                <action android:name="cn.jpush.android.ui.PushActivity" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="${applicationId}" />
            </intent-filter>
        </activity>
        <activity
            android:name=".activity.ShowBuildLocationActivity"
            android:screenOrientation="portrait" />
        <activity
@@ -820,6 +806,118 @@
            android:launchMode="singleTask"
            android:screenOrientation="portrait" />
        <!-- Rich push 核心功能 since 2.0.6-->
        <activity
            android:name="cn.jpush.android.ui.PopWinActivity"
            android:theme="@style/MyDialogStyle"
            android:exported="false">
        </activity>
        <!-- Required SDK核心功能-->
        <activity
            android:name="cn.jpush.android.ui.PushActivity"
            android:configChanges="orientation|keyboardHidden"
            android:theme="@android:style/Theme.NoTitleBar"
            android:exported="false">
            <intent-filter>
                <action android:name="cn.jpush.android.ui.PushActivity" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="${applicationId}" />
            </intent-filter>
        </activity>
        <!-- Required SDK 核心功能-->
        <!-- 可配置android:process参数将PushService放在其他进程中 -->
        <service
            android:name="cn.jpush.android.service.PushService"
            android:process=":pushcore">
            <intent-filter>
                <action android:name="cn.jpush.android.intent.REGISTER" />
                <action android:name="cn.jpush.android.intent.REPORT" />
                <action android:name="cn.jpush.android.intent.PushService" />
                <action android:name="cn.jpush.android.intent.PUSH_TIME" />
            </intent-filter>
        </service>
        <!-- since 3.0.9 Required SDK 核心功能-->
        <provider
            android:authorities="${applicationId}.DataProvider"
            android:name="cn.jpush.android.service.DataProvider"
            android:process=":pushcore"
            android:exported="false"
            />
        <!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
        <!-- 若不启用该功能可删除该组件，或把 enabled 设置成 false ；App 不会被其他 App 拉起，但会拉起其他的 App。 -->
        <service
            android:name="cn.jpush.android.service.DaemonService"
            android:enabled="true"
            android:exported="true">
            <intent-filter>
                <action android:name="cn.jpush.android.intent.DaemonService" />
                <category android:name="${applicationId}" />
            </intent-filter>
        </service>
        <!-- 可选，如果使用静态Activity方式拉起，该组件必须声明 -->
        <activity android:name="cn.jpush.android.service.DActivity"
            android:enabled="true"
            android:exported="true"
            android:theme="@android:style/Theme.Translucent.NoTitleBar"
            android:taskAffinity="jpush.custom">
            <intent-filter>
                <action android:name="cn.jpush.android.intent.DActivity"/>
                <category android:name="${applicationId}" />
            </intent-filter>
        </activity>
        <!--since 3.3.0 Required SDK核心功能-->
        <activity
            android:name="cn.jpush.android.service.JNotifyActivity"
            android:exported="false"
            android:taskAffinity="jpush.custom"
            android:theme="@android:style/Theme.Translucent.NoTitleBar">
            <intent-filter>
                <action android:name="cn.jpush.android.intent.JNotifyActivity" />
                <category android:name="${applicationId}" />
            </intent-filter>
        </activity>
        <!-- since 3.1.0 Required SDK 核心功能-->
        <provider
            android:authorities="${applicationId}.DownloadProvider"
            android:name="cn.jpush.android.service.DownloadProvider"
            android:exported="true"
            />
        <!-- Required SDK核心功能-->
        <receiver
            android:name="cn.jpush.android.service.PushReceiver"
            android:enabled="true">
            <intent-filter android:priority="1000">
                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />   <!--Required  显示通知栏 -->
                <category android:name="${applicationId}" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.USER_PRESENT" />
                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
            </intent-filter>
            <!-- Optional -->
            <intent-filter>
                <action android:name="android.intent.action.PACKAGE_ADDED" />
                <action android:name="android.intent.action.PACKAGE_REMOVED" />
                <data android:scheme="package" />
            </intent-filter>
        </receiver>
        <!-- Required SDK核心功能-->
        <receiver android:name="cn.jpush.android.service.AlarmReceiver" android:exported="false"/>
        <!-- 3.5.0新增，用于定时展示功能 -->
        <receiver android:name="cn.jpush.android.service.SchedulerReceiver" android:exported="false"/>
        <meta-data
            android:name="com.amap.api.v2.apikey"
            android:value="fabcfbf869745789b151d0c88e9b4807" />
@@ -858,72 +956,20 @@
                android:resource="@xml/provider_paths" />
        </provider>
        <receiver
            android:name="cn.jpush.android.service.PushReceiver"
            android:enabled="true"
            android:exported="false">
            <intent-filter android:priority="1000">
                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" /> <!-- Required  显示通知栏 -->
                <category android:name="${applicationId}" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.USER_PRESENT" />
                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
            </intent-filter>
            <!-- Optional -->
            <intent-filter>
                <action android:name="android.intent.action.PACKAGE_ADDED" />
                <action android:name="android.intent.action.PACKAGE_REMOVED" />
                <data android:scheme="package" />
            </intent-filter>
        </receiver>
        <receiver
            android:name="cn.jpush.android.service.AlarmReceiver"
            android:exported="false" />
        <receiver
            android:name=".view.MyReceiver"
            android:enabled="true"
            android:exported="false">
            <intent-filter>
                <action android:name="cn.jpush.android.intent.REGISTRATION" /> <!-- Required  用户注册SDK的intent -->
                <action android:name="cn.jpush.android.intent.UNREGISTRATION" />
                <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" /> <!-- Required  用户接收SDK消息的intent -->
                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" /> <!-- Required  用户接收SDK通知栏信息的intent -->
                <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" /> <!-- Required  用户打开自定义通知栏的intent -->
                <action android:name="cn.jpush.android.intent.ACTION_RICHPUSH_CALLBACK" /> <!-- Optional 用户接受Rich Push Javascript 回调函数的intent -->
                <action android:name="cn.jpush.android.intent.CONNECTION" /> <!-- 接收网络变化 连接/断开 since 1.6.3 -->
                <category android:name="${applicationId}" />
            </intent-filter>
        </receiver>
        <service android:name="com.amap.api.location.APSService" />
        <service android:name="com.amap.api.location.APSService" />
        <service
            android:name="cn.jpush.android.service.DownloadService"
            android:enabled="true"
            android:exported="false" />
        <service
            android:name="cn.jpush.android.service.PushService"
            android:enabled="true"
            android:exported="false">
        <!-- User defined.  For test only  用户自定义接收消息器,3.0.7开始支持,目前新tag/alias接口设置结果会在该广播接收器对应的方法中回调-->
        <!--since 3.3.0 接收JPush相关事件-->
        <receiver android:name="com.electric.chargingpile.jpush.PushMessageReceiver">
            <intent-filter>
                <action android:name="cn.jpush.android.intent.REGISTER" />
                <action android:name="cn.jpush.android.intent.REPORT" />
                <action android:name="cn.jpush.android.intent.PushService" />
                <action android:name="cn.jpush.android.intent.PUSH_TIME" />
                <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
                <category android:name="${applicationId}"></category>
            </intent-filter>
        </service>
        <service
            android:name="cn.jpush.android.service.DaemonService"
            android:enabled="true"
            android:exported="true">
            <intent-filter>
                <action android:name="cn.jpush.android.intent.DaemonService" />
        </receiver>
        <!-- since 3.5.6 新增华硕通道  -->
        <receiver android:name="cn.jpush.android.asus.AsusPushMessageReceiver"></receiver>
                <category android:name="${applicationId}" />
            </intent-filter>
        </service>
    </application>
</manifest>

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

@@ -643,10 +643,10 @@ public class AdinShowActivity extends Activity implements View.OnClickListener {
        long appTime1 = System.currentTimeMillis() / 1000;
        long updatetime = appTime1 - MainMapActivity.cha - 3;
        String token = DES3.encode(String.valueOf(updatetime));
        final String replace = URLEncoder.encode(token);
        final String replace = URLEncoder.encode(token, "UTF-8");
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpmember/login?phone="
                + user_name + "&password=" + URLEncoder.encode(password) + "&token=" + replace
                + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.push_id;
                + user_name + "&password=" + URLEncoder.encode(password, "UTF-8") + "&token=" + replace
                + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.getInstance().getPushID();
        StringCallback stringCallback = new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {

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

@@ -580,10 +580,10 @@ public class H5Activity extends Activity implements View.OnClickListener, Platfo
        long appTime1 = System.currentTimeMillis() / 1000;
        long updatetime = appTime1 - MainMapActivity.cha - 3;
        String token = DES3.encode(String.valueOf(updatetime));
        final String replace = URLEncoder.encode(token);
        final String replace = URLEncoder.encode(token, "UTF-8");
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpmember/login?phone="
                + user_name + "&password=" + URLEncoder.encode(password) + "&token=" + replace
                + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.push_id;
                + user_name + "&password=" + URLEncoder.encode(password, "UTF-8") + "&token=" + replace
                + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.getInstance().getPushID();
        StringCallback stringCallback = new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {

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

@@ -413,12 +413,11 @@ public class LoginActivity extends Activity implements View.OnClickListener {
            long appTime1 = System.currentTimeMillis() / 1000;
            long updatetime = appTime1 - MainMapActivity.cha - 3;
            String token = String.valueOf(updatetime);
            final String replace = URLEncoder.encode(DES3.encode(token));
            final String replace = URLEncoder.encode(DES3.encode(token), "UTF-8");
            String url = MainApplication.url + "/zhannew/basic/web/index.php/tpmember/login?phone="
                    + phone.getText().toString() + "&password=" + URLEncoder.encode(password.getText().toString())
                    + "&token=" + replace
                    + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.push_id;
            LogUtils.e(MainApplication.push_id);
                    + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.getInstance().getPushID();
            OkHttpUtils.get().url(url).build().execute(new StringCallback() {
                @Override
                public void onError(Call call, Exception e) {

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

@@ -748,195 +748,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        registerReceiver(networkChangeReceiver, intentFilter);
        EventBusUtil.register(this);
        if (!MainApplication.h5_url.equals("") && MainApplication.type.equals("PushWeb")) {
            Intent intent = new Intent(getApplicationContext(), MyWebViewActivity.class);
            intent.putExtra("url", MainApplication.h5_url);
            startActivity(intent);
            MainApplication.h5_url = "";
            MainApplication.type = "";
        }
        if (!MainApplication.h5_url.equals("") && MainApplication.type.equals("PushComment")) {
            startActivity(new Intent(getApplication(), MyMessageActivity.class));
            MainApplication.h5_url = "";
            MainApplication.type = "";
            MainApplication.mainSkip = "1";
            finish();
        }
        if (MainApplication.type.equals("PushBalance")) {
            if (MainApplication.isLogin()) {
                startActivity(new Intent(getApplication(), MyBalanceActivity.class));
                MainApplication.h5_url = "";
                MainApplication.type = "";
                MainApplication.mainSkip = "1";
                finish();
            }
        }
        if (MainApplication.type.equals("PushRanking")) {
            if (MainApplication.isLogin()) {
                startActivity(new Intent(getApplication(), RankingListActivity.class));
                MainApplication.h5_url = "";
                MainApplication.type = "";
                MainApplication.mainSkip = "1";
                finish();
            }
        }
        if (MainApplication.type.equals("PushRecharge")) {
            if (MainApplication.isLogin()) {
                startActivity(new Intent(getApplication(), AccountRechargeActivity.class));
                MainApplication.h5_url = "";
                MainApplication.type = "";
                MainApplication.mainSkip = "1";
                finish();
            }
        }
        if (MainApplication.type.equals("PushInvite")) {
            if (MainApplication.isLogin()) {
                Intent intent4 = new Intent(getApplication(), MyWebViewActivity.class);
                intent4.putExtra("url", "https://evcharge.cc/cdz/yqm.html?code=" + UserCenterActivity.getShareNo(Integer.parseInt(MainApplication.userId)) + "&phone=" + MainApplication.userPhone);
//                intent4.putExtra("tag", "2");
                startActivity(intent4);
                MainApplication.h5_url = "";
                MainApplication.type = "";
                MainApplication.mainSkip = "1";
                finish();
            }
        }
        if (MainApplication.type.equals("first") || MainApplication.type.equals("second") || MainApplication.type.equals("three")) {
            if (MainApplication.isLogin()) {
                long appTime4 = System.currentTimeMillis() / 1000;
                long updatetime4 = appTime4 - MainMapActivity.cha - 1;
                String token4 = String.valueOf(updatetime4);
                Intent intent4 = new Intent(getApplication(), MyWebViewActivity.class);
                String web1 = null;
                try {
                    web1 = MainApplication.url + "/zhannew/basic/web/index.php/discount/redlist?userid=" + MainApplication.userId + "&token=" + URLEncoder.encode(DES3.encode(token4));
                } catch (Exception e) {
                    e.printStackTrace();
                }
                intent4.putExtra("url", web1);
//                intent4.putExtra("tag", "4");
                startActivity(intent4);
                MainApplication.h5_url = "";
                MainApplication.type = "";
                MainApplication.mainSkip = "1";
                finish();
            }
        }
        if (MainApplication.type.equals("PushCommodity")) {
            long appTime11 = System.currentTimeMillis() / 1000;
//            Log.e("sfv_url===", getIntent().getStringExtra("shareUrl"));
//            Log.i("appTime(long)---", appTime11 + "");
            long updatetime1 = appTime11 - MainMapActivity.cha - 5;
//            Log.i("updatetime(long)---", updatetime1 + "");
//            Log.i("cha---", MainMapActivity.cha + "");
            String token1 = String.valueOf(updatetime1);
            String encode_token = null;
            try {
                encode_token = DES3.encode(token1);
            } catch (Exception e) {
                e.printStackTrace();
            }
            String replace = URLEncoder.encode(encode_token);
//                    startActivity(new Intent(getApplication(), ShopActivity.class));
            Intent intent11 = new Intent();
            intent11.setClass(getApplicationContext(), CreditActivity.class);
            intent11.putExtra("navColor", "#fcfcfc");    //配置导航条的背景颜色，请用#ffffff长格式。
            intent11.putExtra("titleColor", "#222222");    //配置导航条标题的颜色，请用#ffffff长格式。
            MainApplication.goods_type = "details";
//            MainApplication.current_url = getIntent().getStringExtra("shareUrl");
//                MainApplication.current_url = "http://www.duiba.com.cn/mobile/appItemDetail?appItemId=453087";
            if (!MainApplication.isLogin()) {
                intent11.putExtra("url", "http://cdz.evcharge.cc/zhannew/basic/web/index.php/duiba/active?token=" + replace + "&url=" + MainApplication.h5_url);    //配置自动登陆地址，每次需服务端动态生成。
            } else {
                intent11.putExtra("url", "http://cdz.evcharge.cc/zhannew/basic/web/index.php/duiba/active?user_id=" + MainApplication.userId + "&token=" + replace + "&url=" + MainApplication.h5_url);    //配置自动登陆地址，每次需服务端动态生成。
            }
            startActivity(intent11);
            MainApplication.ad_link = "";
            overridePendingTransition(0, 0);
            CreditActivity.creditsListener = new CreditActivity.CreditsListener() {
                /**
                 * 当点击分享按钮被点击
                 * @param shareUrl 分享的地址
                 * @param shareThumbnail 分享的缩略图
                 * @param shareTitle 分享的标题
                 * @param shareSubtitle 分享的副标题
                 */
                public void onShareClick(WebView webView, String shareUrl, String shareThumbnail, String shareTitle, String shareSubtitle) {
                    //当分享按钮被点击时，会调用此处代码。在这里处理分享的业务逻辑。
//                            new AlertDialog.Builder(webView.getContext())
//                                    .setTitle("分享信息")
//                                    .setItems(new String[] {"标题："+shareTitle,"副标题："+shareSubtitle,"缩略图地址："+shareThumbnail,"链接："+shareUrl}, null)
//                                    .setNegativeButton("确定", null)
//                                    .show();
                    ChargingShareBean chargingShareBean = new ChargingShareBean();
                    chargingShareBean.setIcon(shareThumbnail);
                    chargingShareBean.setTitle(shareTitle);
                    chargingShareBean.setUrl(shareUrl);
                    chargingShareBean.setText("");
                    showSimpleBottomSheetGrid(chargingShareBean);
                }
                /**
                 * 当点击“请先登录”按钮唤起登录时，会调用此处代码。
                 * 用户登录后，需要将CreditsActivity.IS_WAKEUP_LOGIN变量设置为true。
                 * @param webView 用于登录成功后返回到当前的webview刷新登录状态。
                 * @param currentUrl 当前页面的url
                 */
                public void onLoginClick(WebView webView, final String currentUrl) {
                    //当未登录的用户点击去登录时，会调用此处代码。
                    //用户登录后，需要将CreditsActivity.IS_WAKEUP_LOGIN变量设置为true。
                    //为了用户登录后能回到未登录前的页面（currentUrl）。
                    //当用户登录成功后，需要重新请求一次服务端，带上currentUrl。
                    //用该方法中的webview变量加载请求链接。
                    //服务端收到请求后在生成免登录url时，将currentUrl放入redirect参数，通知客户端302跳转到新生成的免登录URL。
                    new android.app.AlertDialog.Builder(webView.getContext())
                            .setTitle("跳转登录")
                            .setMessage("跳转到登录页面？")
                            .setPositiveButton("是", new DialogInterface.OnClickListener() {
                                @Override
                                public void onClick(DialogInterface dialog, int which) {
//                                        MainApplication.current_url = currentUrl;
                                    MainApplication.h5_url = currentUrl;
                                    context.startActivity(new Intent(getApplicationContext(), LoginActivity.class));
                                }
                            })
                            .setNegativeButton("否", null)
                            .show();
                }
                /**
                 * 当点击“复制”按钮时，触发该方法，回调获取到券码code
                 * @param webView webview对象。
                 * @param code 复制的券码
                 */
                public void onCopyCode(WebView webView, String code) {
                    //当未登录的用户点击去登录时，会调用此处代码。
                    new android.app.AlertDialog.Builder(webView.getContext())
                            .setTitle("复制券码")
                            .setMessage("已复制，券码为：" + code)
                            .setPositiveButton("是", null)
                            .setNegativeButton("否", null)
                            .show();
                }
                /**
                 * 积分商城返回首页刷新积分时，触发该方法。
                 */
                public void onLocalRefresh(WebView mWebView, String credits) {
                    //String credits为积分商城返回的最新积分，不保证准确。
                    //触发更新本地积分，这里建议用ajax向自己服务器请求积分值，比较准确。
//                    Toast.makeText(getApplicationContext(), "触发本地刷新积分：" + credits, Toast.LENGTH_SHORT).show();
                }
            };
        }
        if (MainApplication.ad_link.equals("1")) {
            againPoint = "1";
@@ -1287,52 +1098,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
            }
        });
        // add by hyg 点击跳转到聊聊 隐藏该功能
//        windowChat.setOnClickListener(new View.OnClickListener() {
//            @Override
//            public void onClick(View view) {
//                if (socket != null) {
//                    try {
//                        socket.close();
//                    } catch (IOException e) {
//                        e.printStackTrace();
//                    }
//                }
//                MobclickAgent.onEvent(getApplicationContext(), "1121");
//                Intent i = new Intent(getApplication(), ChatActivity.class);//聊聊页面
//                i.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
//                startActivity(i);
//                overridePendingTransition(0, 0);
//                if (count == 1) {
//
//                    count = 2;
//                }
//                MobclickAgent.onEvent(getApplicationContext(), "0999");
//                windowLayout.setVisibility(View.GONE);
//
//
//                rl_control.setVisibility(View.VISIBLE);
//                if (nMarker != null) {
//                    nMarker.hideInfoWindow();
//                    MarkerOptions markerOptionss = new MarkerOptions();
//                    if (current_chargePoint.getOwn_pay().equals("1")) {
//                        nMarker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newmarker1));
//                    } else {
//                        if (current_chargePoint.getSuit_car().equals("特斯拉")) {
//                            nMarker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newmarker3));
//                        } else {
//                            if (WelcomeActivity.canCost.contains(current_chargePoint.getSupplier())) {
//                                nMarker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newmarker2));
//                            } else {
//                                nMarker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newmarker3));
//                            }
//                        }
//                    }
//                }
//
//            }
//        });
        tv_sortDistance = (TextView) findViewById(R.id.tv_sortDistance);
        tv_sortDistance.setOnClickListener(this);
@@ -1773,7 +1538,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                    String url = "{\"fun\":\"dingwei\",\"poi_jing\":" + "\"" + String.format("%.6f", bd_lon) +
                            "\"" + ",\"poi_wei\":" + "\"" + String.format("%.6f", bd_lat) + "\"" + ",\"imei\":"
                            + "\"" + "android_" + Util.getUdid() + "\"" + ",\"timer\":" + "\"" + Token
                            + "\"" + ",\"registration_id\":" + "\"" + MainApplication.push_id + "\""
                            + "\"" + ",\"registration_id\":" + "\"" + MainApplication.getInstance().getPushID() + "\""
                            + ",\"userid\":" + "\"" + uid + "\"" + "}";
                    eteLocation(url);
                }

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

@@ -727,10 +727,10 @@ public class MyWebViewActivity extends Activity implements PlatformActionListene
        long appTime1 = System.currentTimeMillis() / 1000;
        long updatetime = appTime1 - MainMapActivity.cha - 3;
        String token = DES3.encode(String.valueOf(updatetime));
        final String replace = URLEncoder.encode(token);
        final String replace = URLEncoder.encode(token, "UTF-8");
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpmember/login?phone="
                + user_name + "&password=" + URLEncoder.encode(password) + "&token=" + replace
                + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.push_id;
                + user_name + "&password=" + URLEncoder.encode(password, "UTF-8") + "&token=" + replace
                + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.getInstance().getPushID();
        StringCallback stringCallback = new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
@@ -741,7 +741,6 @@ public class MyWebViewActivity extends Activity implements PlatformActionListene
                        webView.evaluateJavascript("window.myglobal.reuserlogin('" + "no" + "')", new ValueCallback<String>() {
                            @Override
                            public void onReceiveValue(String arg0) {
                            }
                        });
                    }

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

@@ -21,9 +21,12 @@ import android.widget.TextView;
import android.widget.Toast;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.BarColorUtil;
import cn.jpush.android.api.JPushInterface;
public class PrivacyAgreementActivity extends Activity {
    private TextView agree_enter_text_view;

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

@@ -444,21 +444,6 @@ public class RegisterActivity extends Activity implements OnClickListener {
        }).start();
    }
//	private void getTpye() {
//		if (!NetUtil.CheckNetwork(this)) {
//			Toast.makeText(this, "请检查网络", Toast.LENGTH_SHORT).show();
//			return;
//		}
//
//		new Thread(new Runnable() {
//			@Override
//			public void run() {
//				String url="http://www.d1ev.com/public/getSaleCar";
//				getType(url);
//			}
//		}).start();
//	}
    private void resetsubmit() {
        if (!NetUtil.CheckNetwork(this)) {
            Toast.makeText(this, "请检查网络", Toast.LENGTH_SHORT).show();
@@ -467,7 +452,7 @@ public class RegisterActivity extends Activity implements OnClickListener {
        if (hasCameraPermission()) {
            String imei = Util.getUdid();
            final String url = MainApplication.url + "/zhannew/basic/web/index.php/tpmember/add?phone=" + etPhone.getText().toString().trim() + "&sms=" + etCode.getText().toString().trim() + "&password=" + password.getText().toString().trim() + "&yqm=" + et_input_shareno.getText().toString() + "&imei=" + "android_" + imei + "&registration_id=" + MainApplication.push_id;
            final String url = MainApplication.url + "/zhannew/basic/web/index.php/tpmember/add?phone=" + etPhone.getText().toString().trim() + "&sms=" + etCode.getText().toString().trim() + "&password=" + password.getText().toString().trim() + "&yqm=" + et_input_shareno.getText().toString() + "&imei=" + "android_" + imei + "&registration_id=" + MainApplication.getInstance().getPushID();
            new Thread(new Runnable() {
                @Override
                public void run() {
@@ -607,10 +592,10 @@ public class RegisterActivity extends Activity implements OnClickListener {
            long appTime1 = System.currentTimeMillis() / 1000;
            long updatetime = appTime1 - MainMapActivity.cha - 3;
            String token = String.valueOf(updatetime);
            final String replace = URLEncoder.encode(DES3.encode(token));
            final String replace = URLEncoder.encode(DES3.encode(token), "UTF-8");
            String url = MainApplication.url + "/zhannew/basic/web/index.php/tpmember/login?phone="
                    + etPhone.getText().toString() + "&password=" + URLEncoder.encode(password.getText().toString()) + "&token=" + replace
                    + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.push_id;
                    + etPhone.getText().toString() + "&password=" + URLEncoder.encode(password.getText().toString(), "UTF-8") + "&token=" + replace
                    + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.getInstance().getPushID();
            OkHttpUtils.get().url(url).build().execute(new StringCallback() {
                @Override
                public void onError(Call call, Exception e) {

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

@@ -88,6 +88,7 @@ import java.net.URL;
import java.net.URLEncoder;
import java.util.List;
import cn.jpush.android.api.JPushInterface;
import okhttp3.Call;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.AppSettingsDialog;

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

@@ -448,10 +448,10 @@ public class UserCenterMoreActivity extends Activity implements View.OnClickList
        Log.i("cha---", MainMapActivity.cha + "");
        String token = String.valueOf(updatetime);
        String encode_token = DES3.encode(token);
        String replace = URLEncoder.encode(encode_token);
        String replace = URLEncoder.encode(encode_token, "UTF-8");
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpmember/logout?phone="
                + MainApplication.userPhone + "&password=" + URLEncoder.encode(MainApplication.userPassword) + "&token=" + replace
                + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.push_id;
                + MainApplication.userPhone + "&password=" + URLEncoder.encode(MainApplication.userPassword, "UTF-8") + "&token=" + replace
                + "&imei=" + "android_" + MainApplication.imei + "&registration_id=" + MainApplication.getInstance().getPushID();
        Log.i("token解密：", DES3.decode(encode_token));
        OkHttpUtils.get()
                .url(url)

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

@@ -9,8 +9,10 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.StrictMode;
import androidx.multidex.MultiDexApplication;
import android.text.TextUtils;
import android.util.Log;
import com.amap.api.maps.model.LatLng;
@@ -21,6 +23,7 @@ import com.electric.chargingpile.data.AdDetail;
import com.electric.chargingpile.data.Zhan;
import com.electric.chargingpile.gen.DaoMaster;
import com.electric.chargingpile.gen.DaoSession;
import com.electric.chargingpile.manager.PreferenceManager;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.SharedPreferencesHelper;
import com.mob.MobSDK;
@@ -79,7 +82,7 @@ public class MainApplication extends MultiDexApplication {
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
//    public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
    //    public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
@@ -94,7 +97,7 @@ public class MainApplication extends MultiDexApplication {
    public static String suitcar = "";
    public static Boolean gestureguide;
    public static String h5_url = "";
    public static String push_id = "";
    private String pushID = "";
    public static String imei = "";
    public static String current_url = "";
    public static String goods_type = "";
@@ -156,22 +159,6 @@ public class MainApplication extends MultiDexApplication {
        JPushInterface.setDebugMode(true);
        JPushInterface.init(this);
        String rid = JPushInterface.getRegistrationID(getApplicationContext());
        push_id = rid;
        Intent intent = new Intent();
        if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(intent.getAction())) {
            Bundle bundle = intent.getExtras();
            String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);
            try {
                JSONObject jsonObject = new JSONObject(extras);
                String url = jsonObject.getString("extra");
                Log.e("extra==", url);
            } catch (JSONException e) {
                e.printStackTrace();
            }
        }
        CrashReport.initCrashReport(getApplicationContext(), "900010422", BuildConfig.DEBUG);
        initImageLoader(getApplicationContext());
@@ -181,7 +168,6 @@ public class MainApplication extends MultiDexApplication {
        } catch (IOException e) {
            e.printStackTrace();
        }
//		SDKInitializer.initialize(getApplicationContext());
        mScreenWidth = getResources().getDisplayMetrics().widthPixels;
        mScreenHeight = getResources().getDisplayMetrics().heightPixels;
@@ -201,7 +187,6 @@ public class MainApplication extends MultiDexApplication {
        msgOne = ProfileManager.getInstance().getMsgOne(getApplicationContext());
        msgTime = ProfileManager.getInstance().getSystemMsgTime(getApplicationContext());
        firstOpenTime = ProfileManager.getInstance().getFirstOpenTime(getApplicationContext());
//		msgTwo = ProfileManager.getInstance().getMsgTwo(getApplicationContext());
        loginRemind();
        setFestival();
@@ -234,23 +219,11 @@ public class MainApplication extends MultiDexApplication {
                .imageScaleType(ImageScaleType.IN_SAMPLE_INT).resetViewBeforeLoading(false).bitmapConfig(Bitmap.Config.RGB_565).build();
    }
//	public void showTextToast(String msg) {
//		if (toast == null) {
//			toast = Toast.makeText(getApplicationContext(), msg, Toast.LENGTH_SHORT);
//		} else {
//			toast.setText(msg);
//		}
//		toast.show();
//	}
    public static boolean isLogin() {
        if ("".equals(userPhone)) {
            return false;
        }
        return true;
    }
    private void loginRemind() {
@@ -296,6 +269,18 @@ public class MainApplication extends MultiDexApplication {
        return db;
    }
    public String getPushID() {
        if (TextUtils.isEmpty(pushID)) {
            return ProfileManager.getInstance().getPushID(getApplicationContext());
        } else {
            return pushID;
        }
    }
    public void setPushID(String pushID) {
        this.pushID = pushID;
        ProfileManager.getInstance().setPushID(getApplicationContext(), pushID);
    }
}

app/src/main/java/com/electric/chargingpile/jpush/PushMessageReceiver.java

@@ -0,0 +1,206 @@
package com.electric.chargingpile.jpush;
import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.webkit.WebView;
import com.alibaba.fastjson.JSON;
import com.electric.chargingpile.activity.AccountRechargeActivity;
import com.electric.chargingpile.activity.CarOwnerCertificateListActivity;
import com.electric.chargingpile.activity.CreditActivity;
import com.electric.chargingpile.activity.LoginActivity;
import com.electric.chargingpile.activity.MainMapActivity;
import com.electric.chargingpile.activity.MyBalanceActivity;
import com.electric.chargingpile.activity.MyMessageActivity;
import com.electric.chargingpile.activity.MyWebViewActivity;
import com.electric.chargingpile.activity.RankingListActivity;
import com.electric.chargingpile.activity.UserCenterActivity;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.ChargingShareBean;
import com.electric.chargingpile.util.DES3;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.umeng.analytics.MobclickAgent;
import org.json.JSONException;
import org.json.JSONObject;
import java.net.URLEncoder;
import cn.jpush.android.api.CmdMessage;
import cn.jpush.android.api.CustomMessage;
import cn.jpush.android.api.JPushInterface;
import cn.jpush.android.api.JPushMessage;
import cn.jpush.android.api.NotificationMessage;
import cn.jpush.android.service.JPushMessageReceiver;
public class PushMessageReceiver extends JPushMessageReceiver {
    private static final String TAG = "PushMessageReceiver";
    @Override
    public void onMessage(Context context, CustomMessage customMessage) {
        Log.e(TAG, "[onMessage] " + customMessage);
        processCustomMessage(context, customMessage);
    }
    @Override
    public void onNotifyMessageOpened(Context context, NotificationMessage message) {
        Log.e(TAG, "[onNotifyMessageOpened] " + message);
        try {
            String extras = message.notificationExtras;
            JSONObject jsonObject = new JSONObject(extras);
            String type = jsonObject.getString("type");
            String url = jsonObject.getString("customUrl");
            if (!TextUtils.isEmpty(type)) {
                handleNotifyMessage(context, type, url);
            }
        } catch (Throwable throwable) {
            throwable.printStackTrace();
        }
    }
    @Override
    public void onMultiActionClicked(Context context, Intent intent) {
        Log.e(TAG, "[onMultiActionClicked] 用户点击了通知栏按钮");
        String nActionExtra = intent.getExtras().getString(JPushInterface.EXTRA_NOTIFICATION_ACTION_EXTRA);
        //开发者根据不同 Action 携带的 extra 字段来分配不同的动作。
        if (nActionExtra == null) {
            Log.d(TAG, "ACTION_NOTIFICATION_CLICK_ACTION nActionExtra is null");
            return;
        }
        if (nActionExtra.equals("my_extra1")) {
            Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮一");
        } else if (nActionExtra.equals("my_extra2")) {
            Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮二");
        } else if (nActionExtra.equals("my_extra3")) {
            Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮三");
        } else {
            Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮未定义");
        }
    }
    @Override
    public void onNotifyMessageArrived(Context context, NotificationMessage message) {
        Log.e(TAG, "[onNotifyMessageArrived] " + message);
    }
    @Override
    public void onNotifyMessageDismiss(Context context, NotificationMessage message) {
        Log.e(TAG, "[onNotifyMessageDismiss] " + message);
    }
    @Override
    public void onRegister(Context context, String registrationId) {
        Log.e(TAG, "[onRegister] " + registrationId);
        MainApplication.getInstance().setPushID(registrationId);
    }
    @Override
    public void onConnected(Context context, boolean isConnected) {
        Log.e(TAG, "[onConnected] " + isConnected);
    }
    @Override
    public void onCommandResult(Context context, CmdMessage cmdMessage) {
        Log.e(TAG, "[onCommandResult] " + cmdMessage);
    }
    @Override
    public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
        super.onTagOperatorResult(context, jPushMessage);
    }
    @Override
    public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage) {
        super.onCheckTagOperatorResult(context, jPushMessage);
    }
    @Override
    public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
        super.onAliasOperatorResult(context, jPushMessage);
    }
    @Override
    public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
        super.onMobileNumberOperatorResult(context, jPushMessage);
    }
    //send msg to MainActivity
    private void processCustomMessage(Context context, CustomMessage customMessage) {
    }
    @Override
    public void onNotificationSettingsCheck(Context context, boolean isOn, int source) {
        super.onNotificationSettingsCheck(context, isOn, source);
        Log.e(TAG, "[onNotificationSettingsCheck] isOn:" + isOn + ",source:" + source);
    }
    private void handleNotifyMessage(Context context, String type, String url) {
        Intent intent = null;
        if ("PushRedBag".equals(type) && MainApplication.isLogin()) {
            long tokenTime = System.currentTimeMillis() / 1000 - MainMapActivity.cha - 1;
            try {
                String token = DES3.encode(String.valueOf(tokenTime));
                token = URLEncoder.encode(token, "UTF-8");
                intent = new Intent(context, MyWebViewActivity.class);
                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                String webURL = MainApplication.url + "/zhannew/basic/web/index.php/discount/redlist?userid=" + MainApplication.userId + "&token=" + token;
                intent.putExtra("url", webURL);
                context.startActivity(intent);
                MobclickAgent.onEvent(context, "0808");
            } catch (Exception e) {
                e.printStackTrace();
            }
        } else if ("PushWeb".equals(type) && !TextUtils.isEmpty(url)) {
            intent = new Intent(context, MyWebViewActivity.class);
            intent.putExtra("url", url);
            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
            context.startActivity(intent);
        } else if ("PushComment".equals(type)) {
            intent = new Intent(context, MyMessageActivity.class);
            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
            context.startActivity(intent);
        } else if ("PushBalance".equals(type) && MainApplication.isLogin()) {
            intent = new Intent(context, MyBalanceActivity.class);
            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
            context.startActivity(intent);
        } else if ("PushRanking".equals(type) && MainApplication.isLogin()) {
            intent = new Intent(context, RankingListActivity.class);
            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
            context.startActivity(intent);
        } else if ("PushRecharge".equals(type) && MainApplication.isLogin()) {
            intent = new Intent(context, AccountRechargeActivity.class);
            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
            context.startActivity(intent);
        } else if ("PushInvite".equals(type) && MainApplication.isLogin()) {
            intent = new Intent(context, MyWebViewActivity.class);
            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
            intent.putExtra("url", "https://evcharge.cc/cdz/yqm.html?code=" + UserCenterActivity.getShareNo(Integer.parseInt(MainApplication.userId)) + "&phone=" + MainApplication.userPhone);
            context.startActivity(intent);
        } else if (("first".equals(type) || "second".equals(type) || "three".equals(type)) && MainApplication.isLogin()) {
            long tokenTime = System.currentTimeMillis() / 1000 - MainMapActivity.cha - 1;
            try {
                String token = DES3.encode(String.valueOf(tokenTime));
                token = URLEncoder.encode(token, "UTF-8");
                intent = new Intent(context, MyWebViewActivity.class);
                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                String webURL = MainApplication.url + "/zhannew/basic/web/index.php/discount/redlist?userid=" + MainApplication.userId + "&token=" + token;
                intent.putExtra("url", webURL);
                context.startActivity(intent);
            } catch (Exception e) {
                e.printStackTrace();
            }
        } else {
            intent = new Intent(context, MainMapActivity.class);
            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
            context.startActivity(intent);
        }
    }
}

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

@@ -69,6 +69,7 @@ public class ProfileManager {
    private static final String KEY_CLICKED_USER_PUBLISH_ROLE = "key_clicked_user_publish_role";
    private static final String KEY_MAKE_SURE_NETWORK_FOR_VIDEO = "key_make_sure_network_for_video";
    private static final String KEY_DEVICE_ID = "key_device_id";
    private static final String KEY_PUSH_ID = "key_push_id";
    private static ProfileManager instance;
    private String deviceId;
@@ -643,4 +644,12 @@ public class ProfileManager {
    public void setMsgChargingStatusNo(Context context, int id) {
        PreferenceManager.getInstance(context).putInt(KEY_MESSAGE_STATUS_CHARGING_NO, id);
    }
    public void setPushID(Context context, String pushID) {
        PreferenceManager.getInstance(context).putString(KEY_PUSH_ID, pushID);
    }
    public String getPushID(Context context) {
        return PreferenceManager.getInstance(context).getString(KEY_PUSH_ID, "");
    }
}

app/src/main/java/com/electric/chargingpile/view/MyReceiver.java

@@ -1,181 +0,0 @@
package com.electric.chargingpile.view;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import com.electric.chargingpile.activity.MainActicity;
import com.electric.chargingpile.activity.MainMapActivity;
import com.electric.chargingpile.activity.MyWebViewActivity;
import com.electric.chargingpile.activity.WelcomeActivity;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.util.DES3;
import com.electric.chargingpile.util.ExampleUtil;
import com.umeng.analytics.MobclickAgent;
import org.json.JSONException;
import org.json.JSONObject;
import java.net.URLEncoder;
import java.util.Iterator;
import cn.jpush.android.api.JPushInterface;
/**
 * 自定义接收器
 * <p>
 * 如果不定义这个 Receiver，则：
 * 1) 默认用户会打开主界面
 * 2) 接收不到自定义消息
 */
public class MyReceiver extends BroadcastReceiver {
    private static final String TAG = "JPush";
    @Override
    public void onReceive(Context context, Intent intent) {
        Bundle bundle = intent.getExtras();
        Log.d(TAG, "[MyReceiver] onReceive - " + intent.getAction() + ", extras: " + printBundle(bundle));
        if (JPushInterface.ACTION_REGISTRATION_ID.equals(intent.getAction())) {
            String regId = bundle.getString(JPushInterface.EXTRA_REGISTRATION_ID);
            Log.d(TAG, "[MyReceiver] 接收Registration Id : " + regId);
            //send the Registration Id to your server...
        } else if (JPushInterface.ACTION_MESSAGE_RECEIVED.equals(intent.getAction())) {
            Log.d(TAG, "[MyReceiver] 接收到推送下来的自定义消息: " + bundle.getString(JPushInterface.EXTRA_MESSAGE));
            processCustomMessage(context, bundle);
        } else if (JPushInterface.ACTION_NOTIFICATION_RECEIVED.equals(intent.getAction())) {
            Log.d(TAG, "[MyReceiver] 接收到推送下来的通知");
            int notifactionId = bundle.getInt(JPushInterface.EXTRA_NOTIFICATION_ID);
            JPushInterface.reportNotificationOpened(context, bundle.getString(JPushInterface.EXTRA_MSG_ID));
            Log.d(TAG, "[MyReceiver] 接收到推送下来的通知的ID: " + notifactionId);
            String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);//获取附加字段,是一个json数组
            Log.e("extra:", extras);
        } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(intent.getAction())) {
            Log.d(TAG, "[MyReceiver] 用户点击打开了通知");
//			openNotification(context,bundle);
            String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);//获取附加字段,是一个json数组
            Log.e("extra:", extras);
            JSONObject json = null;
            try {
                json = new JSONObject(extras);
            } catch (JSONException e) {
                e.printStackTrace();
            }
            //进行json.getString("Article")操作时,要保证这里的Article与服务器上的Article一模一样,不然回报空指针异常
            String articleUrl = "";//获取附加字段Article,对应的值为articleUrl
            String type = "";
            try {
                articleUrl = json.getString("customUrl");
                type = json.getString("type");
//				if (type.equals("PushWeb")){
                MainApplication.h5_url = articleUrl;
                MainApplication.type = type;
//				}else if (type.equals("PushComment")){
//					MainApplication.h5_url = "111";
//					MainApplication.type = type;
//				}
            } catch (JSONException e) {
                e.printStackTrace();
            }
//			Log.e("articleUrl:", articleUrl);
            //打开自定义的Activity
            if ("PushRedBag".equals(type)) {
                long appTime4 = System.currentTimeMillis() / 1000;
                long updatetime4 = appTime4 - MainMapActivity.cha - 1;
                String token4 = String.valueOf(updatetime4);
                Intent intent4 = new Intent(context, MyWebViewActivity.class);
                String web1 = null;
                try {
                    web1 = MainApplication.url + "/zhannew/basic/web/index.php/discount/redlist?userid=" + MainApplication.userId + "&token=" + URLEncoder.encode(DES3.encode(token4));
                } catch (Exception e) {
                    e.printStackTrace();
                }
                intent4.putExtra("url", web1);
                context.startActivity(intent4);
                MobclickAgent.onEvent(context, "0808");
            } else {
                Intent i = new Intent(context, WelcomeActivity.class);
                i.putExtras(bundle);
                i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                context.startActivity(i);
            }
        } else if (JPushInterface.ACTION_RICHPUSH_CALLBACK.equals(intent.getAction())) {
            Log.d(TAG, "[MyReceiver] 用户收到到RICH PUSH CALLBACK: " + bundle.getString(JPushInterface.EXTRA_EXTRA));
            //在这里根据 JPushInterface.EXTRA_EXTRA 的内容处理代码，比如打开新的Activity， 打开一个网页等..
        } else if (JPushInterface.ACTION_CONNECTION_CHANGE.equals(intent.getAction())) {
            boolean connected = intent.getBooleanExtra(JPushInterface.EXTRA_CONNECTION_CHANGE, false);
            Log.w(TAG, "[MyReceiver]" + intent.getAction() + " connected state change to " + connected);
        } else {
            Log.d(TAG, "[MyReceiver] Unhandled intent - " + intent.getAction());
        }
    }
    // 打印所有的 intent extra 数据
    private static String printBundle(Bundle bundle) {
        StringBuilder sb = new StringBuilder();
        if (bundle != null) {
            for (String key : bundle.keySet()) {
                if (key.equals(JPushInterface.EXTRA_NOTIFICATION_ID)) {
                    sb.append("\nkey:" + key + ", value:" + bundle.getInt(key));
                } else if (key.equals(JPushInterface.EXTRA_CONNECTION_CHANGE)) {
                    sb.append("\nkey:" + key + ", value:" + bundle.getBoolean(key));
                } else if (key.equals(JPushInterface.EXTRA_EXTRA)) {
                    if (bundle.getString(JPushInterface.EXTRA_EXTRA).isEmpty()) {
                        Log.i(TAG, "This message has no Extra data");
                        continue;
                    }
                    try {
                        JSONObject json = new JSONObject(bundle.getString(JPushInterface.EXTRA_EXTRA));
                        Iterator<String> it = json.keys();
                        while (it.hasNext()) {
                            String myKey = it.next().toString();
                            sb.append("\nkey:" + key + ", value: [" +
                                    myKey + " - " + json.optString(myKey) + "]");
                        }
                    } catch (JSONException e) {
                        Log.e(TAG, "Get message extra JSON error!");
                    }
                } else {
                    sb.append("\nkey:" + key + ", value:" + bundle.getString(key));
                }
            }
        }
        return sb.toString();
    }
    //send msg to MainActivity
    private void processCustomMessage(Context context, Bundle bundle) {
        if (MainActicity.isForeground) {
            String message = bundle.getString(JPushInterface.EXTRA_MESSAGE);
            String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);
            Intent msgIntent = new Intent(MainActicity.MESSAGE_RECEIVED_ACTION);
            msgIntent.putExtra(MainActicity.KEY_MESSAGE, message);
            if (!ExampleUtil.isEmpty(extras)) {
                try {
                    JSONObject extraJson = new JSONObject(extras);
                    if (null != extraJson && extraJson.length() > 0) {
                        msgIntent.putExtra(MainActicity.KEY_EXTRAS, extras);
                    }
                } catch (JSONException e) {
                }
            }
            context.sendBroadcast(msgIntent);
        }
    }
}

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

@@ -354,7 +354,7 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="10dp"
                android:layout_marginBottom="30dp"
                android:text="认证说明\n\n1.车型信息和行驶证主页为必填项;\n2.最多可认证三款车型;\n3.默认首款认证车型为主车型;\n4.上传行驶证详细页面，并保证所有信息清晰;\n5.认证成功的首个车型可获得50元充电红包。"
                android:text="认证说明\n\n1.车型信息和行驶证主页为必填项;\n2.最多可认证三款车型;\n3.默认首款认证车型为主车型;\n4.上传行驶证详细页面，并保证所有信息清晰;\n5.认证成功的首个车型可获得50元充电优惠券。"
                android:textColor="#0D1120"
                android:textSize="14sp"
                app:layout_constraintBottom_toBottomOf="parent"