注册隐私政策添加

app/src/main/AndroidManifest.xml

@@ -445,10 +445,6 @@
            android:label="@string/title_activity_my_message"
            android:screenOrientation="portrait" />
        <activity
            android:name=".activity.XieYiActivity"
            android:label="@string/title_activity_xie_yi"
            android:screenOrientation="portrait" />
        <activity
            android:name=".activity.BuildInfoActivity"
            android:screenOrientation="portrait" />
        <activity

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

@@ -63,7 +63,7 @@ public class RegisterActivity extends Activity implements OnClickListener {
    private static final String TAG = "RegisterActivity";
    private ImageView ivBack, ivRight;
    private EditText etCode, etPhone;
    private TextView tvGetCode, tvSure, tv_xieyi;
    private TextView tvGetCode, tvSure, tv_xieyi, tv_yinsi;
    LinearLayout ll_tongyi;
    ImageView iv_tongyi;
    private int time = 90;
@@ -107,6 +107,9 @@ public class RegisterActivity extends Activity implements OnClickListener {
        tv_xieyi = (TextView) findViewById(R.id.tv_xieyi);
        tv_xieyi.setOnClickListener(this);
        tv_yinsi = (TextView) findViewById(R.id.tv_yinsi);
        tv_yinsi.setOnClickListener(this);
        animation = AnimationUtils.loadAnimation(RegisterActivity.this, R.anim.nn);
        point = (ImageView) findViewById(R.id.tv_one);
@@ -380,11 +383,15 @@ public class RegisterActivity extends Activity implements OnClickListener {
                break;
            case R.id.tv_xieyi:
                Intent intent = new Intent(this, XieYiActivity.class);
                startActivity(intent);
//                this.startActivity(intent); //启动浏览器
                Intent xieyiintent = new Intent(getApplication(), MyWebViewActivity.class);
                xieyiintent.putExtra("url", "http://evcharge.cc/activity/user-proto.html");
                startActivity(xieyiintent);
                break;
            case R.id.tv_yinsi:
                Intent yinsintent = new Intent(getApplication(), MyWebViewActivity.class);
                yinsintent.putExtra("url", "http://evcharge.cc/pc/privacy.html");
                startActivity(yinsintent);
                break;
            case R.id.ll_tongyi:
                if (flag) {
                    iv_tongyi.setImageResource(R.drawable.icon_login_select);

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

@@ -1,174 +0,0 @@
package com.electric.chargingpile.activity;
import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.webkit.WebBackForwardList;
import android.webkit.WebChromeClient;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ImageView;
import android.widget.TextView;
import com.electric.chargingpile.R;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.DES3;
import com.umeng.analytics.MobclickAgent;
import java.net.URLEncoder;
public class XieYiActivity extends Activity implements View.OnClickListener {
    private WebView webView;
    private ImageView iv_back, iv_close;
    private TextView txtTitle;
    int screenHeight;
    int screenWidth;
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_xie_yi);
        BarColorUtil.initStatusBarColor(XieYiActivity.this);
        try {
            initView();
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    private void initView() throws Exception {
        txtTitle = (TextView) findViewById(R.id.textview);
        webView = (WebView) findViewById(R.id.webView);
        iv_back = (ImageView) findViewById(R.id.iv_back);
        iv_back.setOnClickListener(this);
        iv_close = (ImageView) findViewById(R.id.iv_close);
        iv_close.setOnClickListener(this);
        WebChromeClient wvcc = new WebChromeClient() {
            @Override
            public void onReceivedTitle(WebView view, String title) {
                super.onReceivedTitle(view, title);
                Log.d("ANDROID_LAB", "TITLE=" + title);
                txtTitle.setText(title);
            }
        };
        // 设置setWebChromeClient对象
        webView.setWebChromeClient(wvcc);
//         创建WebViewClient对象
//        WebViewClient wvc = new WebViewClient() {
//            @Override
//            public boolean shouldOverrideUrlLoading(WebView view, String url) {
//                // 使用自己的WebView组件来响应Url加载事件，而不是使用默认浏览器器加载页面
//                webView.loadUrl(url);
//                // 消耗掉这个事件。Android中返回True的即到此为止吧,事件就会不会冒泡传递了，我们称之为消耗掉
//                return true;
//            }
//        };
//        webView.setWebViewClient(wvc);
        long appTime1 = System.currentTimeMillis() / 1000;
        Log.i("appTime(long)---", appTime1 + "");
        long updatetime = appTime1 - MainMapActivity.cha - 5;
        Log.i("updatetime(long)---", updatetime + "");
        Log.i("cha---", MainMapActivity.cha + "");
        String token = String.valueOf(updatetime);
        String encode_token = DES3.encode(token);
        String replace = URLEncoder.encode(encode_token);
        String urlweb = "http://evcharge.cc/activity/user-proto.html";
        Log.e("url", urlweb);
        webView.loadUrl(urlweb);
//        webView.loadUrl("http://www.d1ev.com/app/chondian/and38.html");
//        webView.loadUrl("www.baidu.com");
//        WebSettings settings = webView.getSettings();
//        Display display = this.getWindowManager().getDefaultDisplay();
//        if (display.getHeight() < display.getWidth()) {
//            screenHeight = display.getWidth();
//            screenWidth = display.getHeight();
//        } else {
//            screenWidth = display.getWidth();
//            screenHeight = display.getHeight();
//        }
//
//        webView.setMinimumHeight(screenHeight);
//        webView.setMinimumWidth(screenWidth);
        webView.getSettings().setSupportZoom(true);
        webView.getSettings().setBuiltInZoomControls(true);
        webView.getSettings().setJavaScriptEnabled(true);
        webView.setWebViewClient(new WebViewClient() {
            public boolean shouldOverrideUrlLoading(WebView view, String url) {
                //  重写此方法表明点击网页里面的链接还是在当前的webview里跳转，不跳到浏览器那边
//                view.loadUrl(url);
                if (url.startsWith("tel:")) {
                    Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
                    startActivity(intent);
                    return true;
                }
                return false;
            }
        });
    }
    @Override
    public void onClick(View v) {
        switch (v.getId()) {
            case R.id.iv_back:
                WebBackForwardList mWebBackForwardList = webView.copyBackForwardList();
                Log.e("tag", "mWebBackForwardList.getSize() " + mWebBackForwardList.getSize());
                if (webView.canGoBack()) {
                    webView.goBack();
                } else {
                    finish();
                }
                break;
            case R.id.iv_close:
                finish();
                break;
        }
    }
    @Override
    public boolean onKeyDown(int keyCode, KeyEvent event) {
        WebBackForwardList mWebBackForwardList = webView.copyBackForwardList();
        Log.e("tag", "mWebBackForwardList.getSize() " + mWebBackForwardList.getSize());
//        WebView browser=(WebView)findViewById(R.id.webView);
        // Check if the key event was the Back button and if there's history
        if ((keyCode == KeyEvent.KEYCODE_BACK) && webView.canGoBack()) {
            webView.goBack();
            return true;
        }
        //  return true;
        // If it wasn't the Back key or there's no web page history, bubble up to the default
        // system behavior (probably exit the activity)
        return super.onKeyDown(keyCode, event);
    }
    @Override
    protected void onResume() {
        super.onResume();
        MobclickAgent.onResume(this);
    }
    @Override
    protected void onPause() {
        super.onPause();
        MobclickAgent.onPause(this);
    }
}

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

@@ -220,16 +220,17 @@
            <com.zhy.autolayout.AutoLinearLayout
                android:layout_width="match_parent"
                android:layout_height="130px"
                android:layout_height="wrap_content"
                android:background="@color/white"
                android:orientation="horizontal">
                android:orientation="vertical">
                <com.zhy.autolayout.AutoLinearLayout
                    android:id="@+id/ll_tongyi"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="horizontal"
                    android:layout_gravity="center">
                    android:layout_marginTop="20dp"
                    android:layout_gravity="left">
                    <ImageView
                        android:id="@+id/iv_tongyi"
@@ -251,17 +252,28 @@
                        android:layout_gravity="center" />
                </com.zhy.autolayout.AutoLinearLayout>
                <TextView
                    android:id="@+id/tv_xieyi"
                    android:layout_width="wrap_content"
                    android:layout_marginTop="5dp"
                    android:layout_marginLeft="64px"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:text="《充电桩APP用户使用协议》"
                    android:textColor="#3190e8"
                    android:textSize="13sp"
                    android:layout_gravity="center"
                    android:layout_marginBottom="1dp"/>
                <TextView
                    android:id="@+id/tv_yinsi"
                    android:layout_marginTop="5dp"
                    android:layout_marginLeft="64px"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:text="《充电桩隐私政策》"
                    android:textColor="#3190e8"
                    android:textSize="13sp"
                    android:layout_gravity="center"
                    android:layout_marginBottom="1dp"/>
            </com.zhy.autolayout.AutoLinearLayout>
            <RelativeLayout

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

@@ -1,79 +0,0 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    tools:context="com.electric.chargingpile.activity.ShopActivity">
    <RelativeLayout
        android:layout_width="fill_parent"
        android:layout_height="46dp"
        android:background="#f9f9f9">
        <TextView
            android:id="@+id/textview"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_centerInParent="true"
            android:text="用户使用协议"
            android:singleLine="true"
            android:maxEms="8"
            android:ellipsize="end"
            android:textColor="#222222"
            android:textSize="20sp" />
        <TextView
            android:id="@+id/tv_next"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_alignParentEnd="true"
            android:layout_alignParentRight="true"
            android:layout_alignParentTop="true"
            android:contentDescription="@null"
            android:gravity="center"
            android:paddingRight="12dp"
            android:text="添加记录"
            android:textColor="@color/white"
            android:textSize="16sp"
            android:visibility="gone" />
        <ImageView
            android:id="@+id/iv_back"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_alignParentLeft="true"
            android:layout_centerVertical="true"
            android:contentDescription="@null"
            android:paddingBottom="4dp"
            android:paddingLeft="16dp"
            android:paddingRight="16dp"
            android:paddingTop="4dp"
            android:src="@drawable/icon_lvback1119" />
        <ImageView
            android:id="@+id/iv_close"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_toRightOf="@+id/iv_back"
            android:contentDescription="@null"
            android:paddingBottom="4dp"
            android:paddingLeft="8dp"
            android:paddingRight="16dp"
            android:paddingTop="4dp"
            android:visibility="gone"
            android:src="@drawable/icon_close1210" />
    </RelativeLayout>
    <View
        android:layout_width="match_parent"
        android:layout_height="0.5dp"
        android:background="@color/ui_line"/>
    <WebView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:id="@+id/webView" />
</LinearLayout>

app/src/main/res/values/strings.xml

@@ -152,7 +152,6 @@
    <string name="title_activity_zhan_details">ZhanDetails</string>
    <string name="title_activity_details">DetailsActivity</string>
    <string name="title_activity_my_message">MyMessageActivity</string>
    <string name="title_activity_xie_yi">XieYiActivity</string>
    <string name="pay_result_tip">这个界面用于显示第三方app通过微信支付的结果</string>
    <string name="pay_result_callback_msg" formatted="false">微信支付结果：%s</string>