完成首页增加车主认证活动入口

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

@@ -7,6 +7,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import android.Manifest;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -18,6 +19,7 @@ import android.os.Bundle;
import android.text.Html;
import android.text.TextUtils;
import android.util.Base64;
import android.util.SparseArray;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
@@ -715,4 +717,19 @@ public class CarOwnerCertificateActivity extends AppCompatActivity implements Vi
                Manifest.permission.CAMERA
        );
    }
    public static void actionStart(Context context){
        context.startActivity(new Intent(context,CarOwnerCertificateActivity.class));
    }
    public static void actionStart(Context context,boolean edit,String data){
        Intent intent = new Intent(context, CarOwnerCertificateActivity.class);
        intent.putExtra("edit",edit);
        intent.putExtra("data",data);
        context.startActivity(intent);
    }
    public static void actionStart(Context context,boolean edit){
        Intent intent = new Intent(context, CarOwnerCertificateActivity.class);
        intent.putExtra("edit",edit);
        context.startActivity(intent);
    }
}

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

@@ -59,7 +59,7 @@ public class ChatActivity extends AppCompatActivity implements View.OnClickListe
    private static final int RC_CAMERA_PERM = 123;
    private long exitTime = 0;
    private  final WebFragment mWebFragment = WebFragment.getInstance("https://www.baidu.com");
    private  final WebFragment mWebFragment = WebFragment.getInstance("https://cdz.evcharge.cc/html/action-center/");
    @Override
    protected void onCreate(Bundle savedInstanceState) {

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

@@ -465,7 +465,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                            if (adfloat != null && !adfloat.equals("")) {
                                List<Adin> listAdfloat = JsonUtils.parseToObjectList(adfloat, Adin.class);
                                if (listAdfloat.size() > 0) {
                                    loadAdfloatImg(listAdfloat.get(0));
//                                    loadAdfloatImg(listAdfloat.get(0));
                                }
                            }
@@ -926,6 +926,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        showPostDelayedDialog();
        getSwitch();
        switchRecommend();
        switchCar();
//        ConfirmOrderActivity.actionStart(this);
//        startActivity(new Intent(getApplication(), ChargingStatusActivity.class));
//        startActivity(new Intent(this, SkipUserInfoActivity.class));
@@ -1277,22 +1278,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        }
    }
    private void loadAdfloatImg(Adin adin) {
        adfloatUrl = adin.getUrl();
        Glide.with(this).load(MainApplication.url + "/zhannew/uploadfile/" + adin.getIcon()).listener(new RequestListener<Drawable>() {
            @Override
            public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
                second_hand_car.setVisibility(View.GONE);
                return false;
            }
            @Override
            public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
                second_hand_car.setVisibility(View.VISIBLE);
                return false;
            }
        }).into(second_hand_car);
    }
    /**
     * 设置一些amap的属性
@@ -1743,6 +1728,32 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        });
    }
    private void switchCar() {
        String url = MainApplication.url + "/zhannew/basic/web/index.php/zhangonggao/switchcar";
        OkHttpUtils.get().url(url)
                .build().execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
                e.printStackTrace();
            }
            @Override
            public void onResponse(String response) {
                String rtnCode = JsonUtils.getKeyResult(response, "code");
                if ("100".equals(rtnCode)) {
                    String data = JsonUtils.getKeyResult(response, "data");
                    if (EmptyUtils.isNotEmpty(data) && data.equals("1")) {
                        second_hand_car.setVisibility(View.VISIBLE);
                    }else{
                        second_hand_car.setVisibility(View.GONE);
                    }
                }else{
                    second_hand_car.setVisibility(View.GONE);
                }
            }
        });
    }
    private void dealUpdateData(List<UpdateZhanDataBean> list) {
        String dbPath = "/data/user/0/com.electric.chargingpile/databases/zhan_list";
        String uptime = "";
@@ -2438,9 +2449,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                }
                break;
            case R.id.second_hand_car:
                Intent adfloatIntent = new Intent(this, MyWebViewActivity.class);
                adfloatIntent.putExtra("url", adfloatUrl);
                startActivity(adfloatIntent);
                CarOwnerCertificateActivity.actionStart(this);
                break;
            case R.id.iv_roadCondition:
                MobclickAgent.onEvent(getApplicationContext(), "0113");

app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@@ -102,13 +102,13 @@ public class MainApplication extends MultiDexApplication implements CameraXConfi
    public static String firstPoint = "";
    public static Boolean firstSsyd;
    public static String password = "";
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
//    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
    public static String url = "http://59.110.68.162";// 充电桩测试环境
    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
//        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
    public static String CDN = "https://cdn-fs.d1ev.com";

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

@@ -1660,15 +1660,15 @@
            <ImageView
                android:id="@+id/second_hand_car"
                android:layout_width="80dp"
                android:layout_height="80dp"
                android:layout_width="50dp"
                android:layout_height="50dp"
                android:layout_above="@+id/iv_route"
                android:layout_alignParentRight="true"
                android:layout_marginTop="30dp"
                android:layout_marginRight="15dp"
                android:layout_marginBottom="9dp"
                android:visibility="gone"
                tools:background="#ff0000"
                android:src="@drawable/authentication"
                tools:visibility="visible" />
            <ImageView

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

@@ -56,8 +56,10 @@
    </ScrollView>
    <LinearLayout
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        android:id="@+id/bottom_btn"
        android:layout_width="match_parent"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:paddingLeft="20dp"
@@ -67,6 +69,7 @@
        app:layout_constraintBottom_toBottomOf="parent">
        <TextView
            android:id="@+id/agree_enter_text_view"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"