26 27 
import com.electric.chargingpile.util.JsonUtils;
27 28 
import com.electric.chargingpile.util.LoadingDialog;
@ -72,7 +73,7 @@ public class UserPageActivity extends AppCompatActivity implements View.OnClickL
72 73
73 74 
    private void initView() {
74 75 
        UserPageBeanLab.get(UserPageActivity.this).clear();
75
76 
        BarColorUtil.setStatusBarColor(UserPageActivity.this, getResources().getColor(R.color.color_1bb637), 1);
76 77 
        loadingDialog = new LoadingDialog(UserPageActivity.this);
77 78 
        loadingDialog.setCanceledOnTouchOutside(false);
78 79 
@ -227,12 +228,6 @@ public class UserPageActivity extends AppCompatActivity implements View.OnClickL
227 228 
            @Override
228 229 
            public void onResponse(String s) {
229 230 
                loadingDialog.dismiss();
230 
                if (page == 1) {
231 
                    xRefreshView.stopRefresh();
232 
                } else {
233 
                    xRefreshView.stopLoadMore();
234 
                }
235
236 231 
                String code = JsonUtils.getKeyResult(s, "code");
237 232 
                if ("1000".equals(code)) {
238 233 
                    String data = JsonUtils.getKeyResult(s, "data");
@ -249,6 +244,7 @@ public class UserPageActivity extends AppCompatActivity implements View.OnClickL
249 244 
                            userPageAdapter.setContentData(userHomePageBean.list);
250 245 
                        }
251 246 
                        userPageAdapter.setFooterData(false);
247 
                        xRefreshView.stopRefresh();
252 248 
                    } else {
253 249 
                        if (userHomePageBean.list.size() == 0) {
254 250 
                            xRefreshView.setLoadComplete(true);
@ -257,10 +253,16 @@ public class UserPageActivity extends AppCompatActivity implements View.OnClickL
257 253 
                            userPageAdapter.addContentData(userHomePageBean.list);
258 254 
                            userPageAdapter.setFooterData(false);
259 255 
                        }
256 
                        xRefreshView.stopLoadMore();
260 257 
                    }
261 258 
                } else {
262 259 
                    String desc = JsonUtils.getKeyResult(s, "desc");
263 260 
                    ToastUtil.showToast(UserPageActivity.this, desc, Toast.LENGTH_SHORT);
261 
                    if (page == 1) {
262 
                        xRefreshView.stopRefresh();
263 
                    } else {
264 
                        xRefreshView.stopLoadMore();
265 
                    }
264 266 
                }
265 267
266 268 
            }

+ 11 - 12
app/src/main/java/com/electric/chargingpile/adapter/TopicDetailAdapter.java
查看文件 

@ -2,6 +2,7 @@ package com.electric.chargingpile.adapter;
2 2
3 3 
import android.app.Activity;
4 4 
import android.content.Context;
5 
import android.content.Intent;
5 6 
import android.graphics.Rect;
6 7 
import android.support.constraint.ConstraintLayout;
7 8 
import android.support.v7.widget.RecyclerView;
 
@ -16,6 +17,7 @@ import android.widget.Toast;
16 17
17 18 
import com.aspsine.irecyclerview.IViewHolder;
18 19 
import com.electric.chargingpile.R;
20 
import com.electric.chargingpile.activity.UserPageActivity;
19 21 
import com.electric.chargingpile.application.MainApplication;
20 22 
import com.electric.chargingpile.data.ChatRecommendBean;
21 23 
import com.electric.chargingpile.data.TopicHomePageBean;
 
@ -290,26 +292,22 @@ public class TopicDetailAdapter extends RecyclerView.Adapter<IViewHolder> {
290 292 
        footerViewHolder.footerContainer.setVisibility(showFooter ? View.VISIBLE : View.GONE);
291 293
292 294 
        ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) footerViewHolder.footerView.getLayoutParams();
293 
        if (TopicDetailBeanLab.get(context).beans().size() == 0) {
294 
            footerViewHolder.footTextView.setText("还没有任何内容哦，快来抢沙发~");
295 
            params.height = DensityUtil.dip2px(context, (screenHeight - headerHeight - statusHeight) / 4);
296 
            params.bottomMargin = 0;
295
296 
        if (beanLab.beans().size() == 0) {
297 
            params.height = DensityUtil.dip2px(context, 230);
298 
            footerViewHolder.footTextView.setText("还没有任何内容哦，快来抢沙发～");
297 299 
        } else {
298 300 
            footerViewHolder.footTextView.setText("已经全部加载完毕");
299 301 
            params.height = DensityUtil.dip2px(context, 20);
300 
            params.bottomMargin = DensityUtil.dip2px(context, 10);
301 
        }
302
303 
        if (showFooter == false) {
304 
            params.height = 0;
305 
            params.bottomMargin = DensityUtil.dip2px(context, 10);
306 302 
        }
307
308 303 
        footerViewHolder.footTextView.setLayoutParams(params);
309 304 
    }
310 305
311 306 
    private void showAuthorInfo(int position) {
312 
        // TODO
307 
        ChatRecommendBean bean = beanLab.beans().get(position - 1);
308 
        Intent intent = new Intent(context, UserPageActivity.class);
309 
        intent.putExtra("targetUserId", bean.addUserId + "");
310 
        context.startActivity(intent);
313 311 
    }
314 312
315 313 
@ -327,6 +325,7 @@ public class TopicDetailAdapter extends RecyclerView.Adapter<IViewHolder> {
327 325
328 326 
    public void setHeaderData(TopicHomePageBean.TopicVo bean) {
329 327 
        topicVo = bean;
328 
        notifyItemChanged(0);
330 329 
    }
331 330
332 331 
    public void setFooterData(Boolean showFooter) {

+ 3 - 13
app/src/main/java/com/electric/chargingpile/adapter/UserPageAdapter.java
查看文件 

@ -2,7 +2,6 @@ package com.electric.chargingpile.adapter;
2 2
3 3 
import android.app.Activity;
4 4 
import android.content.Context;
5 
import android.graphics.Color;
6 5 
import android.support.constraint.ConstraintLayout;
7 6 
import android.support.v7.widget.RecyclerView;
8 7 
import android.support.v7.widget.StaggeredGridLayoutManager;
 
@ -94,7 +93,7 @@ public class UserPageAdapter extends RecyclerView.Adapter<IViewHolder> {
94 93
95 94 
    @Override
96 95 
    public int getItemCount() {
97 
        return beanLab.beans().size() + 1 ;
96 
        return beanLab.beans().size() + 1;
98 97 
    }
99 98
100 99 
    private void bindContentViewHolder(IViewHolder viewHolder, final int position) {
 
@ -165,16 +164,7 @@ public class UserPageAdapter extends RecyclerView.Adapter<IViewHolder> {
165 164 
        StaggeredGridLayoutManager.LayoutParams layoutParams = (StaggeredGridLayoutManager.LayoutParams) footerViewHolder.footerContainer.getLayoutParams();
166 165 
        layoutParams.setFullSpan(true);
167 166 
        footerViewHolder.footerContainer.setVisibility(showFooter ? View.VISIBLE : View.GONE);
168
169 
        ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams)footerViewHolder.footerView.getLayoutParams();
170 
        if (showFooter) {
171 
            footerViewHolder.footTextView.setText("已经全部加载完毕");
172 
            params.height = DensityUtil.dip2px(context, 20);
173 
        } else {
174 
            footerViewHolder.footTextView.setText("");
175 
            params.height = 1;
176 
        }
177 
        footerViewHolder.footerView.setLayoutParams(params);
167 
        footerViewHolder.footTextView.setText("已经全部加载完毕");
178 168 
    }
179 169
180 170 
    /**
 
@ -227,6 +217,6 @@ public class UserPageAdapter extends RecyclerView.Adapter<IViewHolder> {
227 217
228 218 
    public void setFooterData(Boolean showFooter) {
229 219 
        this.showFooter = showFooter;
230 
        notifyItemRangeChanged(beanLab.beans().size(), 1);
220 
        notifyItemRangeChanged(getItemCount() - 1, 1);
231 221 
    }
232 222 
}

+ 4 - 4
app/src/main/java/com/electric/chargingpile/application/MainApplication.java
查看文件 

@ -73,10 +73,10 @@ public class MainApplication extends MultiDexApplication {
73 73 
    public static String firstPoint = "";
74 74 
    public static Boolean firstSsyd;
75 75 
    public static String password = "";
76 
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
77 
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78 
//    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
79 
    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
76 
    public static String url = "http://59.110.68.162";// 充电桩测试环境
77 
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78 
    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
79 
//    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
80 80 
    public static String pic_url = "http:/s/cdz.evcharge.cc/zhannew/uploadfile/";
81 81 
    //	public static String url = "https://cdz.d1ev.com";
82 82 
    public static String build_flag = "0";

二进制
app/src/main/res/drawable-hdpi/loading_icon.png
查看文件


二进制
app/src/main/res/drawable-hdpi/topic_offline_icon.png
查看文件


二进制
app/src/main/res/drawable-mdpi/loading_icon.png
查看文件


二进制
app/src/main/res/drawable-mdpi/no_net_icon.png
查看文件


二进制
app/src/main/res/drawable-mdpi/topic_offline_icon.png
查看文件


二进制
app/src/main/res/drawable-xhdpi/loading_icon.png
查看文件


二进制
app/src/main/res/drawable-xhdpi/no_net_icon.png
查看文件


二进制
app/src/main/res/drawable-xhdpi/topic_offline_icon.png
查看文件


二进制
app/src/main/res/drawable-xxhdpi/loading_icon.png
查看文件


二进制
app/src/main/res/drawable-xxhdpi/no_net_icon.png
查看文件


二进制
app/src/main/res/drawable-xxhdpi/topic_offline_icon.png
查看文件


二进制
app/src/main/res/drawable-xxxhdpi/loading_icon.png
查看文件


二进制
app/src/main/res/drawable-xxxhdpi/no_net_icon.png
查看文件


二进制
app/src/main/res/drawable-xxxhdpi/topic_offline_icon.png
查看文件


+ 3 - 2
app/src/main/res/layout/activity_chat_footer.xml
查看文件 

@ -10,6 +10,7 @@
10 10 
        android:id="@+id/footerView"
11 11 
        android:layout_width="match_parent"
12 12 
        android:layout_height="20dp"
13 
        android:layout_marginBottom="10dp"
13 14 
        app:layout_constraintBottom_toBottomOf="parent"
14 15 
        app:layout_constraintEnd_toEndOf="parent"
15 16 
        app:layout_constraintStart_toStartOf="parent"
 
@ -17,8 +18,8 @@
17 18
18 19 
        <TextView
19 20 
            android:id="@+id/footTextView"
20 
            android:layout_width="match_parent"
21 
            android:layout_height="match_parent"
21 
            android:layout_width="wrap_content"
22 
            android:layout_height="wrap_content"
22 23 
            android:gravity="center"
23 24 
            android:paddingLeft="30dp"
24 25 
            android:paddingRight="30dp"

+ 51 - 0
app/src/main/res/layout/activity_no_net_img.xml
查看文件 

@ -0,0 +1,51 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    xmlns:app="http://schemas.android.com/apk/res-auto"
4 
    xmlns:tools="http://schemas.android.com/tools"
5 
    android:id="@+id/noNetView"
6 
    android:layout_width="match_parent"
7 
    android:layout_height="match_parent"
8 
    android:background="#f4f4f4">
9
10 
    <ImageView
11 
        android:id="@+id/noNetIcon"
12 
        android:layout_width="wrap_content"
13 
        android:layout_height="wrap_content"
14 
        android:layout_marginTop="90dp"
15 
        android:src="@drawable/no_net_icon"
16 
        app:layout_constraintEnd_toEndOf="parent"
17 
        app:layout_constraintStart_toStartOf="parent"
18 
        app:layout_constraintTop_toTopOf="parent" />
19
20 
    <TextView
21 
        android:id="@+id/noNetLabel"
22 
        android:layout_width="wrap_content"
23 
        android:layout_height="wrap_content"
24 
        android:layout_marginStart="15dp"
25 
        android:layout_marginTop="10dp"
26 
        android:layout_marginEnd="15dp"
27 
        android:text="小主网络跑掉了，请检查网络～"
28 
        android:textColor="#555555"
29 
        android:textSize="14sp"
30 
        app:layout_constraintEnd_toEndOf="parent"
31 
        app:layout_constraintStart_toStartOf="parent"
32 
        app:layout_constraintTop_toBottomOf="@+id/noNetIcon" />
33
34 
    <TextView
35 
        android:id="@+id/noNetTry"
36 
        android:layout_width="144dp"
37 
        android:layout_height="40dp"
38 
        android:layout_marginStart="15dp"
39 
        android:layout_marginTop="20dp"
40 
        android:layout_marginEnd="15dp"
41 
        android:background="@drawable/bg_route_line_818181"
42 
        android:gravity="center"
43 
        android:text="点击重新尝试"
44 
        android:textColor="#555555"
45
46 
        android:textSize="14sp"
47 
        app:layout_constraintEnd_toEndOf="parent"
48 
        app:layout_constraintStart_toStartOf="parent"
49 
        app:layout_constraintTop_toBottomOf="@+id/noNetLabel" />
50
51 
</android.support.constraint.ConstraintLayout>

+ 19 - 0
app/src/main/res/layout/activity_topic_detail.xml
查看文件 

@ -96,5 +96,24 @@
96 96 
        app:layout_constraintRight_toLeftOf="@+id/chatPublishIcon"
97 97 
        app:layout_constraintTop_toTopOf="@+id/chatPublishIcon" />
98 98
99 
    <include
100 
        layout="@layout/activity_no_net_img"
101 
        android:layout_width="0dp"
102 
        android:layout_height="0dp"
103 
        android:visibility="gone"
104 
        app:layout_constraintBottom_toBottomOf="parent"
105 
        app:layout_constraintLeft_toLeftOf="parent"
106 
        app:layout_constraintRight_toRightOf="parent"
107 
        app:layout_constraintTop_toBottomOf="@+id/navBar" />
108
109 
    <include
110 
        layout="@layout/activity_topic_offline"
111 
        android:layout_width="0dp"
112 
        android:layout_height="0dp"
113 
        android:visibility="gone"
114 
        app:layout_constraintBottom_toBottomOf="parent"
115 
        app:layout_constraintLeft_toLeftOf="parent"
116 
        app:layout_constraintRight_toRightOf="parent"
117 
        app:layout_constraintTop_toBottomOf="@+id/navBar" />
99 118
100 119 
</android.support.constraint.ConstraintLayout>

+ 35 - 0
app/src/main/res/layout/activity_topic_offline.xml
查看文件 

@ -0,0 +1,35 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    xmlns:app="http://schemas.android.com/apk/res-auto"
4 
    xmlns:tools="http://schemas.android.com/tools"
5 
    android:layout_width="match_parent"
6 
    android:layout_height="match_parent"
7 
    android:id="@+id/topicOfflineView"
8 
    android:background="#f4f4f4">
9
10 
    <ImageView
11 
        android:id="@+id/imageView6"
12 
        android:layout_width="wrap_content"
13 
        android:layout_height="wrap_content"
14 
        android:layout_marginStart="15dp"
15 
        android:layout_marginTop="115dp"
16 
        android:layout_marginEnd="15dp"
17 
        app:layout_constraintEnd_toEndOf="parent"
18 
        app:layout_constraintStart_toStartOf="parent"
19 
        app:layout_constraintTop_toTopOf="parent"
20 
        app:srcCompat="@drawable/topic_offline_icon" />
21
22 
    <TextView
23 
        android:id="@+id/textView26"
24 
        android:layout_width="wrap_content"
25 
        android:layout_height="wrap_content"
26 
        android:layout_marginStart="15dp"
27 
        android:layout_marginTop="10dp"
28 
        android:layout_marginEnd="15dp"
29 
        android:text="该话题已经下线，别处转转，有更多惊喜"
30 
        android:textColor="#555555"
31 
        android:textSize="14sp"
32 
        app:layout_constraintEnd_toEndOf="parent"
33 
        app:layout_constraintStart_toStartOf="parent"
34 
        app:layout_constraintTop_toBottomOf="@+id/imageView6" />
35 
</android.support.constraint.ConstraintLayout>

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

@ -169,6 +169,7 @@
169 169 
    <color name="color_ff6600">#ff6600</color>
170 170 
    <color name="color_888888">#888888</color>
171 171 
    <color name="color_fb9349">#fb9349</color>
172 
    <color name="color_1bb637">#1bb637</color>
172 173
173 174 
    <color name="sv_black">#FF000000</color>
174 175 
    <color name="sv_white">#FFFFFF</color>

3.5.16 版本 · 74f12ef278 - Gogs: Go Git Service
Página Inicial Explorar Ajuda
Registrar Entrar
dudu
/
cdzApp
Observar 2
Favorito 1
Fork 0
Código Problemas 0 Pull Requests 0 Commits 479 Versões 18 Wiki
Ver Código Fonte

3.5.16 版本

hy 4 anos atrás
pai
c359ad7604
commit
74f12ef278
11 arquivos alterados com 56 adições e 31 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 2 2
      app/src/main/AndroidManifest.xml
  2. 0 1
      app/src/main/java/com/electric/chargingpile/activity/ConfirmOrderActivity.java
  3. 25 17
      app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java
  4. 10 2
      app/src/main/java/com/electric/chargingpile/activity/PrivacyAgreementActivity.java
  5. 13 3
      app/src/main/java/com/electric/chargingpile/activity/UserCenterActivity.java
  6. 1 1
      app/src/main/java/com/electric/chargingpile/application/MainApplication.java
  7. 1 1
      app/src/main/java/com/electric/chargingpile/data/CarOwnerCertificateBean.java
  8. 1 1
      app/src/main/java/com/electric/chargingpile/util/Util.java
  9. 1 1
      app/src/main/res/layout/activity_car_owner_certificate.xml
  10. 1 1
      app/src/main/res/layout/activity_skip_user_info.xml
  11. 1 1
      app/src/main/res/layout/activity_user_info.xml

+ 2 - 2
app/src/main/AndroidManifest.xml
Ver Arquivo 

@ -2,8 +2,8 @@
2 2 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 3 
    xmlns:tools="http://schemas.android.com/tools"
4 4 
    package="com.electric.chargingpile"
5 
    android:versionCode="100"
6 
    android:versionName="3.5.14">
5 
    android:versionCode="102"
6 
    android:versionName="3.5.16">
7 7
8 8 
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
9 9 
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->

+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/ConfirmOrderActivity.java
Ver Arquivo 

@ -213,7 +213,6 @@ public class ConfirmOrderActivity extends AppCompatActivity implements View.OnCl
213 213 
            case R.id.tv_gocomment:
214 214 
                if (TextUtils.isEmpty(mRedEnvelopeId)){
215 215 
                    pollingChargingStats();
216
217 216 
                }else{
218 217 
                    requestComment();
219 218 
                }

+ 25 - 17
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java
Ver Arquivo 

@ -2816,12 +2816,13 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
2816 2816
2817 2817 
    @Override
2818 2818 
    public void onPermissionsDenied(int requestCode, List<String> perms) {
2819 
        if (SystemTypeUtil.isEmui()) {
2820 
            return;
2821 
        }
2822 
        if (requestCode == RC_CAMERA_PERM) {
2823 
            new AlertDialogCommon(MainMapActivity.this).builder()
2824 
                    .setMsg("扫码充电需要开启位置权限，是否前往开启?")
2819 
//        if (SystemTypeUtil.isEmui()) {
2820 
//            return;
2821 
//        }
2822 
        if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) {
2823 
            if (requestCode == RC_CAMERA_PERM) {
2824 
                new AlertDialogCommon(MainMapActivity.this).builder()
2825 
                    .setMsg("扫码充电需要相机权限，请在点击去开启，选择权限->相机开启相机权限。")
2825 2826 
                    .setPositiveButton("去开启", new View.OnClickListener() {
2826 2827 
                        @Override
2827 2828 
                        public void onClick(View v) {
 
@ -2831,21 +2832,23 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
2831 2832 
                @Override
2832 2833 
                public void onClick(View v) {
2833 2834 
                }
2834 
            }).show();
2835 
        } else if (requestCode == RC_Location_PERM) {
2836 
            new AlertDialogCommon(MainMapActivity.this).builder()
2837 
                    .setMsg("为了定位您的位置，推荐充电桩，充电桩位置路线导航需要开启位置权限，是否前往开启?")
2838 
                    .setPositiveButton("去开启", new View.OnClickListener() {
2835 
                }).show();
2836 
            } else if (requestCode == RC_Location_PERM) {
2837 
                    new AlertDialogCommon(MainMapActivity.this).builder()
2838 
                            .setMsg("为了定位您的位置，推荐充电桩，充电桩位置路线导航需要开启位置权限，是否前往开启?")
2839 
                            .setPositiveButton("去开启", new View.OnClickListener() {
2840 
                                @Override
2841 
                                public void onClick(View v) {
2842 
                                    SystemTypeUtil.goToPermissionManager(MainMapActivity.this);
2843 
                                }
2844 
                            }).setNegativeButton("取消", new View.OnClickListener() {
2839 2845 
                        @Override
2840 2846 
                        public void onClick(View v) {
2841 
                            SystemTypeUtil.goToPermissionManager(MainMapActivity.this);
2842 2847 
                        }
2843 
                    }).setNegativeButton("取消", new View.OnClickListener() {
2844 
                @Override
2845 
                public void onClick(View v) {
2846 
                }
2847 
            }).show();
2848 
                    }).show();
2849 
            }
2848 2850 
        }
2851
2849 2852 
    }
2850 2853
2851 2854 
    @Override
 
@ -2887,7 +2890,10 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
2887 2890
2888 2891 
    @AfterPermissionGranted(RC_CAMERA_PERM)
2889 2892 
    public void requestCameraPermission() {
2893 
        Log.e(TAG, "requestCameraPermission: 调用了1" );
2890 2894 
        if (hasCameraPermission()) {
2895 
            Log.e(TAG, "requestCameraPermission: 调用了2" );
2896
2891 2897 
            Intent intent = new Intent(getApplicationContext(), com.google.zxing.client.android.CaptureActivity.class);
2892 2898 
            intent.putExtra("url", MainApplication.url);
2893 2899 
            intent.putExtra("user_id", MainApplication.userId);
 
@ -2902,6 +2908,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
2902 2908 
                count = 2;
2903 2909 
            }
2904 2910 
        } else {
2911 
            Log.e(TAG, "requestCameraPermission: 调用了3" );
2912
2905 2913 
            EasyPermissions.requestPermissions(
2906 2914 
                    this,
2907 2915 
                    "扫码充电需要开启相机权限，是否前往开启?",

+ 10 - 2
app/src/main/java/com/electric/chargingpile/activity/PrivacyAgreementActivity.java
Ver Arquivo 

@ -19,10 +19,13 @@ import android.widget.TextView;
19 19
20 20 
import com.electric.chargingpile.BuildConfig;
21 21 
import com.electric.chargingpile.R;
22 
import com.electric.chargingpile.application.MainApplication;
22 23 
import com.electric.chargingpile.manager.ProfileManager;
23 24 
import com.electric.chargingpile.util.BarColorUtil;
24 25 
import com.electric.chargingpile.view.AlertDialogCommon;
25 26 
import com.google.gson.internal.GsonBuildConfig;
27 
import com.mob.MobSDK;
28 
import com.mob.OperationCallback;
26 29
27 30 
public class PrivacyAgreementActivity extends Activity {
28 31 
@ -34,6 +37,7 @@ public class PrivacyAgreementActivity extends Activity {
34 37 
        setContentView(R.layout.activity_privacy_agreement);
35 38 
        BarColorUtil.initStatusBarColor(PrivacyAgreementActivity.this);
36 39 
        if (ProfileManager.getInstance().getPrivacyAgreement(this)) {
40 
            initMobSDK();
37 41 
            Log.e("TAG_HYC", "onCreate:  getPrivacyAgreement" );
38 42 
            startActivity(new Intent(PrivacyAgreementActivity.this, WelcomeActivity.class));
39 43 
            finish();
 
@ -42,7 +46,6 @@ public class PrivacyAgreementActivity extends Activity {
42 46 
            startActivity(new Intent(PrivacyAgreementActivity.this, PermissionAgreementActivity.class));
43 47 
            finish();
44 48 
        } */else {
45 
            Log.e("TAG_HYC", "onCreate:  initView" );
46 49 
            initView();
47 50 
        }
48 51 
    }
 
@ -73,7 +76,7 @@ public class PrivacyAgreementActivity extends Activity {
73 76 
            @Override
74 77 
            public void updateDrawState(TextPaint ds) {
75 78 
                ds.setColor(Color.parseColor("#39C663"));
76 
                ds.setUnderlineText(false);
79 
                ds.setUnderlineText(true);
77 80 
                ds.setFakeBoldText(true);
78 81 
                ds.setTextSize(40);
79 82 
            }
 
@ -102,6 +105,7 @@ public class PrivacyAgreementActivity extends Activity {
102 105 
        agreement_btn.setOnClickListener(new View.OnClickListener() {
103 106 
            @Override
104 107 
            public void onClick(View v) {
108 
                initMobSDK();
105 109 
                startActivity(new Intent(PrivacyAgreementActivity.this, WelcomeActivity.class));
106 110 
                finish();
107 111 
            }
 
@ -129,4 +133,8 @@ public class PrivacyAgreementActivity extends Activity {
129 133 
            }
130 134 
        });
131 135 
    }
136
137 
    private void initMobSDK() {
138 
        MobSDK.init(MainApplication.context);
139 
    }
132 140 
}

+ 13 - 3
app/src/main/java/com/electric/chargingpile/activity/UserCenterActivity.java
Ver Arquivo 

@ -1176,9 +1176,19 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
1176 1176 
                        if (list.size() == 0) {
1177 1177 
                            startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
1178 1178 
                        } else {
1179 
                            Intent intent = new Intent(getApplication(), CarOwnerCertificateListActivity.class);
1180 
                            intent.putExtra("data", data);
1181 
                            startActivity(intent);
1179 
                            boolean isType=false ;
1180 
                            for (int i = 0; i < list.size(); i++) {
1181 
                                if (list.get(i).getStatus()!= 2){ //不等于2 则表示为认证车型
1182 
                                    isType=true;
1183 
                                }
1184 
                            }
1185 
                            if (isType){
1186 
                                Intent intent = new Intent(getApplication(), CarOwnerCertificateListActivity.class);
1187 
                                intent.putExtra("data", data);
1188 
                                startActivity(intent);
1189 
                            }else{
1190 
                                startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
1191 
                            }
1182 1192 
                        }
1183 1193 
                    } else if ("init".equals(from)) {
1184 1194 
                        boolean certificated = false;

+ 1 - 1
app/src/main/java/com/electric/chargingpile/application/MainApplication.java
Ver Arquivo 

@ -162,7 +162,7 @@ public class MainApplication extends MultiDexApplication {
162 162 
            builder.detectFileUriExposure();
163 163 
        }
164 164
165 
        MobSDK.init(this);
165 
//        MobSDK.init(this);
166 166
167 167 
        instances = this;
168 168 
        setDatabase();

+ 1 - 1
app/src/main/java/com/electric/chargingpile/data/CarOwnerCertificateBean.java
Ver Arquivo 

@ -11,7 +11,7 @@ public class CarOwnerCertificateBean implements Serializable {
11 11 
    private String regdate;
12 12 
    private String cartype;
13 13 
    private int status; //-1 -> 认证失败，0 -> 审核中，1 -> 表示通过审核，2 -> 表示意向车型。
14 
    private int main;
14 
    private int main;  //是否为主车型 1为主车型
15 15 
    private String addTime;
16 16 
    private String errmsg;
17 17

+ 1 - 1
app/src/main/java/com/electric/chargingpile/util/Util.java
Ver Arquivo 

@ -620,7 +620,7 @@ public class Util {
620 620 
        }else if (bean.getType().equals("8")){
621 621 
            String format = getDisCount(bean);
622 622 
            if (maxMoney.equals("0") || maxMoney.equals("")){
623 
                str="服务费"+format+"折";
623 
                str="订单费"+format+"折";
624 624 
            }else{
625 625 
                str="订单费"+format+"折,满"+maxMoney+"元可用";
626 626 
            }

+ 1 - 1
app/src/main/res/layout/activity_car_owner_certificate.xml
Ver Arquivo 

@ -354,7 +354,7 @@
354 354 
                android:layout_height="wrap_content"
355 355 
                android:layout_marginTop="10dp"
356 356 
                android:layout_marginBottom="30dp"
357 
                android:text="认证说明\n\n1.车型信息和行驶证主页为必填项;\n2.最多可认证三款车型;\n3.默认首款认证车型为主车型;\n4.上传行驶证详细页面，并保证所有信息清晰;\n5.认证成功的首个车型可获得50元充电优惠券。"
357 
                android:text="认证说明\n\n1.车型信息和行驶证主页为必填项;\n2.最多可认证三款车型;\n3.默认首款认证车型为主车型;\n4.上传行驶证详细页面，并保证所有信息清晰;\n5.首次车主认证审核通过有充电满减和折扣红包\n6.红包自发放日起有效期为一个月"
358 358 
                android:textColor="#0D1120"
359 359 
                android:textSize="14sp"
360 360 
                app:layout_constraintBottom_toBottomOf="parent"

+ 1 - 1
app/src/main/res/layout/activity_skip_user_info.xml
Ver Arquivo 

@ -243,7 +243,7 @@
243 243 
                    android:layout_marginEnd="15dp"
244 244 
                    android:layout_width="wrap_content"
245 245 
                    android:layout_height="match_parent"
246 
                    android:text="首次选择意向车型（得充电余额）"
246 
                    android:text="首次选择意向车型（得充电优惠）"
247 247 
                    android:textColor="#ff0e0e0e"
248 248 
                    android:textSize="14sp"
249 249 
                    android:layout_alignParentRight="true"

+ 1 - 1
app/src/main/res/layout/activity_user_info.xml
Ver Arquivo 

@ -246,7 +246,7 @@
246 246 
                    android:gravity="center"
247 247 
                    android:layout_width="wrap_content"
248 248 
                    android:layout_height="match_parent"
249 
                    android:text="首次选择意向车型（得充电余额）"
249 
                    android:text="首次选择意向车型（得充电优惠）"
250 250 
                    android:textColor="#ff0e0e0e"
251 251 
                    android:textSize="14sp"
252 252 
                    />