s="del-code nl-118 ol-118"> 118 
            }
119 
        });
120
121
122 
    }
123
124 
    @Override
125 
    public void onClick(View v) {
126 
        switch (v.getId()) {
127 
            case R.id.iv_back:
128 
                WebBackForwardList mWebBackForwardList = webView.copyBackForwardList();
129
130 
                Log.e("tag", "mWebBackForwardList.getSize() " + mWebBackForwardList.getSize());
131 
                if (webView.canGoBack()) {
132 
                    webView.goBack();
133 
                } else {
134 
                    finish();
135 
                }
136
137
138 
                break;
139 
            case R.id.iv_close:
140 
                finish();
141 
                break;
142 
        }
143 
    }
144
145 
    @Override
146 
    public boolean onKeyDown(int keyCode, KeyEvent event) {
147 
        WebBackForwardList mWebBackForwardList = webView.copyBackForwardList();
148
149 
        Log.e("tag", "mWebBackForwardList.getSize() " + mWebBackForwardList.getSize());
150 
//        WebView browser=(WebView)findViewById(R.id.webView);
151 
        // Check if the key event was the Back button and if there's history
152 
        if ((keyCode == KeyEvent.KEYCODE_BACK) && webView.canGoBack()) {
153
154 
            webView.goBack();
155 
            return true;
156 
        }
157 
        //  return true;
158 
        // If it wasn't the Back key or there's no web page history, bubble up to the default
159 
        // system behavior (probably exit the activity)
160 
        return super.onKeyDown(keyCode, event);
161 
    }
162
163 
    @Override
164 
    protected void onResume() {
165 
        super.onResume();
166 
        MobclickAgent.onResume(this);
167 
    }
168
169 
    @Override
170 
    protected void onPause() {
171 
        super.onPause();
172 
        MobclickAgent.onPause(this);
173 
    }
174 
}

+ 19 - 7
app/src/main/res/layout/activity_register.xml
查看文件 

@ -220,16 +220,17 @@
220 220
221 221 
            <com.zhy.autolayout.AutoLinearLayout
222 222 
                android:layout_width="match_parent"
223 
                android:layout_height="130px"
223 
                android:layout_height="wrap_content"
224 224 
                android:background="@color/white"
225 
                android:orientation="horizontal">
225 
                android:orientation="vertical">
226 226
227 227 
                <com.zhy.autolayout.AutoLinearLayout
228 228 
                    android:id="@+id/ll_tongyi"
229 229 
                    android:layout_width="wrap_content"
230 
                    android:layout_height="match_parent"
230 
                    android:layout_height="wrap_content"
231 231 
                    android:orientation="horizontal"
232 
                    android:layout_gravity="center">
232 
                    android:layout_marginTop="20dp"
233 
                    android:layout_gravity="left">
233 234
234 235 
                    <ImageView
235 236 
                        android:id="@+id/iv_tongyi"

@ -251,17 +252,28 @@
251 252 
                        android:layout_gravity="center" />
252 253 
                </com.zhy.autolayout.AutoLinearLayout>
253 254
254
255
256 255 
                <TextView
257 256 
                    android:id="@+id/tv_xieyi"
258 
                    android:layout_width="wrap_content"
257 
                    android:layout_marginTop="5dp"
258 
                    android:layout_marginLeft="64px"
259 
                    android:layout_width="match_parent"
259 260 
                    android:layout_height="wrap_content"
260 261 
                    android:text="《充电桩APP用户使用协议》"
261 262 
                    android:textColor="#3190e8"
262 263 
                    android:textSize="13sp"
263 264 
                    android:layout_gravity="center"
264 265 
                    android:layout_marginBottom="1dp"/>
266 
                <TextView
267 
                    android:id="@+id/tv_yinsi"
268 
                    android:layout_marginTop="5dp"
269 
                    android:layout_marginLeft="64px"
270 
                    android:layout_width="match_parent"
271 
                    android:layout_height="wrap_content"
272 
                    android:text="《充电桩隐私政策》"
273 
                    android:textColor="#3190e8"
274 
                    android:textSize="13sp"
275 
                    android:layout_gravity="center"
276 
                    android:layout_marginBottom="1dp"/>
265 277 
            </com.zhy.autolayout.AutoLinearLayout>
266 278
267 279 
            <RelativeLayout

+ 0 - 79
app/src/main/res/layout/activity_xie_yi.xml
查看文件 

@ -1,79 +0,0 @@
1 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 
    xmlns:tools="http://schemas.android.com/tools"
3 
    android:layout_width="match_parent"
4 
    android:layout_height="match_parent"
5 
    android:orientation="vertical"
6 
    tools:context="com.electric.chargingpile.activity.ShopActivity">
7
8 
    <RelativeLayout
9 
        android:layout_width="fill_parent"
10 
        android:layout_height="46dp"
11 
        android:background="#f9f9f9">
12
13 
        <TextView
14 
            android:id="@+id/textview"
15 
            android:layout_width="wrap_content"
16 
            android:layout_height="wrap_content"
17 
            android:layout_centerInParent="true"
18 
            android:text="用户使用协议"
19 
            android:singleLine="true"
20 
            android:maxEms="8"
21 
            android:ellipsize="end"
22 
            android:textColor="#222222"
23 
            android:textSize="20sp" />
24
25 
        <TextView
26 
            android:id="@+id/tv_next"
27 
            android:layout_width="wrap_content"
28 
            android:layout_height="match_parent"
29 
            android:layout_alignParentEnd="true"
30 
            android:layout_alignParentRight="true"
31 
            android:layout_alignParentTop="true"
32 
            android:contentDescription="@null"
33 
            android:gravity="center"
34 
            android:paddingRight="12dp"
35 
            android:text="添加记录"
36 
            android:textColor="@color/white"
37 
            android:textSize="16sp"
38 
            android:visibility="gone" />
39
40
41 
        <ImageView
42 
            android:id="@+id/iv_back"
43 
            android:layout_width="wrap_content"
44 
            android:layout_height="match_parent"
45 
            android:layout_alignParentLeft="true"
46 
            android:layout_centerVertical="true"
47 
            android:contentDescription="@null"
48 
            android:paddingBottom="4dp"
49 
            android:paddingLeft="16dp"
50 
            android:paddingRight="16dp"
51 
            android:paddingTop="4dp"
52 
            android:src="@drawable/icon_lvback1119" />
53
54 
        <ImageView
55 
            android:id="@+id/iv_close"
56 
            android:layout_width="wrap_content"
57 
            android:layout_height="match_parent"
58 
            android:layout_toRightOf="@+id/iv_back"
59 
            android:contentDescription="@null"
60 
            android:paddingBottom="4dp"
61 
            android:paddingLeft="8dp"
62 
            android:paddingRight="16dp"
63 
            android:paddingTop="4dp"
64 
            android:visibility="gone"
65 
            android:src="@drawable/icon_close1210" />
66 
    </RelativeLayout>
67
68 
    <View
69 
        android:layout_width="match_parent"
70 
        android:layout_height="0.5dp"
71 
        android:background="@color/ui_line"/>
72
73 
    <WebView
74 
        android:layout_width="match_parent"
75 
        android:layout_height="match_parent"
76 
        android:id="@+id/webView" />
77
78 
</LinearLayout>
79

+ 0 - 1
app/src/main/res/values/strings.xml
查看文件 

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

Beobachter - Gogs: Go Git Service
Startseite Erkunden Hilfe
Registrieren Anmelden
wendivang13962
/
denese2000
Beobachten 1
Favorit hinzufügen 0

Beobachter