From 014d6eb06e74ac10932621f44ba40f93e3518c82 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 18 七月 2024 16:15:37 +0800 Subject: [PATCH] 2024年07月18日16:15:31 --- app/src/main/res/layout/fragment_me.xml | 22 ++++++++--- app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 14 ++++++- app/src/main/res/layout/item_station.xml | 6 ++- app/src/main/res/values/styles.xml | 3 - app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java | 3 + app/src/main/res/layout/item_plant_details.xml | 1 app/src/main/res/layout/item_device_details.xml | 58 ++++++++++++++++------------- app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 4 +- app/src/main/res/drawable/next.png | 0 app/src/main/res/layout/fragment_me_line.xml | 4 +- 10 files changed, 72 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java index f6e3974..152caa5 100644 --- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -134,7 +134,7 @@ // CrashReport.initCrashReport(this, Constant.BUGLY_APP_ID, true); //6.鍒濆鍖朌CUniMPSDK initDCUniMPSDK(); -// this.initUniMqtt();//濡傛灉鏄儴缃插埌/鎵嬫満涓婃寮忎娇鐢紝娉ㄩ噴鎺夎繖琛屼唬鐮佸氨鍙� + this.initUniMqtt();//濡傛灉鏄儴缃插埌/鎵嬫満涓婃寮忎娇鐢紝娉ㄩ噴鎺夎繖琛屼唬鐮佸氨鍙� // //7.鍒濆鍖栬嚜瀹氫箟IconToast // ToastUtils.getInstance().initIconToast(this); // //8.瀵筬astjson杩涜璁剧疆锛岃В鍐砯astjosn杞崲鎴愬瓧绗︿覆鏃堕瀛楁瘝澶у皬鍐欓棶棰� @@ -343,7 +343,7 @@ */ private void initUniMqtt() { try { - String ip = "10.10.35.79";//NetworkUtils.getIPAddress(this); + String ip = "192.168.1.100";//NetworkUtils.getIPAddress(this); if (TextUtils.isEmpty(ip)) { return; } 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 index d8886e1..9768b01 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java @@ -89,10 +89,13 @@ viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.default_image)); viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getUserName()); + viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_E6000000)); String bingEmail = TextUtils.isEmpty(UserConfigManage.getInstance().getBingEmail()) ? _mActivity.getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingEmail(); viewBinding.personalDataMailIl.sllLlRlRightContentTv.setText(bingEmail); + viewBinding.personalDataMailIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_E6000000)); String bingPhone = TextUtils.isEmpty(UserConfigManage.getInstance().getBingPhone()) ? _mActivity.getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingPhone(); viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setText(bingPhone); + viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_E6000000)); viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code)); } 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 75b4d57..12fa3e5 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 @@ -289,9 +289,13 @@ */ private void setMemberName(String userName) { if (TextUtils.isEmpty(userName)) { - userName = "--"; + viewBinding.fragmentMeUserNameTv.setVisibility(View.GONE); + viewBinding.fragmentMeUserNameNextIv.setVisibility(View.GONE); + } else { + viewBinding.fragmentMeUserNameTv.setVisibility(View.VISIBLE); + viewBinding.fragmentMeUserNameNextIv.setVisibility(View.VISIBLE); + viewBinding.fragmentMeUserNameTv.setText(userName); } - viewBinding.fragmentMeUserNameTv.setText(userName); } @@ -300,6 +304,12 @@ * 鏄剧ず璐﹀彿 */ private void setMemberAccount(String userAccount) { + if (viewBinding.fragmentMeUserNameTv.getVisibility() == View.VISIBLE) { + viewBinding.fragmentMeUserRoleNextIv.setVisibility(View.GONE); + } else { + viewBinding.fragmentMeUserRoleNextIv.setVisibility(View.VISIBLE); + } + if (TextUtils.isEmpty(userAccount)) { userAccount = "--"; } diff --git a/app/src/main/res/drawable/next.png b/app/src/main/res/drawable/next.png index ca6d8a3..8f6aec2 100644 --- a/app/src/main/res/drawable/next.png +++ b/app/src/main/res/drawable/next.png Binary files differ diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index aa3b0da..4cd9236 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -9,7 +9,7 @@ <TextView android:id="@+id/me_title_tv" android:layout_width="wrap_content" - android:layout_height="@dimen/dp_22" + android:layout_height="@dimen/dp_25" android:layout_marginTop="53dp" android:text="@string/me" android:textColor="@color/text_030D1C" @@ -22,7 +22,7 @@ android:id="@+id/fragment_me_icon_parent_cl" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_31" + android:layout_marginTop="@dimen/dp_20" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/me_title_tv"> @@ -49,9 +49,9 @@ <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_width="16dp" + android:layout_height="@dimen/dp_16" + android:layout_marginStart="3dp" android:src="@drawable/next" app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_name_tv" app:layout_constraintStart_toEndOf="@+id/fragment_me_user_name_tv" @@ -67,6 +67,16 @@ 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" /> + + <ImageView + android:id="@+id/fragment_me_user_role_next_iv" + android:layout_width="@dimen/dp_16" + android:layout_height="@dimen/dp_16" + android:layout_marginStart="3dp" + android:src="@drawable/next" + app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_role_tv" + app:layout_constraintStart_toEndOf="@+id/fragment_me_user_role_tv" + app:layout_constraintTop_toTopOf="@+id/fragment_me_user_role_tv" /> </androidx.constraintlayout.widget.ConstraintLayout> @@ -74,7 +84,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginStart="@dimen/dp_20" - android:layout_marginTop="@dimen/dp_48" + android:layout_marginTop="@dimen/dp_25" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/bj_13fffffff" android:orientation="vertical" diff --git a/app/src/main/res/layout/fragment_me_line.xml b/app/src/main/res/layout/fragment_me_line.xml index 77b8bd2..550926d 100644 --- a/app/src/main/res/layout/fragment_me_line.xml +++ b/app/src/main/res/layout/fragment_me_line.xml @@ -29,8 +29,8 @@ <ImageView android:id="@+id/fragment_me_line_right_icon_iv" - android:layout_width="@dimen/dp_7" - android:layout_height="@dimen/dp_12" + android:layout_width="@dimen/dp_16" + android:layout_height="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_23" android:src="@drawable/next" app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv" diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml index a58b8f8..8a7ce61 100644 --- a/app/src/main/res/layout/item_device_details.xml +++ b/app/src/main/res/layout/item_device_details.xml @@ -68,6 +68,7 @@ android:layout_below="@+id/device_details_image_iv" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_17" + android:layout_marginEnd="@dimen/dp_16" android:orientation="horizontal"> <LinearLayout @@ -81,7 +82,8 @@ android:id="@+id/device_label_run_state_value_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_18" - android:gravity="center" + android:gravity="start" + android:text="0" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" /> @@ -90,7 +92,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_17" android:layout_marginTop="3dp" - android:gravity="center" + android:gravity="start" android:text="@string/device_run_state" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> @@ -136,7 +138,7 @@ android:id="@+id/device_label_day_value_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_18" - android:gravity="center" + android:gravity="end" android:text="0" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" /> @@ -146,7 +148,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_17" android:layout_marginTop="3dp" - android:gravity="center" + android:gravity="end" android:text="@string/day_power_generation" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> @@ -165,30 +167,34 @@ android:layout_marginTop="@dimen/dp_8" android:layout_marginEnd="@dimen/dp_16" android:background="@color/text_E1E1E1" /> - - <ImageView - android:id="@+id/device_label_location_iv" - android:layout_width="@dimen/dp_19" - android:layout_height="@dimen/dp_19" + <!--鐢电珯鍦板潃--> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="@dimen/dp_33" android:layout_below="@+id/line" - android:layout_marginStart="@dimen/dp_11" - android:layout_marginTop="@dimen/dp_7" - android:src="@drawable/location" /> + android:layout_marginStart="11dp"> - <TextView - android:id="@+id/device_label_location_tv" - android:layout_width="290dp" - android:layout_height="@dimen/dp_19" - android:layout_below="@+id/line" - android:layout_marginStart="@dimen/dp_3" - android:layout_marginTop="@dimen/dp_8" - android:layout_toEndOf="@+id/device_label_location_iv" - android:ellipsize="end" - android:gravity="center_vertical|start" - android:singleLine="true" - android:text="@string/power_station" - android:textColor="@color/text_66000000" - android:textSize="@dimen/text_12" /> + <ImageView + android:id="@+id/device_label_location_iv" + android:layout_width="@dimen/dp_19" + android:layout_height="@dimen/dp_19" + android:layout_centerVertical="true" + android:src="@drawable/location" /> + + <TextView + android:id="@+id/device_label_location_tv" + android:layout_width="290dp" + android:layout_height="@dimen/dp_17" + android:layout_centerVertical="true" + android:layout_toEndOf="@+id/device_label_location_iv" + android:ellipsize="end" + android:gravity="center_vertical|start" + android:singleLine="true" + android:text="@string/power_station" + android:textColor="@color/text_66000000" + android:textSize="@dimen/text_12" /> + </RelativeLayout> + <TextView android:id="@+id/device_label_state_tv" diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml index 673daee..a3be9b4 100644 --- a/app/src/main/res/layout/item_plant_details.xml +++ b/app/src/main/res/layout/item_plant_details.xml @@ -197,7 +197,6 @@ android:layout_width="290dp" android:layout_height="@dimen/dp_17" android:layout_centerVertical="true" - android:layout_marginStart="@dimen/dp_5" android:layout_toEndOf="@+id/plant_details_location_iv" android:ellipsize="end" android:gravity="center_vertical|start" diff --git a/app/src/main/res/layout/item_station.xml b/app/src/main/res/layout/item_station.xml index 86b8ae3..7305f46 100644 --- a/app/src/main/res/layout/item_station.xml +++ b/app/src/main/res/layout/item_station.xml @@ -19,8 +19,10 @@ android:id="@+id/station_total_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_25" - android:layout_marginTop="7dp" + android:layout_marginTop="4dp" android:gravity="center" + android:paddingTop="@dimen/dp_0" + android:paddingBottom="@dimen/dp_0" android:text="0" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" @@ -29,7 +31,7 @@ <TextView android:id="@+id/station_title_tv" android:layout_width="match_parent" - android:layout_height="@dimen/dp_17" + android:layout_height="@dimen/dp_20" android:layout_marginTop="1dp" android:gravity="center" android:text="state" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index cfda390..ee589d7 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -32,9 +32,8 @@ <style name="Text16Style"> <item name="android:textSize">@dimen/text_16</item> <item name="android:textColor">@color/text_66000000</item> + <item name="android:textStyle">normal</item> </style> - - </resources> \ No newline at end of file -- Gitblit v1.8.0