~wjc/HDLPhotovoltaicDebugAPP.git

parent: 54cb06b7 | 补丁 | 提交 | ignore whitespace

2024年07月24日19:26:40

mac

2024-07-24 30b7d526263abf634ee1003a572930822e81c8a2

2024年07月24日19:26:40

备份代码

8个文件已修改

	app/src/main/java/com/hdl/photovoltaic/HDLApp.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/activity_home_login.xml	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/dialog_static_list.xml	152 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/fragment_message.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -134,7 +134,7 @@
//        CrashReport.initCrashReport(this, Constant.BUGLY_APP_ID, true);
        //6.初始化DCUniMPSDK
        initDCUniMPSDK();
        this.initUniMqtt();//如果是部署到/手机上正式使用，注释掉这行代码就可
//        this.initUniMqtt();//如果是部署到/手机上正式使用，注释掉这行代码就可
//        //7.初始化自定义IconToast
//        ToastUtils.getInstance().initIconToast(this);
//        //8.对fastjson进行设置，解决fastjosn转换成字符串时首字母大小写问题
@@ -185,6 +185,7 @@
        HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() {
            @Override
            public void onReLogin(int type) {
                Log.d("====退到登录界面====", "====退到登录界面====" + type);
                //type:  0:正常退出   1：极光推送强制退出
                //收到登录处理通知，关闭所有页面并打开登录页面
                AppManagerUtils.getAppManager().finishAllActivity();

 app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java

@@ -3,9 +3,11 @@
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import android.view.View;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;


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

@@ -1768,6 +1768,7 @@
                if (cUserInfo == null) {
                    return;
                }
                UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
                UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
                UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
                UserConfigManage.getInstance().Save();

 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java

@@ -159,7 +159,7 @@
                    if (onOtherUniMPEventCallBack != null) {
                        onOtherUniMPEventCallBack.onOtherUniMPEventReceive(appid, event, data, callback);
                    } else {
                        //有可能是系统回收掉activity到知道回调为null，这样情况下强制返回登录界面；
                        //有可能是系统回收掉activity导致回调为null，这样情况下强制返回登录界面；
                        HDLLinkPMUser.getInstance().logout(0);
                        HdlLogLogic.print("收到小程序通知,回调事件为null,无法回调事件并执行业务逻辑--->event=" + event + "\r\n" + "data=" + data, true);
                    }

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

@@ -4,13 +4,18 @@
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;

import androidx.annotation.NonNull;

import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogStaticListBinding;
import com.hdl.photovoltaic.utils.UnitConversionUtils;

/**
 * 静态列表弹窗
@@ -21,14 +26,23 @@
    private onHDLBahrainListener onHDLBahrainListener;
    private DialogStaticListBinding viewBinding;
    private String contentStr1, contentStr2;
    private Context mContext;

    public ListStaticDialog(@NonNull Context context) {
        super(context, R.style.Custom_Dialog);
        mContext = context;
    }

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        Window window = getWindow();
        if (window != null) {
            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
            WindowManager.LayoutParams layoutParams = window.getAttributes();
            layoutParams.gravity = Gravity.BOTTOM;
            window.setAttributes(layoutParams);
        }
        viewBinding = DialogStaticListBinding.inflate(getLayoutInflater());
        setContentView(viewBinding.getRoot());
        initData();

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

@@ -192,29 +192,29 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
        app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />

    <!--注册-->
    <TextView
        android:id="@+id/home_login_register_tv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_24"
        android:text="@string/home_login_register"
        android:textColor="@color/text_245EC3"
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
        app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />

        app:layout_constraintTop_toTopOf="@+id/home_login_forget_password_tv" />
    <!--忘记密码-->
    <TextView
        android:id="@+id/home_login_forget_password_tv"

        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_24"
        android:text="@string/home_login_forget_password"
        android:textColor="@color/text_245EC3"
        android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
        app:layout_constraintTop_toTopOf="@+id/home_login_register_tv" />
        app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />
    <!--登录-->

    <TextView
        android:id="@+id/home_login_tv"
        android:layout_width="0dp"
@@ -227,7 +227,6 @@
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="18sp"
        app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
        app:layout_constraintHorizontal_bias="0.0"
        app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
        app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" />


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

@@ -2,93 +2,89 @@
<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="match_parent">
    android:layout_height="@dimen/dp_200"
    android:layout_marginStart="@dimen/dp_20"
    android:layout_marginEnd="@dimen/dp_20"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintEnd_toEndOf="parent"
    app:layout_constraintStart_toStartOf="parent">

    <androidx.constraintlayout.widget.ConstraintLayout

    <LinearLayout
        android:id="@+id/hdl_china_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_200"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginEnd="@dimen/dp_20"
        app:layout_constraintBottom_toBottomOf="parent"
        android:layout_height="@dimen/dp_50"
        android:background="@color/ffffff"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">

        <LinearLayout
            android:id="@+id/hdl_china_ll"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_50"
            android:background="@color/ffffff"
            android:gravity="center"
            android:orientation="horizontal"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent">
        <TextView
            android:id="@+id/hdl_china_tv"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="HDL China"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_18" />
    </LinearLayout>

            <TextView
                android:id="@+id/hdl_china_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="HDL China"
                android:textColor="@color/text_E6000000"
                android:textSize="@dimen/text_18" />
        </LinearLayout>
    <View
        android:id="@+id/line_v"
        android:layout_width="match_parent"
        android:layout_height="0.5dp"
        android:background="@color/text_E1E1E1"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/hdl_china_ll"

        <View
            android:id="@+id/line_v"
            android:layout_width="match_parent"
            android:layout_height="0.5dp"
            android:background="@color/text_E1E1E1"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/hdl_china_ll"
        />


    <LinearLayout
        android:id="@+id/hdl_bahrain_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_50"
        android:background="@color/ffffff"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/line_v">

        <TextView
            android:id="@+id/hdl_bahrain_tv"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="HDL Bahrain"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_18"

            />
    </LinearLayout>

    <LinearLayout
        android:id="@+id/hdl_cancel_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_50"
        android:layout_marginTop="@dimen/dp_20"
        android:background="@color/ffffff"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/hdl_bahrain_ll">

        <LinearLayout
            android:id="@+id/hdl_bahrain_ll"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_50"
            android:background="@color/ffffff"
            android:gravity="center"
            android:orientation="horizontal"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/line_v">
        <TextView
            android:id="@+id/hdl_cancel_tv"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/loading_cancel"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_18"

            <TextView
                android:id="@+id/hdl_bahrain_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="HDL Bahrain"
                android:textColor="@color/text_E6000000"
                android:textSize="@dimen/text_18"
            />
    </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

                />
        </LinearLayout>

        <LinearLayout
            android:id="@+id/hdl_cancel_ll"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_50"
            android:layout_marginTop="@dimen/dp_20"
            android:background="@color/ffffff"
            android:gravity="center"
            android:orientation="horizontal"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/hdl_bahrain_ll">

            <TextView
                android:id="@+id/hdl_cancel_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="@string/loading_cancel"
                android:textColor="@color/text_E6000000"
                android:textSize="@dimen/text_18"

                />
        </LinearLayout>
    </androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -32,9 +32,8 @@
            android:id="@+id/message_tab_recover_title_tv"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_21"
            android:layout_marginEnd="@dimen/dp_4"
            android:layout_marginStart="20dp"
            android:layout_marginEnd="4dp"
            android:layout_toStartOf="@+id/all_clear_iv"
            android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
            android:gravity="start|center_vertical|bottom"

			@@ -134,7 +134,7 @@
			// CrashReport.initCrashReport(this, Constant.BUGLY_APP_ID, true);
			//6.初始化DCUniMPSDK
			initDCUniMPSDK();
			this.initUniMqtt();//如果是部署到/手机上正式使用，注释掉这行代码就可
			// this.initUniMqtt();//如果是部署到/手机上正式使用，注释掉这行代码就可
			// //7.初始化自定义IconToast
			// ToastUtils.getInstance().initIconToast(this);
			// //8.对fastjson进行设置，解决fastjosn转换成字符串时首字母大小写问题
			@@ -185,6 +185,7 @@
			HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() {
			@Override
			public void onReLogin(int type) {
			Log.d("====退到登录界面====", "====退到登录界面====" + type);
			//type: 0:正常退出 1：极光推送强制退出
			//收到登录处理通知，关闭所有页面并打开登录页面
			AppManagerUtils.getAppManager().finishAllActivity();

			@@ -3,9 +3,11 @@
			import android.app.Activity;
			import android.content.Context;
			import android.content.Intent;
			import android.content.res.Configuration;
			import android.os.Bundle;
			import android.view.View;

			import androidx.annotation.NonNull;
			import androidx.annotation.Nullable;
			import androidx.appcompat.app.AppCompatActivity;

			@@ -1768,6 +1768,7 @@
			if (cUserInfo == null) {
			return;
			}
			UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
			UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
			UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
			UserConfigManage.getInstance().Save();

			@@ -159,7 +159,7 @@
			if (onOtherUniMPEventCallBack != null) {
			onOtherUniMPEventCallBack.onOtherUniMPEventReceive(appid, event, data, callback);
			} else {
			//有可能是系统回收掉activity到知道回调为null，这样情况下强制返回登录界面；
			//有可能是系统回收掉activity导致回调为null，这样情况下强制返回登录界面；
			HDLLinkPMUser.getInstance().logout(0);
			HdlLogLogic.print("收到小程序通知,回调事件为null,无法回调事件并执行业务逻辑--->event=" + event + "\r\n" + "data=" + data, true);
			}

			@@ -4,13 +4,18 @@
			import android.content.Context;
			import android.os.Bundle;
			import android.text.TextUtils;
			import android.view.Gravity;
			import android.view.View;
			import android.view.ViewGroup;
			import android.view.Window;
			import android.view.WindowManager;

			import androidx.annotation.NonNull;

			import com.hdl.photovoltaic.R;
			import com.hdl.photovoltaic.base.BaseDialog;
			import com.hdl.photovoltaic.databinding.DialogStaticListBinding;
			import com.hdl.photovoltaic.utils.UnitConversionUtils;

			/**
			* 静态列表弹窗
			@@ -21,14 +26,23 @@
			private onHDLBahrainListener onHDLBahrainListener;
			private DialogStaticListBinding viewBinding;
			private String contentStr1, contentStr2;
			private Context mContext;

			public ListStaticDialog(@NonNull Context context) {
			super(context, R.style.Custom_Dialog);
			mContext = context;
			}

			@Override
			protected void onCreate(Bundle savedInstanceState) {
			super.onCreate(savedInstanceState);
			Window window = getWindow();
			if (window != null) {
			window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
			WindowManager.LayoutParams layoutParams = window.getAttributes();
			layoutParams.gravity = Gravity.BOTTOM;
			window.setAttributes(layoutParams);
			}
			viewBinding = DialogStaticListBinding.inflate(getLayoutInflater());
			setContentView(viewBinding.getRoot());
			initData();

			@@ -192,29 +192,29 @@
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
			app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />

			<!--注册-->
			<TextView
			android:id="@+id/home_login_register_tv"
			android:layout_width="wrap_content"
			android:layout_height="@dimen/dp_20"
			android:layout_marginTop="@dimen/dp_24"
			android:text="@string/home_login_register"
			android:textColor="@color/text_245EC3"
			android:textSize="@dimen/text_14"
			app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
			app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />

			app:layout_constraintTop_toTopOf="@+id/home_login_forget_password_tv" />
			<!--忘记密码-->
			<TextView
			android:id="@+id/home_login_forget_password_tv"

			android:layout_width="wrap_content"
			android:layout_height="@dimen/dp_20"
			android:layout_marginTop="@dimen/dp_24"
			android:text="@string/home_login_forget_password"
			android:textColor="@color/text_245EC3"
			android:textSize="@dimen/text_14"
			app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
			app:layout_constraintTop_toTopOf="@+id/home_login_register_tv" />
			app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />
			<!--登录-->

			<TextView
			android:id="@+id/home_login_tv"
			android:layout_width="0dp"
			@@ -227,7 +227,6 @@
			android:textColor="@color/text_FFFFFFFF"
			android:textSize="18sp"
			app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
			app:layout_constraintHorizontal_bias="0.0"
			app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
			app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" />

			@@ -2,93 +2,89 @@
			<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="match_parent">
			android:layout_height="@dimen/dp_200"
			android:layout_marginStart="@dimen/dp_20"
			android:layout_marginEnd="@dimen/dp_20"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent">

			<androidx.constraintlayout.widget.ConstraintLayout

			<LinearLayout
			android:id="@+id/hdl_china_ll"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_200"
			android:layout_marginStart="@dimen/dp_20"
			android:layout_marginEnd="@dimen/dp_20"
			app:layout_constraintBottom_toBottomOf="parent"
			android:layout_height="@dimen/dp_50"
			android:background="@color/ffffff"
			android:gravity="center"
			android:orientation="horizontal"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent">
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="parent">

			<LinearLayout
			android:id="@+id/hdl_china_ll"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_50"
			android:background="@color/ffffff"
			android:gravity="center"
			android:orientation="horizontal"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="parent">
			<TextView
			android:id="@+id/hdl_china_tv"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="HDL China"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_18" />
			</LinearLayout>

			<TextView
			android:id="@+id/hdl_china_tv"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="HDL China"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_18" />
			</LinearLayout>
			<View
			android:id="@+id/line_v"
			android:layout_width="match_parent"
			android:layout_height="0.5dp"
			android:background="@color/text_E1E1E1"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/hdl_china_ll"

			<View
			android:id="@+id/line_v"
			android:layout_width="match_parent"
			android:layout_height="0.5dp"
			android:background="@color/text_E1E1E1"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/hdl_china_ll"
			/>


			<LinearLayout
			android:id="@+id/hdl_bahrain_ll"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_50"
			android:background="@color/ffffff"
			android:gravity="center"
			android:orientation="horizontal"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/line_v">

			<TextView
			android:id="@+id/hdl_bahrain_tv"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="HDL Bahrain"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_18"

			/>
			</LinearLayout>

			<LinearLayout
			android:id="@+id/hdl_cancel_ll"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_50"
			android:layout_marginTop="@dimen/dp_20"
			android:background="@color/ffffff"
			android:gravity="center"
			android:orientation="horizontal"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/hdl_bahrain_ll">

			<LinearLayout
			android:id="@+id/hdl_bahrain_ll"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_50"
			android:background="@color/ffffff"
			android:gravity="center"
			android:orientation="horizontal"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/line_v">
			<TextView
			android:id="@+id/hdl_cancel_tv"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="@string/loading_cancel"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_18"

			<TextView
			android:id="@+id/hdl_bahrain_tv"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="HDL Bahrain"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_18"
			/>
			</LinearLayout>
			</androidx.constraintlayout.widget.ConstraintLayout>

			/>
			</LinearLayout>

			<LinearLayout
			android:id="@+id/hdl_cancel_ll"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_50"
			android:layout_marginTop="@dimen/dp_20"
			android:background="@color/ffffff"
			android:gravity="center"
			android:orientation="horizontal"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/hdl_bahrain_ll">

			<TextView
			android:id="@+id/hdl_cancel_tv"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="@string/loading_cancel"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_18"

			/>
			</LinearLayout>
			</androidx.constraintlayout.widget.ConstraintLayout>

			</androidx.constraintlayout.widget.ConstraintLayout>

			@@ -32,9 +32,8 @@
			android:id="@+id/message_tab_recover_title_tv"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_centerVertical="true"
			android:layout_marginStart="@dimen/dp_21"
			android:layout_marginEnd="@dimen/dp_4"
			android:layout_marginStart="20dp"
			android:layout_marginEnd="4dp"
			android:layout_toStartOf="@+id/all_clear_iv"
			android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
			android:gravity="start\|center_vertical\|bottom"