From 1cf049f0bc8e6b817554581121842b978bedd97a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 04 六月 2024 15:40:40 +0800
Subject: [PATCH] 2024年06月04日15:40:31
---
app/src/main/res/drawable/qr_code.png | 0
app/src/main/res/values/strings.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java | 4
app/src/main/AndroidManifest.xml | 8 +
app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java | 83 +++++++++++
app/src/main/res/layout/general_line.xml | 47 +++---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 4
app/src/main/res/layout/activity_qr_code_main.xml | 49 +++++++
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 25 ++-
app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java | 109 +++++++++++++++
app/src/main/res/drawable/save_image.png | 0
app/src/main/res/layout/activity_bpersonal_data.xml | 46 ++++++
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 3
app/src/main/res/layout/activity_personal_data.xml | 2
14 files changed, 342 insertions(+), 39 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 89cfe76..80271eb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,12 @@
android:supportsRtl="true"
android:theme="@style/Theme.PhotovoltaicDebug">
<activity
+ android:name=".ui.me.QrCodeMainActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.me.BPersonalDataActivity"
+ android:exported="false" />
+ <activity
android:name=".ui.me.ContactUsActivity"
android:exported="false" />
<activity
@@ -122,7 +128,7 @@
android:name=".ui.me.AccountAndSecurityActivity"
android:exported="false" />
<activity
- android:name=".ui.me.PersonalDataActivity"
+ android:name=".ui.me.CPersonalDataActivity"
android:exported="false" />
<service android:name=".widget.apkwgtupload.ApkDownLoadService" />
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
index 9f08ae4..8faa1fe 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -667,6 +667,9 @@
UserConfigManage.getInstance().setUserId(obj.getUserId());//鐢ㄦ埛id
//b绔拰c绔畾涔夎处鍙峰瓧娈典笉涓�鏍�
UserConfigManage.getInstance().setAccount(TextUtils.isEmpty(obj.getAccount()) ? obj.getUserPhone() : obj.getAccount());//璐﹀彿
+ UserConfigManage.getInstance().setBingPhone(obj.getUserPhone());//缁戝畾鎵嬫満
+ UserConfigManage.getInstance().setBingEmail(obj.getUserEmail());//缁戝畾閭
+
UserConfigManage.getInstance().setUserName(obj.getName());
UserConfigManage.getInstance().setToken(obj.getAccessToken());//Token
UserConfigManage.getInstance().setHeaderPrefix(obj.getHeaderPrefix());//璁よ瘉璇锋眰澶村墠缂�(搴曞眰璇锋眰缁熶竴鍔�)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index e66c575..e9eabd1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -46,7 +46,7 @@
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
import com.hdl.photovoltaic.ui.me.AsRegardsActivity;
-import com.hdl.photovoltaic.ui.me.PersonalDataActivity;
+import com.hdl.photovoltaic.ui.me.CPersonalDataActivity;
import com.hdl.photovoltaic.ui.me.SetActivity;
import com.hdl.photovoltaic.ui.newC.MessageCenterList;
import com.hdl.photovoltaic.ui.newC.PowerStationsListEdit;
@@ -428,7 +428,7 @@
case HDLUniMP.UNI_EVENT_REPLY_MINE_EDIT_USER_INFO: {
Intent intent = new Intent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setClass(HDLApp.getInstance(), PersonalDataActivity.class);
+ intent.setClass(HDLApp.getInstance(), CPersonalDataActivity.class);
HDLApp.getInstance().startActivity(intent);
}
break;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
new file mode 100644
index 0000000..b239c73
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
@@ -0,0 +1,109 @@
+package com.hdl.photovoltaic.ui.me;
+
+import androidx.appcompat.content.res.AppCompatResources;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.databinding.ActivityBpersonalDataBinding;
+
+
+/**
+ * B绔釜浜鸿祫鏂欑殑鐣岄潰
+ */
+public class BPersonalDataActivity extends CustomBaseActivity {
+ private ActivityBpersonalDataBinding viewBinding;
+
+
+ @Override
+ public Object getContentView() {
+ viewBinding = ActivityBpersonalDataBinding.inflate(getLayoutInflater());
+ return viewBinding.getRoot();
+ }
+
+ @Override
+ public void onBindView(Bundle savedInstanceState) {
+ setNotificationBarBackgroundColor(CustomBaseActivity.CustomColor.white);
+ setStatusBarTextColor();
+ //鍒濆鍖�
+ initView();
+ //鍒濆鍖栫晫闈㈢洃鍚櫒
+ initEvent();
+ //鍒濆鍖栨暟鎹�
+ initData();
+ }
+
+ private void initData() {
+
+
+ }
+
+ private void initEvent() {
+
+ viewBinding.toolbarTopFragmentMeRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+// backPressedData();
+ finish();
+ }
+ });
+
+ viewBinding.personalDataQrCodeIl.getRoot().setOnClickListener(new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ startActivity(QrCodeMainActivity.class);
+
+ }
+ });
+
+
+ }
+
+ private void initView() {
+ viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me_personal_data);
+ 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);
+ viewBinding.personalDataUserNameIl.sllLlRlNameTv.setText(R.string.me_personal_data_user_name);
+ viewBinding.personalDataMailIl.sllLlRlNameTv.setText(R.string.home_login_email);
+ viewBinding.personalDataPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
+ viewBinding.personalDataQrCodeIl.sllLlRlNameTv.setText(R.string.qr_code_business_card);
+
+ viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
+ 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.sllLlRlRightNextIv.setVisibility(View.GONE);
+ viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+ viewBinding.personalDataPhoneIl.sllLlRlRightNextIv.setVisibility(View.GONE);
+ viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
+
+
+ viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.default_image));
+ 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();
+ viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setText(bingPhone);
+ viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));
+ }
+
+
+ /**
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+ */
+ @Override
+ public void onBackPressed() {
+ super.onBackPressed();
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
similarity index 99%
rename from app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
rename to app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
index 8884874..ef7d919 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
@@ -37,9 +37,9 @@
/**
- * 涓汉璧勬枡鐨勭晫闈�
+ * C绔釜浜鸿祫鏂欑殑鐣岄潰
*/
-public class PersonalDataActivity extends CustomBaseActivity {
+public class CPersonalDataActivity extends CustomBaseActivity {
private ActivityPersonalDataBinding viewBinding;
private CameraAlbumPopWindow cameraAlbumPopWindow;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
index 65e4f84..00d3660 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -162,17 +162,18 @@
@Override
public void onClick(View v) {
if (UserConfigManage.getInstance().isBAccount()) {
- //todo B绔笉鏀寔鏇存敼鏄电О
- HdlThreadLogic.toast(_mActivity, R.string.loading_not_supported);
- return;
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, BPersonalDataActivity.class);
+ startActivity(intent);
+ } else {
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, CPersonalDataActivity.class);
+ if (mC_UserInfo == null) {
+ mC_UserInfo = new CUserInfo();
+ }
+ intent.putExtra("memberHeadIcon", mC_UserInfo.getMemberHeadIcon());
+ startActivityForResult(intent, 10);
}
- Intent intent = new Intent();
- intent.setClass(_mActivity, PersonalDataActivity.class);
- if (mC_UserInfo == null) {
- mC_UserInfo = new CUserInfo();
- }
- intent.putExtra("memberHeadIcon", mC_UserInfo.getMemberHeadIcon());
- startActivityForResult(intent, 10);
}
});
viewBinding.fragmentMeLineSetIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
@@ -224,6 +225,10 @@
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //B绔笉闇�瑕佹洿鏂�
+ return;
+ }
if (requestCode == 10 && resultCode == 10) {
if (data != null) {
String iconUrl = data.getStringExtra("memberHeadIcon");
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
new file mode 100644
index 0000000..276831b
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
@@ -0,0 +1,83 @@
+package com.hdl.photovoltaic.ui.me;
+
+
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+
+import androidx.appcompat.content.res.AppCompatResources;
+
+import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.databinding.ActivityQrCodeMainBinding;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
+
+/**
+ * 浜岀淮鐮佸悕鐗囩殑鐣岄潰
+ */
+public class QrCodeMainActivity extends CustomBaseActivity {
+ ActivityQrCodeMainBinding viewBinding;
+
+ @Override
+ public Object getContentView() {
+ viewBinding = ActivityQrCodeMainBinding.inflate(getLayoutInflater());
+ return viewBinding.getRoot();
+ }
+
+ @Override
+ public void onBindView(Bundle savedInstanceState) {
+ setNotificationBarBackgroundColor(CustomBaseActivity.CustomColor.white);
+ setStatusBarTextColor();
+ //鍒濆鍖�
+ initView();
+ //鍒濆鍖栫晫闈㈢洃鍚櫒
+ initEvent();
+ //鍒濆鍖栨暟鎹�
+ initData();
+ }
+
+ private void initData() {
+ }
+
+
+ private void initEvent() {
+ viewBinding.toolbarTopQrCodeRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+
+ viewBinding.toolbarTopQrCodeRl.topMoreBtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ }
+ });
+
+ }
+
+ private void initView() {
+ viewBinding.toolbarTopQrCodeRl.topTitleTv.setText(R.string.qr_code_business_card);
+ viewBinding.toolbarTopQrCodeRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopQrCodeRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
+ viewBinding.toolbarTopQrCodeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.toolbarTopQrCodeRl.topMoreIv.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopQrCodeRl.topMoreIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.save_image));
+ if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserName())) {
+ viewBinding.userNameTv.setVisibility(View.VISIBLE);
+ viewBinding.userNameTv.setText(UserConfigManage.getInstance().getUserName());
+ }
+ String str = TextUtils.isEmpty(UserConfigManage.getInstance().getBingPhone()) ? UserConfigManage.getInstance().getBingEmail() : UserConfigManage.getInstance().getBingPhone();
+ if (!TextUtils.isEmpty(str)) {
+ viewBinding.userAccountTv.setVisibility(View.VISIBLE);
+ viewBinding.userAccountTv.setText(str);
+ }
+ String content = UserConfigManage.getInstance().getAccount();
+ Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 229, 229, "UTF-8", "H", "1", Color.BLACK, Color.WHITE);
+ viewBinding.qrCodeIv.setImageBitmap(bitmap);
+
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/qr_code.png b/app/src/main/res/drawable/qr_code.png
new file mode 100644
index 0000000..c709a2d
--- /dev/null
+++ b/app/src/main/res/drawable/qr_code.png
Binary files differ
diff --git a/app/src/main/res/drawable/save_image.png b/app/src/main/res/drawable/save_image.png
new file mode 100644
index 0000000..127bdef
--- /dev/null
+++ b/app/src/main/res/drawable/save_image.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_bpersonal_data.xml b/app/src/main/res/layout/activity_bpersonal_data.xml
new file mode 100644
index 0000000..2b5c783
--- /dev/null
+++ b/app/src/main/res/layout/activity_bpersonal_data.xml
@@ -0,0 +1,46 @@
+<?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.BPersonalDataActivity">
+
+ <include
+ android:id="@+id/toolbar_top_fragment_me_rl"
+ layout="@layout/toolbar_top_view_52" />
+
+ <LinearLayout
+ android:id="@+id/personal_data_ll"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_12"
+ android:background="@color/text_FFFFFFFF"
+ android:orientation="vertical"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_me_rl">
+
+ <include
+ android:id="@+id/personal_data_user_portrait_il"
+ layout="@layout/general_line" />
+
+ <include
+ android:id="@+id/personal_data_user_name_il"
+ layout="@layout/general_line" />
+
+ <include
+ android:id="@+id/personal_data_mail_il"
+ layout="@layout/general_line" />
+
+ <include
+ android:id="@+id/personal_data_phone_il"
+ layout="@layout/general_line" />
+
+ <include
+ android:id="@+id/personal_data_qr_code_il"
+ layout="@layout/general_line" />
+ </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_personal_data.xml b/app/src/main/res/layout/activity_personal_data.xml
index 9929f29..c70cd73 100644
--- a/app/src/main/res/layout/activity_personal_data.xml
+++ b/app/src/main/res/layout/activity_personal_data.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/text_F5F7FA"
- tools:context=".ui.me.PersonalDataActivity">
+ tools:context=".ui.me.CPersonalDataActivity">
<include
android:id="@+id/toolbar_top_fragment_me_rl"
diff --git a/app/src/main/res/layout/activity_qr_code_main.xml b/app/src/main/res/layout/activity_qr_code_main.xml
new file mode 100644
index 0000000..77ede1c
--- /dev/null
+++ b/app/src/main/res/layout/activity_qr_code_main.xml
@@ -0,0 +1,49 @@
+<?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"
+ tools:context=".ui.me.QrCodeMainActivity">
+
+ <include
+ android:id="@+id/toolbar_top_qr_code_rl"
+ layout="@layout/toolbar_top_view_52" />
+
+
+ <ImageView
+ android:id="@+id/qr_code_iv"
+ android:layout_width="229dp"
+ android:layout_height="229dp"
+ android:layout_marginStart="38.5dp"
+ android:layout_marginTop="65.5dp"
+ android:layout_marginEnd="38.5dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_qr_code_rl" />
+
+ <TextView
+ android:id="@+id/user_name_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_16"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_14"
+ android:visibility="gone"
+ app:layout_constraintEnd_toEndOf="@+id/qr_code_iv"
+ app:layout_constraintStart_toStartOf="@+id/qr_code_iv"
+ app:layout_constraintTop_toBottomOf="@+id/qr_code_iv" />
+
+ <TextView
+ android:id="@+id/user_account_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_16"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_14"
+ android:visibility="gone"
+ app:layout_constraintEnd_toEndOf="@+id/user_name_tv"
+ app:layout_constraintStart_toStartOf="@+id/user_name_tv"
+ app:layout_constraintTop_toBottomOf="@+id/user_name_tv" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/general_line.xml b/app/src/main/res/layout/general_line.xml
index 6488e4a..e943c23 100644
--- a/app/src/main/res/layout/general_line.xml
+++ b/app/src/main/res/layout/general_line.xml
@@ -24,29 +24,6 @@
/>
- <LinearLayout
- android:id="@+id/sll_ll_rl_right_icon_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/sll_ll_rl_right_next_iv"
- android:layout_width="@dimen/dp_16"
- android:layout_height="@dimen/dp_16"
- android:src="@drawable/next" />
- <!--鐗规畩鍥炬爣-->
- <ImageView
- android:id="@+id/sll_ll_rl_right_switch_iv"
- android:layout_width="@dimen/dp_57"
- android:layout_height="@dimen/dp_31"
- android:src="@drawable/switch_on_off"
- android:visibility="gone" />
-
-
- </LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
@@ -82,6 +59,30 @@
android:visibility="gone" />
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/sll_ll_rl_right_icon_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/sll_ll_rl_right_next_iv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:src="@drawable/next" />
+ <!--鐗规畩鍥炬爣-->
+ <ImageView
+ android:id="@+id/sll_ll_rl_right_switch_iv"
+ android:layout_width="@dimen/dp_57"
+ android:layout_height="@dimen/dp_31"
+ android:src="@drawable/switch_on_off"
+ android:visibility="gone" />
+
+
+ </LinearLayout>
+
<!--搴曢儴鐨勭嚎,榛樿闅愯棌-->
<View
android:id="@+id/line_v"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c8f526f..f08de17 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -306,5 +306,6 @@
<string name="number">妫�</string>
<string name="device_off">璁惧宸茬绾�!</string>
<string name="summarize">姒傝</string>
+ <string name="qr_code_business_card">浜岀淮鐮佸悕鐗�</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0