Merge branch '1.2.1' into 1.2.0_google

wjc

2025-05-23 971a24a9e58a21bc306897fd3ad63012a399f7db

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

@@ -14,6 +14,7 @@
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.bean.ContactBean;
import com.hdl.photovoltaic.widget.FlashingBoxDialog;

/**
 * 联系我们的界面
@@ -31,8 +32,8 @@

    @Override
    public void onBindView(Bundle savedInstanceState) {
        setNotificationBarBackgroundColor(CustomColor.white);
        setStatusBarTextColor();
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化
        initView();
        //初始化界面监听器
@@ -64,7 +65,7 @@
    }

    private void initEvent() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                finish();
@@ -85,7 +86,10 @@
                    // 将剪贴数据对象复制到剪贴板
                    clipboard.setPrimaryClip(clip);
                    // 可以添加一个Toast或者其他提示来告知用户复制成功
                    HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
//                    HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
                    FlashingBoxDialog flashingBoxDialog = new FlashingBoxDialog(_mActivity, 1500);
                    flashingBoxDialog.setContent(getString(R.string.successful_replication));
                    flashingBoxDialog.show();
                }

//                return true; // 返回true表示已处理长按事件
@@ -105,7 +109,10 @@
                    // 将剪贴数据对象复制到剪贴板
                    clipboard.setPrimaryClip(clip);
                    // 可以添加一个Toast或者其他提示来告知用户复制成功
                    HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
//                    HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
                    FlashingBoxDialog flashingBoxDialog = new FlashingBoxDialog(_mActivity, 1500);
                    flashingBoxDialog.setContent(getString(R.string.successful_replication));
                    flashingBoxDialog.show();
                }
//                return true; // 返回true表示已处理长按事件
            }
@@ -113,10 +120,8 @@
    }

    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));
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.contact_us);
        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);

    }
}