Przeglądaj źródła

加入车主群开发完成

huyuguo 3 lat temu
rodzic
commit
11142fa722

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

@ -146,7 +146,6 @@ public class AdinShowActivity extends Activity implements View.OnClickListener {
146 146
//        Log.e("url", urlweb);
147 147
        webView.loadUrl(shareUrl);
148 148
//        webView.loadUrl("http://www.d1ev.com/app/chondian/and38.html");
149
//        webView.loadUrl("www.baidu.com");
150 149
//        WebSettings settings = webView.getSettings();
151 150
//        Display display = this.getWindowManager().getDefaultDisplay();
152 151
//        if (display.getHeight() < display.getWidth()) {

+ 15 - 6
app/src/main/java/com/electric/chargingpile/activity/CarOwnerCertificateListActivity.java

@ -1,18 +1,17 @@
1 1
package com.electric.chargingpile.activity;
2 2
3
import androidx.appcompat.app.AppCompatActivity;
4
import androidx.recyclerview.widget.LinearLayoutManager;
5
import androidx.recyclerview.widget.RecyclerView;
6
7 3
import android.content.Intent;
8 4
import android.graphics.Color;
9 5
import android.os.Bundle;
10
import android.util.Log;
11 6
import android.view.View;
12
import android.widget.ImageView;
7
import android.widget.LinearLayout;
13 8
import android.widget.TextView;
14 9
import android.widget.Toast;
15 10
11
import androidx.appcompat.app.AppCompatActivity;
12
import androidx.recyclerview.widget.LinearLayoutManager;
13
import androidx.recyclerview.widget.RecyclerView;
14
16 15
import com.electric.chargingpile.R;
17 16
import com.electric.chargingpile.adapter.CarOwnerCertificateListAdapter;
18 17
import com.electric.chargingpile.application.MainApplication;
@ -105,6 +104,16 @@ public class CarOwnerCertificateListActivity extends AppCompatActivity {
105 104
                }
106 105
            }
107 106
        });
107
108
        LinearLayout join_car_friends_group = findViewById(R.id.join_car_friends_group);
109
        join_car_friends_group.setOnClickListener(new View.OnClickListener() {
110
            @Override
111
            public void onClick(View v) {
112
                Intent i = new Intent(getApplication(), MyWebViewActivity.class);
113
                i.putExtra("url", "https://www.baidu.com");
114
                startActivity(i);
115
            }
116
        });
108 117
    }
109 118
110 119
    @Override

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

@ -96,7 +96,6 @@ public class EDaiJiaActivity extends Activity implements View.OnClickListener {
96 96
        Log.e("url", urlweb);
97 97
        webView.loadUrl(urlweb);
98 98
//        webView.loadUrl("http://www.d1ev.com/app/chondian/and38.html");
99
//        webView.loadUrl("www.baidu.com");
100 99
//        WebSettings settings = webView.getSettings();
101 100
//        Display display = this.getWindowManager().getDefaultDisplay();
102 101
//        if (display.getHeight() < display.getWidth()) {

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

@ -86,7 +86,6 @@ public class ShopActivity extends CreditActivity implements View.OnClickListener
86 86
        Log.e("url", urlweb);
87 87
        webView.loadUrl(urlweb);
88 88
//        webView.loadUrl("http://www.d1ev.com/app/chondian/and38.html");
89
//        webView.loadUrl("www.baidu.com");
90 89
//        WebSettings settings = webView.getSettings();
91 90
//        Display display = this.getWindowManager().getDefaultDisplay();
92 91
//        if (display.getHeight() < display.getWidth()) {

+ 6 - 3
app/src/main/java/com/electric/chargingpile/activity/UserCenterActivity.java

@ -882,10 +882,13 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
882 882
                MobclickAgent.onEvent(getApplicationContext(), "0816");
883 883
                break;
884 884
885
            case R.id.chat_share_bar: // 聊聊入口
885
            case R.id.chat_share_bar: // 聊聊入口 -> 更新为加入车友群入口(h5)
886 886
                MobclickAgent.onEvent(getApplicationContext(), "1123");
887
                Intent i = new Intent(getApplicationContext(), ChatActivity.class);//聊聊页面
888
                i.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
887
//                Intent i = new Intent(getApplicationContext(), ChatActivity.class);//聊聊页面
888
//                i.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
889
//                startActivity(i);
890
                Intent i = new Intent(getApplication(), MyWebViewActivity.class);
891
                i.putExtra("url", "https://www.baidu.com");
889 892
                startActivity(i);
890 893
                break;
891 894

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

@ -89,7 +89,6 @@ public class WebQianDaoActivity extends Activity implements View.OnClickListener
89 89
        Log.e("url", urlweb);
90 90
        webView.loadUrl(urlweb);
91 91
//        webView.loadUrl("http://www.d1ev.com/app/chondian/and38.html");
92
//        webView.loadUrl("www.baidu.com");
93 92
//        WebSettings settings = webView.getSettings();
94 93
//        Display display = this.getWindowManager().getDefaultDisplay();
95 94
//        if (display.getHeight() < display.getWidth()) {

BIN
app/src/main/res/drawable-hdpi/car_friends_group_icon.png


BIN
app/src/main/res/drawable-mdpi/car_friends_group_icon.png


BIN
app/src/main/res/drawable-xhdpi/car_friends_group_icon.png


BIN
app/src/main/res/drawable-xxhdpi/car_friends_group_icon.png


BIN
app/src/main/res/drawable-xxxhdpi/car_friends_group_icon.png


+ 11 - 0
app/src/main/res/drawable/bg_join_car_friends_group.xml

@ -0,0 +1,11 @@
1
<?xml version="1.0" encoding="UTF-8"?>
2
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:shape="rectangle">
4
    <stroke
5
        android:width="0.5dp"
6
        android:color="#FFA090" /><!--边框颜色-->
7
    <solid android:color="@color/white" /><!--填充色-->
8
    <corners android:radius="15dp" />
9
10
11
</shape>

+ 39 - 1
app/src/main/res/layout/activity_car_owner_certificate_list.xml

@ -53,12 +53,50 @@
53 53
54 54
    </androidx.constraintlayout.widget.ConstraintLayout>
55 55
56
    <LinearLayout
57
        android:id="@+id/top_view"
58
        android:layout_width="match_parent"
59
        android:layout_height="50dp"
60
        android:background="@color/white"
61
        android:orientation="horizontal"
62
        app:layout_constraintLeft_toLeftOf="parent"
63
        app:layout_constraintRight_toRightOf="parent"
64
        app:layout_constraintTop_toBottomOf="@+id/nav_bar">
65
66
        <LinearLayout
67
            android:id="@+id/join_car_friends_group"
68
            android:layout_width="match_parent"
69
            android:layout_height="match_parent"
70
            android:layout_marginLeft="12dp"
71
            android:layout_marginTop="10dp"
72
            android:layout_marginRight="12dp"
73
            android:layout_marginBottom="10dp"
74
            android:background="@drawable/bg_join_car_friends_group"
75
            android:gravity="center_vertical"
76
            android:orientation="horizontal">
77
78
            <ImageView
79
                android:layout_width="wrap_content"
80
                android:layout_height="wrap_content"
81
                android:layout_marginLeft="10dp"
82
                android:src="@drawable/car_friends_group_icon" />
83
84
            <TextView
85
                android:layout_width="wrap_content"
86
                android:layout_height="wrap_content"
87
                android:layout_marginLeft="4dp"
88
                android:text="加入车友群,与你的爱车车主一起畅聊喔~"
89
                android:textColor="#FF4D4D"
90
                android:textSize="13sp" />
91
        </LinearLayout>
92
    </LinearLayout>
93
56 94
    <androidx.recyclerview.widget.RecyclerView
57 95
        android:id="@+id/recycler_view"
58 96
        android:layout_width="match_parent"
59 97
        android:layout_height="0dp"
60 98
        app:layout_constraintBottom_toBottomOf="parent"
61
        app:layout_constraintTop_toBottomOf="@+id/nav_bar" />
99
        app:layout_constraintTop_toBottomOf="@+id/top_view" />
62 100
63 101
    <TextView
64 102
        android:id="@+id/no_data"

+ 0 - 14
app/src/main/res/layout/fragmen_details_new.xml

@ -296,20 +296,6 @@
296 296
                android:layout_width="match_parent"
297 297
                android:layout_height="10dp"
298 298
                android:background="@color/ui_f4" />
299
300
            <!--<ImageView
301
                android:id="@+id/chat_share_bar"
302
                android:layout_width="match_parent"
303
                android:layout_height="wrap_content"
304
                android:src="@drawable/chat_share_bar" />
305
306
307
            <View
308
                android:layout_width="match_parent"
309
                android:layout_height="10dp"
310
                android:background="@color/ui_f4" />
311
                -->
312
313 299
            <RelativeLayout
314 300
                android:layout_width="match_parent"
315 301
                android:layout_height="77dp"