2024年05月13日11:28:35

mac

2024-05-13 f2f8a06618f986ef4657687213334b6696ae6f1c

2024年05月13日11:28:35

备份一下

 app/src/main/AndroidManifest.xml

@@ -77,6 +77,9 @@
        android:supportsRtl="true"
        android:theme="@style/Theme.PhotovoltaicDebug">
        <activity
            android:name=".ui.me.ContactUsActivity"
            android:exported="false" />
        <activity
            android:name=".ui.message.SearchMessageActivity"
            android:exported="false" />
        <activity
@@ -155,10 +158,10 @@
            android:name=".ui.device.FastScanActivity"
            android:exported="false" />
        <activity
            android:name=".ui.MyPowerStationActivity"
            android:name=".ui.BPowerStationActivity"
            android:exported="false" />
        <activity
            android:name=".ui.HomeLoginActivity"
            android:name=".ui.LoginActivity"
            android:exported="false" />
        <activity android:name=".widget.apkwgtupload.AndroidPermissionActivity" />
        <activity

 app/src/main/java/com/hdl/photovoltaic/HDLApp.java

@@ -14,33 +14,26 @@

import com.hdl.hdlhttp.HxHttpConfig;
import com.hdl.linkpm.sdk.HDLLinkPMSdk;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.home.type.HomeType;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.linkpm.sdk.user.callback.IOnReloginListener;
import com.hdl.linkpm.sdk.utils.HDLSDKSPUtils;
import com.hdl.photovoltaic.bean.MqttInfo;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.NetworkType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMessageLogic;
import com.hdl.photovoltaic.other.HdlMqttLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.HomeLoginActivity;
import com.hdl.photovoltaic.ui.LoginActivity;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.NetworkUtils;
import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.QueueUtils;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;

import org.greenrobot.eventbus.EventBus;

@@ -219,7 +212,7 @@
                }
                SystemClock.sleep(200);
                initDCUniMPSDK();
                Intent intent = new Intent(getInstance(), HomeLoginActivity.class);
                Intent intent = new Intent(getInstance(), LoginActivity.class);
                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                if (type == 1) {
                    intent.putExtra("isJpush", true);

 app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java

@@ -119,8 +119,8 @@

    //获取用户详情信息
    public static final String B_POST_GET_USERINFO = "/basis-footstone/mgmt/user/oauth/getUserInfo";


    //联系我们
    public static final String B_POST_GET_UTIL_CONTACT = "/home-wisdom/app/powerStation/util/contact";


    //退出登录

 app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java

@@ -9,7 +9,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.MessageStateType;
import com.hdl.photovoltaic.jpush.JPushMessageInfoBean;
import com.hdl.photovoltaic.ui.MyPowerStationActivity;
import com.hdl.photovoltaic.ui.BPowerStationActivity;
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;

@@ -52,7 +52,7 @@
            this.addPushDataToMemoryList(jPushMessageInfoBean);
            if (isOpened) {
                //安装商跳转界面
                Intent intent = new Intent(context, MyPowerStationActivity.class);
                Intent intent = new Intent(context, BPowerStationActivity.class);
                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                intent.putExtra("skip", "skip");//里面判断有这个标识就跳转到消息中心界面
                context.startActivity(intent);

 app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java

@@ -16,6 +16,7 @@
import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.ContactBean;
import com.hdl.photovoltaic.ui.bean.DeviceBean;
import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
@@ -692,6 +693,41 @@

    }


    /**
     * 联系我们
     *
     * @param cloudCallBeak -
     */
    public void getResidenceUtilContact(CloudCallBeak<ContactBean> cloudCallBeak) {
        String requestUrl = HttpApi.B_POST_GET_UTIL_CONTACT;
        JsonObject json = new JsonObject();
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
                if (TextUtils.isEmpty(jsonStr)) {
                    if (cloudCallBeak != null) {
                        cloudCallBeak.onSuccess(new ContactBean());
                        return;
                    }
                }
                ContactBean contactBean = new Gson().fromJson(jsonStr, ContactBean.class);
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(contactBean);
                }
            }

            @Override
            public void onFailure(HDLException e) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }
            }
        });


    }

    /**
     * 获取用户自定义配置温度单位详情
     *
@@ -702,7 +738,6 @@
        JsonObject json = new JsonObject();
//        json.addProperty("homeId", homeId);

        List<MessageBean> list = new ArrayList<>();
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {

 app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java

File was renamed from app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -67,7 +67,7 @@
/**
 * B端-电站界面
 */
public class MyPowerStationActivity extends CustomBaseActivity {
public class BPowerStationActivity extends CustomBaseActivity {


    private ActivityMyPowerStationBinding viewBinding;
@@ -109,7 +109,7 @@
        //启动页与mainActivity样式一样，这样启动页和mainActivity看上去是一个界面，目的是为了mainActivity遮住下一页；
//        AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
        portConflictDialog();
//        Intent intent = new Intent(_mActivity, MyPowerStationActivity.class);
//        Intent intent = new Intent(_mActivity, BPowerStationActivity.class);
//        intent.setFlags(Intent.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
//        intent.putExtra("skip", "skip");//里面判断有这个标识就跳转到消息中心界面
//        _mActivity.startActivity(intent);

 app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java

@@ -338,12 +338,16 @@
     * 初始化mqtt客户端
     */
    public void initMqttClient() {
        if (MqttRecvClient.getInstance().isConnected()) {
            //检查断开连接
            MqttRecvClient.getInstance().reConnect();
        }
        if (!MqttRecvClient.getInstance().isInit()) {
            HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
                @Override
                public void onSuccess(MqttInfo info) {
                    if (info != null) {
                        MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(), null);
                        MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
                        MqttRecvClient.getInstance().connect();
                    }
                }

 app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java

File was renamed from app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -47,14 +47,13 @@
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog1;
import com.hdl.photovoltaic.widget.ListDialog;
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
import com.jaeger.library.StatusBarUtil;

import java.util.List;

/**
 * 登录的界面
 */
public class HomeLoginActivity extends CustomBaseActivity {
public class LoginActivity extends CustomBaseActivity {

    private ActivityHomeLoginBinding viewBinding;

@@ -251,7 +250,7 @@
                                        restoreButtonStyleToInitializeState();
                                        if (UserConfigManage.getInstance().isBAccount()) {
                                            //安装商跳转界面
                                            startActivity(MyPowerStationActivity.class);
                                            startActivity(BPowerStationActivity.class);
                                        } else {
                                            //C端用户跳转界面
                                            startActivity(CPowerStationActivity.class);
@@ -266,7 +265,7 @@
                                        restoreButtonStyleToInitializeState();
                                        if (UserConfigManage.getInstance().isBAccount()) {
                                            //安装商跳转界面
                                            startActivity(MyPowerStationActivity.class);
                                            startActivity(BPowerStationActivity.class);
                                        } else {
                                            //C端用户跳转界面
                                            startActivity(CPowerStationActivity.class);
@@ -317,7 +316,7 @@
                v.setSelected(!v.isSelected());
                UserConfigManage.getInstance().setUserExperience(v.isSelected());
//                requestPermissions();
//                startActivity(MyPowerStationActivity.class);
//                startActivity(BPowerStationActivity.class);
            }
        });
        //注册
@@ -325,7 +324,7 @@
            @Override
            public void onClick(View v) {
                Intent intent = new Intent();
                intent.setClass(HomeLoginActivity.this, RegisterAccountActivity.class);
                intent.setClass(LoginActivity.this, RegisterAccountActivity.class);
                startActivity(intent);
            }
        });
@@ -334,7 +333,7 @@
            @Override
            public void onClick(View v) {
                Intent intent = new Intent();
                intent.setClass(HomeLoginActivity.this, ChangePassword.class);
                intent.setClass(LoginActivity.this, ChangePassword.class);
                startActivity(intent);
            }
        });

 app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java

@@ -3,11 +3,7 @@

import android.content.Intent;
import android.os.Bundle;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Log;

import androidx.annotation.Nullable;

import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
@@ -16,12 +12,8 @@
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;

import java.util.List;

@@ -53,7 +45,7 @@
                    Intent intent = new Intent();
                    if (UserConfigManage.getInstance().isBAccount()) {
                        //安装商跳转界面
                        intent.setClass(StartActivity.this, MyPowerStationActivity.class);
                        intent.setClass(StartActivity.this, BPowerStationActivity.class);
                    } else {
                        //C端用户跳转界面
                        intent.setClass(StartActivity.this, CPowerStationActivity.class);
@@ -68,7 +60,7 @@
                    Intent intent = new Intent();
                    if (UserConfigManage.getInstance().isBAccount()) {
                        //安装商跳转界面
                        intent.setClass(StartActivity.this, MyPowerStationActivity.class);
                        intent.setClass(StartActivity.this, BPowerStationActivity.class);
                    } else {
                        //C端用户跳转界面
                        intent.setClass(StartActivity.this, CPowerStationActivity.class);
@@ -79,7 +71,7 @@

        } else {
            Intent intent = new Intent();
            intent.setClass(this, HomeLoginActivity.class);
            intent.setClass(this, LoginActivity.class);
            openActivity(intent);
        }
    }

 app/src/main/java/com/hdl/photovoltaic/ui/bean/ContactBean.java

New file
@@ -0,0 +1,28 @@
package com.hdl.photovoltaic.ui.bean;

import java.io.Serializable;

/**
 * 联系我们实体类
 */
public class ContactBean implements Serializable {

    private String email;
    private String wechat;

    public String getEmail() {
        return email == null ? "" : email;
    }

    public void setEmail(String email) {
        this.email = email;
    }

    public String getWechat() {
        return wechat == null ? "" : wechat;
    }

    public void setWechat(String wechat) {
        this.wechat = wechat;
    }
}

 app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java

@@ -38,7 +38,7 @@

    private void initEvent() {

        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {

@@ -83,7 +83,7 @@
    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_account_security);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));

        if (UserConfigManage.getInstance().isBAccount()) {

 app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java

@@ -79,7 +79,7 @@


    private void initEvent() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                finish();
@@ -113,13 +113,22 @@

            }
        });
        viewBinding.contactUsRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                Intent intent = new Intent();
                intent.setClass(_mActivity, ContactUsActivity.class);
                startActivity(intent);

            }
        });

    }

    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_regard);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
        String versionsStr = _mActivity.getResources().getString(R.string.app_version_number) + " " + AppConfigManage.getVersionName();
        viewBinding.asRegardsIconVersionsTv.setText(versionsStr);

 app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java

@@ -42,7 +42,7 @@

    private void initEvent() {

        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                setResult(20);
@@ -92,7 +92,7 @@
    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_change_bind_mail);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
    }


 app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java

@@ -45,7 +45,7 @@

    private void initEvent() {

        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                setResult(20);
@@ -101,7 +101,7 @@
    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_change_bind_phone_number);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
        try {
            Country.load(this);

 app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java

New file
@@ -0,0 +1,122 @@
package com.hdl.photovoltaic.ui.me;


import android.content.ClipData;
import android.content.ClipboardManager;
import android.os.Bundle;
import android.view.View;

import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.databinding.ActivityContactUsBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.bean.ContactBean;

/**
 * 联系我们的界面
 */
public class ContactUsActivity extends CustomBaseActivity {

    ActivityContactUsBinding viewBinding;


    @Override
    public Object getContentView() {
        viewBinding = ActivityContactUsBinding.inflate(getLayoutInflater());
        return viewBinding.getRoot();
    }

    @Override
    public void onBindView(Bundle savedInstanceState) {
        setNotificationBarBackgroundColor(CustomColor.white);
        setStatusBarTextColor();
        //初始化
        initView();
        //初始化界面监听器
        initEvent();
        //读取数据
        readData();
    }

    private void readData() {
        showLoading();
        HdlResidenceLogic.getInstance().getResidenceUtilContact(new CloudCallBeak<ContactBean>() {
            @Override
            public void onSuccess(ContactBean contactBean) {

                if (contactBean != null) {
                    viewBinding.wechatIdContentTv.setText(contactBean.getWechat());
                    viewBinding.emailAddressContentTv.setText(contactBean.getEmail());
                }
                hideLoading();

            }

            @Override
            public void onFailure(HDLException e) {
                HdlThreadLogic.toast(_mActivity, e);
                hideLoading();
            }
        });
    }

    private void initEvent() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                finish();
            }
        });

        viewBinding.wechatIdContentTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                // 获取TextView中的文本
                String text = viewBinding.wechatIdContentTv.getText().toString();

                // 获取剪贴板管理器
                ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
                if (clipboard != null) {
                    // 创建一个剪贴数据对象并设置要复制的文本
                    ClipData clip = ClipData.newPlainText("label", text);
                    // 将剪贴数据对象复制到剪贴板
                    clipboard.setPrimaryClip(clip);
                    // 可以添加一个Toast或者其他提示来告知用户复制成功
                    HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
                }

//                return true; // 返回true表示已处理长按事件
            }
        });
        viewBinding.emailAddressContentTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                // 获取TextView中的文本
                String text = viewBinding.emailAddressContentTv.getText().toString();

                // 获取剪贴板管理器
                ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
                if (clipboard != null) {
                    // 创建一个剪贴数据对象并设置要复制的文本
                    ClipData clip = ClipData.newPlainText("label", text);
                    // 将剪贴数据对象复制到剪贴板
                    clipboard.setPrimaryClip(clip);
                    // 可以添加一个Toast或者其他提示来告知用户复制成功
                    HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
                }
//                return true; // 返回true表示已处理长按事件
            }
        });
    }

    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.contact_us);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));

    }
}

 app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java

@@ -51,7 +51,7 @@
     * 初始化界面监听器
     */
    private void initEvent() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                finish();
@@ -166,7 +166,7 @@
        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.home_login_change_password);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.meChangePasswordOldIc.mePswTitleTv.setText(R.string.home_login_old_pws);
        viewBinding.meChangePasswordOldIc.mePswEt.setHint(R.string.home_login_input_old_pws);
        viewBinding.meChangePasswordOldIc.lineV.setVisibility(View.GONE);

 app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java

@@ -188,7 +188,7 @@
            }
        });
        final int[] count = {0};
        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setOnClickListener(new View.OnClickListener() {
        viewBinding.meTitleTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                count[0] = count[0] + 1;
@@ -206,11 +206,6 @@
     * 初始化界面
     */
    private void initView() {


        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me);
//        viewBinding.toolbarTopFragmentMeRl.topMoreIv.setVisibility(View.VISIBLE);
//        viewBinding.toolbarTopFragmentMeRl.topMoreIv.setImageResource(R.drawable.message);


        viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);

 app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java

@@ -92,7 +92,7 @@

    private void initEvent() {

        viewBinding.toolbarTopFragmentMeRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentMeRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
//                backPressedData();
@@ -132,7 +132,7 @@

    private void initView() {
        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me_personal_data);
        viewBinding.toolbarTopFragmentMeRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentMeRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentMeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
        viewBinding.personalDataUserPortraitIl.sllLlRlNameTv.setText(R.string.me_personal_data_portrait);

 app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java

@@ -42,7 +42,7 @@
    }

    private void initEvent() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                finish();
@@ -89,7 +89,7 @@
    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_set);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
        viewBinding.setLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
        viewBinding.setAccountSecurityIl.sllLlRlNameTv.setText(R.string.set_account_security);

 app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java

@@ -78,7 +78,7 @@

    private void initEvent() {

        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                backPressedData();
@@ -113,7 +113,7 @@
    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_temperature_unit);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
        LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
        languageAdapter = new LanguageAdapter(this.mList, _mActivity);

 app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java

@@ -45,7 +45,7 @@
    }

    private void initEvent() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
                finish();
@@ -60,7 +60,7 @@
            viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.app_privacy_policy);
        }
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));

        if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {

 app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java

@@ -68,7 +68,7 @@

    private void initEvent() {

        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                setResult(30);
@@ -182,7 +182,7 @@
    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_language_choice);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
        LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
        languageAdapter = new LanguageAdapter(this.list, _mActivity);

 app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java

@@ -115,7 +115,7 @@

    private void initEvent() {
        //后退的事件
        viewBinding.toolbarTopIn.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopIn.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                if (mMessageBean == null) {
@@ -220,7 +220,7 @@

        viewBinding.toolbarTopIn.topTitleTv.setText(R.string.message_alarm_info);
        viewBinding.toolbarTopIn.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopIn.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopIn.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopIn.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));

        if (!UserConfigManage.getInstance().isBAccount()) {

 app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java

@@ -104,7 +104,7 @@

    private void initEvent() {
        //返回按钮
        viewBinding.toolbarTopMessageCenterListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopMessageCenterListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                clearCacheData();
@@ -281,7 +281,7 @@

    private void initView() {
        viewBinding.toolbarTopMessageCenterListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
        viewBinding.toolbarTopMessageCenterListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopMessageCenterListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopMessageCenterListRl.topLeftIv.setImageResource(R.drawable.back_c);
        viewBinding.toolbarTopMessageCenterListRl.topTitleTv.setText(R.string.set_message_center);
        viewBinding.toolbarTopMessageCenterListRl.topMoreBtn.setVisibility(View.VISIBLE);

 app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java

@@ -65,7 +65,7 @@

    private void initEvent() {
        //返回按钮
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                if (!is_edit) {
@@ -158,7 +158,7 @@

    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.power_station_selection);
        viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.VISIBLE);

 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java

@@ -75,7 +75,7 @@

    private void initEvent() {
        //返回按钮
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                BaseEventBus baseEventBus = new BaseEventBus();
@@ -186,7 +186,7 @@

    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.power_station_editing);
        LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);

 app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java

@@ -44,7 +44,7 @@
     * 监听器初始化
     */
    private void initEvent() {
        viewBinding.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                finish();

 app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java

@@ -74,7 +74,7 @@
    }

    private void initEvent() {
        viewBinding.topBackBtn.setOnClickListener(this);
        viewBinding.topBackLl.setOnClickListener(this);
        viewBinding.topLogBtn.setOnClickListener(this);
        viewBinding.clickCommandTv.setOnClickListener(this);
        viewBinding.clickSelectDeviceTv.setOnClickListener(this);
@@ -101,7 +101,7 @@
    @Override
    public void onClick(View v) {
        int id = v.getId();
        if (id == viewBinding.topBackBtn.getId()) {
        if (id == viewBinding.topBackLl.getId()) {
            finish();
        } else if (id == viewBinding.topLogBtn.getId()) {
            startActivity(TestLogActivity.class);

 app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationExceptionDialog.java

@@ -73,7 +73,7 @@
    }

    private void initEvent() {
        viewBinding.toolbarTopExceptionRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopExceptionRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                dismiss();

 app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java

@@ -67,38 +67,39 @@
    @Override
    protected void onStart() {
        super.onStart();
        // 获取窗口对象
        Window dialogWindow = this.getWindow();
        if (dialogWindow != null) {
            // 获取对话框当前的参数值
            WindowManager.LayoutParams p = dialogWindow.getAttributes();
            p.width = LinearLayout.LayoutParams.MATCH_PARENT;
            p.height = LinearLayout.LayoutParams.WRAP_CONTENT;
            p.dimAmount = 0.6f;
            dialogWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
            p.gravity = Gravity.BOTTOM;
            p.y = DensityUtils.dip2px(mContext, 70);
//            //这里设置的宽高优先级高于XML中的布局设置
//            if (this.enumBoxType == BoxType.PhotoAlbumBox) {
//        // 获取窗口对象
//        Window dialogWindow = this.getWindow();
//        if (dialogWindow != null) {
//            // 获取对话框当前的参数值
//            WindowManager.LayoutParams p = dialogWindow.getAttributes();
//            p.width = LinearLayout.LayoutParams.MATCH_PARENT;
//            p.height = LinearLayout.LayoutParams.WRAP_CONTENT;
////            p.dimAmount = 0.6f;
//            dialogWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
//                p.gravity = Gravity.BOTTOM;
//            } else if (this.enumBoxType == BoxType.FlashingBox) {
//                p.dimAmount = 0f;
//            p.y = DensityUtils.dip2px(mContext, 352);
////            //这里设置的宽高优先级高于XML中的布局设置
////            if (this.enumBoxType == BoxType.PhotoAlbumBox) {
////                p.gravity = Gravity.BOTTOM;
////            } else if (this.enumBoxType == BoxType.FlashingBox) {
////                p.dimAmount = 0f;
////            }
//            // 设置到属性配置中
//            dialogWindow.setAttributes(p);
//            }
            // 设置到属性配置中
            dialogWindow.setAttributes(p);
        }
//        setDialogTouchOutsideCloseable(this);

    }

    @SuppressLint("ClickableViewAccessibility")
    public void setDialogTouchOutsideCloseable(Dialog dialog) {
        viewBinding.getRoot().setOnClickListener(new View.OnClickListener() {
        viewBinding.typeParentCl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                int top = viewBinding.typeParentCl.getTop();
                int left = viewBinding.typeParentCl.getLeft();
                int bottom = viewBinding.typeParentCl.getBottom();
                int right = viewBinding.typeParentCl.getRight();
                int top = viewBinding.dialogParentCl.getTop();
                int left = viewBinding.dialogParentCl.getLeft();
                int bottom = viewBinding.dialogParentCl.getBottom();
                int right = viewBinding.dialogParentCl.getRight();
                int y = (int) v.getY();
                int x = (int) v.getX();
                if (top < y && y < bottom) {

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

@@ -15,8 +15,8 @@
        android:id="@+id/as_regards_icon_iv"
        android:layout_width="53.5dp"
        android:layout_height="53.5dp"
        android:src="@drawable/logo"
        android:layout_marginTop="@dimen/dp_29"
        android:src="@drawable/logo"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl" />
@@ -53,7 +53,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/as_regards_qr_code_iv" />

    <!--版本更新-->
    <RelativeLayout
        android:id="@+id/as_regards_version_updating_rl"
        android:layout_width="match_parent"
@@ -103,7 +103,7 @@
            android:textSize="@dimen/text_15" />

    </RelativeLayout>

    <!--服务协议-->
    <RelativeLayout
        android:id="@+id/service_agreement_rl"
        android:layout_width="match_parent"
@@ -142,7 +142,7 @@


    </RelativeLayout>

    <!--隐私政策-->
    <RelativeLayout
        android:id="@+id/privacy_policy_rl"
        android:layout_width="match_parent"
@@ -181,6 +181,45 @@


    </RelativeLayout>
    <!--联系我们-->
    <RelativeLayout
        android:id="@+id/contact_us_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        android:background="@color/text_FFFFFFFF"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/service_agreement_rl">

        <TextView
            android:id="@+id/contact_us_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_21"
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/contact_us"
            android:textColor="@color/text_030D1C"
            android:textSize="@dimen/text_15"

            />

        <LinearLayout
            android:id="@+id/contact_us_ll"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_13">
            <!--标准图标-->
            <ImageView
                android:id="@+id/contact_us_ll_right_next_iv"
                android:layout_width="@dimen/dp_16"
                android:layout_height="@dimen/dp_16"
                android:src="@drawable/next" />
        </LinearLayout>


    </RelativeLayout>


</androidx.constraintlayout.widget.ConstraintLayout>

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

New file
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_F5F7FA"
    tools:context=".ui.me.ContactUsActivity">

    <include
        android:id="@+id/toolbar_top_fragment_house_list_rl"
        layout="@layout/toolbar_top_view_52" />

    <RelativeLayout
        android:id="@+id/wechat_id_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        android:layout_marginTop="@dimen/dp_12"
        android:background="@color/text_FFFFFFFF"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">

        <TextView
            android:id="@+id/wechat_id_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_23"
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/wechat_id"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_16"

            />

        <TextView
            android:id="@+id/wechat_id_content_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_23"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_16"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_16" />

    </RelativeLayout>

    <RelativeLayout
        android:id="@+id/idemail_address_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        android:background="@color/text_FFFFFFFF"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/wechat_id_rl">

        <TextView
            android:id="@+id/email_address_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_23"
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/email_address"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_16" />

        <TextView
            android:id="@+id/email_address_content_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_23"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_16"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_16" />

    </RelativeLayout>


</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -7,7 +7,7 @@
    android:layout_height="match_parent"
    android:background="@drawable/logo_bj"

    tools:context="com.hdl.photovoltaic.ui.HomeLoginActivity">
    tools:context="com.hdl.photovoltaic.ui.LoginActivity">

    <ImageView
        android:id="@+id/home_login_server_iv"

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

@@ -5,7 +5,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/bj"
    tools:context="com.hdl.photovoltaic.ui.MyPowerStationActivity">
    tools:context="com.hdl.photovoltaic.ui.BPowerStationActivity">

    <!--首页-Fragment-->
    <androidx.fragment.app.FragmentContainerView

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

@@ -17,7 +17,7 @@
        app:layout_constraintTop_toTopOf="parent">
        <!--1.返回按钮 增大点击区域-->
        <LinearLayout
            android:id="@+id/top_back_btn"
            android:id="@+id/top_back_ll"
            android:layout_width="@dimen/dp_56"
            android:layout_height="match_parent"
            android:gravity="center_vertical"

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

@@ -18,7 +18,7 @@
        app:layout_constraintTop_toTopOf="parent">
        <!--1.返回按钮 增大点击区域-->
        <LinearLayout
            android:id="@+id/top_back_btn"
            android:id="@+id/top_back_ll"
            android:layout_width="@dimen/dp_56"
            android:layout_height="match_parent"
            android:gravity="center_vertical"

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

@@ -3,28 +3,33 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/me_parent"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_height="match_parent">

    >


    <include
        android:id="@+id/toolbar_top_fragment_me_rl"
        layout="@layout/toolbar_top_view_52" />
    <TextView
        android:id="@+id/me_title_tv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_22"
        android:layout_marginTop="53dp"
        android:text="@string/me"
        android:textColor="@color/text_030D1C"
        android:textSize="@dimen/text_18"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/fragment_me_icon_parent_cl"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_39"
        android:layout_marginTop="@dimen/dp_31"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_me_rl">
        app:layout_constraintTop_toBottomOf="@+id/me_title_tv">

        <ImageView
            android:id="@+id/fragment_me_icon_iv"
            android:layout_width="69dp"
            android:layout_height="69dp"
            android:layout_width="73dp"
            android:layout_height="73dp"
            android:background="@drawable/default_image"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -45,9 +50,11 @@
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_48"
        android:layout_marginEnd="@dimen/dp_16"
        android:background="@drawable/bj_13fffffff"
        android:orientation="vertical"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_parent_cl">

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

@@ -1,19 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_64"
    android:background="@color/text_F9FAFB">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/fragment_me_line_cl"
        android:layout_width="0dp"
        android:layout_height="match_parent"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@color/text_FFFFFFFF"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_64">

        <ImageView
            android:id="@+id/fragment_me_line_left_icon_iv"
@@ -64,8 +54,6 @@
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent" />

    </androidx.constraintlayout.widget.ConstraintLayout>


</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -7,7 +7,7 @@

    <!--1.返回按钮 增大点击区域-->
    <LinearLayout
        android:id="@+id/top_back_btn"
        android:id="@+id/top_back_ll"
        android:layout_width="@dimen/dp_56"
        android:layout_height="match_parent"
        android:gravity="center_vertical"

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

@@ -8,7 +8,7 @@

    <!--1.返回按钮 增大点击区域-->
    <LinearLayout
        android:id="@+id/top_back_btn"
        android:id="@+id/top_back_ll"
        android:layout_width="@dimen/dp_56"
        android:layout_height="match_parent"
        android:gravity="center_vertical"

 app/src/main/res/values/strings.xml

@@ -288,4 +288,8 @@
    <string name="off_network">离网</string>
    <string name="the_input_value_has_been_exceeded">输入值已经超过</string>
    <string name="all_read">一键清除</string>
    <string name="contact_us">联系我们</string>
    <string name="wechat_id">微信号</string>
    <string name="email_address">邮箱地址</string>
    <string name="successful_replication">复制成功</string>
</resources>

 third-zxing/src/main/java/com/zxing/qrcode/CaptureActivity.java

@@ -100,7 +100,7 @@
    public void afterViewBind(View rootView, Bundle savedInstanceState) {



        light_iv = findViewById(R.id.light_iv);

        backll = findViewById(R.id.top_back_btn);

        backll = findViewById(R.id.top_back_ll);

        backll.setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View v) {


 third-zxing/src/main/res/layout/activity_capture.xml

@@ -16,7 +16,7 @@


        <!--1.返回按钮 增大点击区域-->

        <LinearLayout

            android:id="@+id/top_back_btn"

            android:id="@+id/top_back_ll"

            android:layout_width="56dp"

            android:layout_height="match_parent"

            android:gravity="center_vertical"