t(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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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
                    />

dudu/cdzApp - Gogs: Go Git Service

295 Revīzijas (96b718ad72e34199d4d83eaf75f572b4b6eb95e7)

Autors SHA1 Ziņojums Datums
  huyuguo 96b718ad72 添加新站点 6 gadi atpakaļ
  huyuguo 40151bb6cc vivo触摸事件处理 6 gadi atpakaļ
  huyuguo f9c981d55b 首页二手车广告添加 6 gadi atpakaļ
  huyuguo 13a94202d4 版本号更新 6 gadi atpakaļ
  huyuguo dd64fcf3a0 标签添加 6 gadi atpakaļ
  huyuguo 905390ec9c 增加站点图片上传 6 gadi atpakaļ
  huyuguo 85396acb18 添加站点开发 6 gadi atpakaļ
  huyuguo 5331e99d35 站点气泡页开发完成 6 gadi atpakaļ
  huyuguo 17f36089fa 站点详情修改完成 6 gadi atpakaļ
  huyuguo 5b496a783e 添加新站点 6 gadi atpakaļ
  huyuguo af5b3734eb 关于我们修改完成 6 gadi atpakaļ
  huyuguo 6192d368be 红包功能开发完成 6 gadi atpakaļ
  huyuguo e4c98644ca 红包需求开发 6 gadi atpakaļ
  huyuguo 7ccfd7dd31 内容更新 6 gadi atpakaļ
  huyuguo ae06683ab6 关闭隐私协议,启动站点说明界面 6 gadi atpakaļ
  huyuguo c93823ebbc dmp数据添加 6 gadi atpakaļ
  huyuguo 09987309b1 Merge remote-tracking branch 'origin/change_h5_take_photo' 6 gadi atpakaļ
  huyuguo 84eab5f732 h5页面拍照问题修改 6 gadi atpakaļ
  huyuguo b107dbc225 代码修改 6 gadi atpakaļ
  huyuguo f544c3c6e1 线上版本切换 6 gadi atpakaļ
  huyuguo ad6ab1b304 测试数据显示 6 gadi atpakaļ
  huyuguo 9256f9d717 测试环境配置 6 gadi atpakaļ
  huyuguo 1882ddef5e 删除冗余代码 6 gadi atpakaļ
  huyuguo da50298b50 启屏广告优化 6 gadi atpakaļ
  huyuguo 36c7fba9bb 用户协议与隐私政策 6 gadi atpakaļ
  huyuguo 9014fe157a h5电话拨打问题解决 6 gadi atpakaļ
  huyuguo b7fb0e7bb1 logo更新 6 gadi atpakaļ
  huyuguo 29413f33a0 版本信息更新 6 gadi atpakaļ
  huyuguo b908fbce45 用户隐私协议添加 6 gadi atpakaļ
  huyuguo 72a323bc17 微信支付8.0系统bug修复 6 gadi atpakaļ
  huyuguo a0a472cb3e 找回密码崩溃修复 6 gadi atpakaļ
  huyuguo 04346a6eb5 用户隐私协议添加 6 gadi atpakaļ
  huyuguo 26215b8a71 Delete test.txt 6 gadi atpakaļ
  huyuguo 4b8af94402 Merge branch 'master' of http://59.110.68.162:3000/dudu/cdzApp 6 gadi atpakaļ
  huyuguo 02aa217d17 Create test.txt 6 gadi atpakaļ
  huyuguo 3f53132d2f 支付宝sdk更新 6 gadi atpakaļ
  huyuguo f91342ac03 代码更新 6 gadi atpakaļ
  huyuguo 099ffd484e Update RecommendChargingStationActivity.java 6 gadi atpakaļ
  huyuguo 305724f316 代码更新 6 gadi atpakaļ
  huyuguo 10e0806bc5 bug修改 7 gadi atpakaļ
  huyuguo 72e278b9a8 Update activity_about.xml 7 gadi atpakaļ
  huyuguo 331cbd2b87 推荐列表开发完成 7 gadi atpakaļ
  huyuguo 71b37e5893 列表开发完成 7 gadi atpakaļ
  huyuguo ba1d7c7c07 埋点添加 7 gadi atpakaļ
  huyuguo c7840fa629 智能推荐开发完成 7 gadi atpakaļ
  huyuguo f8ff221448 导航开发完成 7 gadi atpakaļ
  huyuguo 2007eca462 推荐列表开发 7 gadi atpakaļ
  huyuguo 9f927f0d57 列表开发 7 gadi atpakaļ
  huyuguo d495da0a56 推荐功能开发 7 gadi atpakaļ
  huyuguo 7325d16814 代码整理 7 gadi atpakaļ