mac
2024-06-05 0c60f4bac3c43d6314d3a61e630dac5241a09de8
2024年06月05日18:48:20

备份代码
7个文件已修改
91 ■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/user_management.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/fragment_me.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/strings.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -118,13 +118,13 @@
            viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
        }
//        String acc = "13375012441";
////        String acc = "18316672920";
////        String acc = "nuy13368@uzxia.com";
//        String pws = "123456";
//        //测试用
//        viewBinding.homeLoginAccountEt.setText(acc);
//        viewBinding.homeLoginPasswordEt.setText(pws);
        String acc = "13375012441";
//        String acc = "18316672920";
//        String acc = "nuy13368@uzxia.com";
        String pws = "123456";
        //测试用
        viewBinding.homeLoginAccountEt.setText(acc);
        viewBinding.homeLoginPasswordEt.setText(pws);
        isLoginTextViewEnabled();
    }
app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
@@ -80,7 +80,7 @@
        viewBinding.personalDataUserPortraitIl.sllLlRlRightNextIv.setVisibility(View.GONE);
        viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
        viewBinding.personalDataUserNameIl.sllLlRlRightNextIv.setVisibility(View.GONE);
        viewBinding.personalDataMailIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
        viewBinding.personalDataMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
        viewBinding.personalDataMailIl.sllLlRlRightNextIv.setVisibility(View.GONE);
        viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
        viewBinding.personalDataPhoneIl.sllLlRlRightNextIv.setVisibility(View.GONE);
@@ -91,7 +91,7 @@
        viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getUserName());
        String bingEmail = TextUtils.isEmpty(UserConfigManage.getInstance().getBingEmail()) ? _mActivity.getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingEmail();
        viewBinding.personalDataMailIl.sllLlRlRightContentTv.setText(bingEmail);
        String bingPhone = TextUtils.isEmpty(UserConfigManage.getInstance().getBingPhone()) ? _mActivity.getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingEmail();
        String bingPhone = TextUtils.isEmpty(UserConfigManage.getInstance().getBingPhone()) ? _mActivity.getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingPhone();
        viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setText(bingPhone);
        viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));
    }
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -176,6 +176,15 @@
                }
            }
        });
        //员工管理(主账号才显示)
        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                Intent intent = new Intent();
                intent.setClass(_mActivity, SetActivity.class);
                startActivity(intent);
            }
        });
        viewBinding.fragmentMeLineSetIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
@@ -210,6 +219,9 @@
     */
    private void initView() {
        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.user_management);
        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.staff_management);
        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineV.setVisibility(View.VISIBLE);
        viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
        viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);
@@ -264,7 +276,7 @@
        if (TextUtils.isEmpty(userName)) {
            return;
        }
        viewBinding.fragmentMeUserNameIv.setText(userName);
        viewBinding.fragmentMeUserNameTv.setText(userName);
        UserConfigManage.getInstance().setUserName(userName);
        UserConfigManage.getInstance().Save();
app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
@@ -4,6 +4,7 @@
import android.graphics.Bitmap;
import android.graphics.Color;
import android.os.Bundle;
import android.provider.MediaStore;
import android.text.TextUtils;
import android.view.View;
@@ -14,6 +15,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityQrCodeMainBinding;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
/**
 * 二维码名片的界面
@@ -54,11 +56,35 @@
        viewBinding.toolbarTopQrCodeRl.topMoreBtn.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                // 假设你已经有了一个二维码图片,这里是一个简化的截图方法
                viewBinding.qrCodeIv.setDrawingCacheEnabled(true);
                Bitmap bitmap = viewBinding.qrCodeIv.getDrawingCache();
                // 保存截图到相册
                saveImageToGallery(bitmap);
                // 清理缓存
                viewBinding.qrCodeIv.setDrawingCacheEnabled(false);
                if (bitmap != null && !bitmap.isRecycled()) {
                    // 确保不是已经回收的Bitmap
                    // 进行你需要的操作
                    Bitmap.createBitmap(bitmap).recycle();
                }
            }
        });
    }
    private void saveImageToGallery(Bitmap bitmap) {
        String path = MediaStore.Images.Media.insertImage(getContentResolver(), bitmap, "QRCode", null);
        if (path != null) {
            HdlThreadLogic.toast(_mActivity, getString(R.string.save_qr_code_successfully));
            // Toast.makeText(this, "保存成功", Toast.LENGTH_SHORT).show();
        } else {
            HdlThreadLogic.toast(_mActivity, getString(R.string.failed_to_save_qr_code));
            //Toast.makeText(this, "保存失败", Toast.LENGTH_SHORT).show();
        }
    }
    private void initView() {
        viewBinding.toolbarTopQrCodeRl.topTitleTv.setText(R.string.qr_code_business_card);
        viewBinding.toolbarTopQrCodeRl.topBackLl.setVisibility(View.VISIBLE);
app/src/main/res/drawable/user_management.png

app/src/main/res/layout/fragment_me.xml
@@ -37,16 +37,38 @@
            app:layout_constraintTop_toTopOf="parent" />
        <TextView
            android:id="@+id/fragment_me_user_name_iv"
            android:id="@+id/fragment_me_user_name_tv"
            android:layout_width="wrap_content"
            android:layout_height="25dp"
            android:layout_height="22dp"
            android:layout_marginTop="@dimen/dp_16"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_18"
            app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv"
            app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv"
            app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_iv" />
        <ImageView
            android:id="@+id/fragment_me_user_name_next_iv"
            android:layout_width="7dp"
            android:layout_height="@dimen/dp_12"
            android:layout_marginStart="@dimen/text_15"
            android:layout_marginTop="@dimen/dp_21"
            android:src="@drawable/next"
            app:layout_constraintStart_toEndOf="@+id/fragment_me_user_name_tv"
            app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_iv" />
        <TextView
            android:id="@+id/fragment_me_user_role_tv"
            android:layout_width="wrap_content"
            android:layout_height="17dp"
            android:layout_marginTop="@dimen/dp_11"
            android:textColor="@color/text_66000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv"
            app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv"
            app:layout_constraintTop_toBottomOf="@+id/fragment_me_user_name_tv" />
    </androidx.constraintlayout.widget.ConstraintLayout>
    <LinearLayout
        android:layout_width="match_parent"
@@ -59,6 +81,10 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_parent_cl">
        <!--主账号才显示-->
        <include
            android:id="@+id/fragment_me_line_user_management_il"
            layout="@layout/fragment_me_line" />
        <include
            android:id="@+id/fragment_me_line_set_il"
app/src/main/res/values/strings.xml
@@ -307,5 +307,8 @@
    <string name="device_off">设备已离线!</string>
    <string name="summarize">概览</string>
    <string name="qr_code_business_card">二维码名片</string>
    <string name="save_qr_code_successfully">保存二维码成功.</string>
    <string name="failed_to_save_qr_code">保存二维码失败.</string>
    <string name="staff_management">员工管理</string>
</resources>