From 39b39504ac9844630777558843be7c13aff30dfa Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 17 七月 2024 18:09:01 +0800
Subject: [PATCH] 2024年07月17日18:08:36
---
app/src/main/java/com/hdl/photovoltaic/utils/UnitConversionUtils.java | 15 ++
app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java | 1
app/src/main/res/layout/dialog_type_title_list.xml | 24 ---
app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java | 21 +++
app/src/main/res/values/themes.xml | 3
app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java | 70 +++--------
app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java | 1
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java | 7 +
app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java | 19 ++
app/src/main/res/layout/dialog_type_title_list_b.xml | 29 +---
app/src/main/res/layout/item_message.xml | 1
app/src/main/res/layout/item_message_c.xml | 8
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 4
app/src/main/res/layout/dialog_list.xml | 39 ++---
app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java | 2
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationTipDialog.java | 12 ++
app/src/main/res/layout/dialog_confirmation_tip.xml | 11 +
app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java | 44 +++----
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 1
app/src/main/res/drawable/ffffff_18.xml | 7 +
app/src/main/res/layout/activity_message_center_list.xml | 8
21 files changed, 164 insertions(+), 163 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java
index 6d4493e..48d8233 100644
--- a/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java
@@ -171,6 +171,7 @@
public int dip2px(float dpValue) {
final float scale = getResources().getDisplayMetrics().density;
return (int) (dpValue * scale + 0.5f);
+
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java
index 4afe44c..92c7c21 100644
--- a/app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseDialog.java
@@ -4,11 +4,16 @@
import android.app.Dialog;
import android.content.Context;
import android.graphics.Color;
+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.utils.UnitConversionUtils;
import com.jaeger.library.StatusBarUtil;
public class BaseDialog extends Dialog {
@@ -18,8 +23,20 @@
public BaseDialog(@NonNull Context context, int themeResId) {
super(context, themeResId);
this.mContext = context;
- setStatusBarTextColor();
- setNotificationBarBackgroundColor(CustomColor.white);
+// setStatusBarTextColor();
+// setNotificationBarBackgroundColor(CustomColor.white);
+ // 璁剧疆Dialog鐨刉indow灞炴��
+ Window window = getWindow();
+ if (window != null) {
+ window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+// WindowManager.LayoutParams layoutParams = window.getAttributes();
+// layoutParams.gravity=Gravity.TOP;
+// layoutParams.y = (int) UnitConversionUtils.dpToPx(context, 125-44);
+// window.setAttributes(layoutParams);
+ }
+ setCanceledOnTouchOutside(true);
+
+
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index 0b9fd3d..0dfa869 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -280,6 +280,7 @@
confirmationCancelDialog.setContent(getString(R.string.no_permissions_unable_to_receive_push));
confirmationCancelDialog.setConfirmation(getString(R.string.go_to_settings));
confirmationCancelDialog.show();
+ confirmationCancelDialog.isHideTitle(true);
confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
@@ -775,10 +776,10 @@
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
// 鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
- confirmationCancelDialog.setTitle(getString(R.string.loading_title_tip));
confirmationCancelDialog.setContent(getString(R.string.system_positioning_switch));
confirmationCancelDialog.setConfirmation(getString(R.string.go_to_settings));
confirmationCancelDialog.show();
+ confirmationCancelDialog.isHideTitle(true);
confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
@@ -810,6 +811,7 @@
dialog.setTitle(getString(R.string.loading_title_tip));
dialog.setContent(getString(R.string.port_conflict));
dialog.setConfirmation(getString(R.string.home_login_affirm));
+ dialog.isHideTitle(true);
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
index e35da67..9dea7cb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
@@ -108,6 +108,7 @@
dialog.setTitle(getString(R.string.loading_title_tip));
dialog.setContent(getString(R.string.loading_app_restart));
dialog.show();
+ dialog.isHideTitle(true);
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
index e5e7875..79c6194 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
@@ -288,7 +288,7 @@
viewBinding.toolbarTopMessageCenterListRl.topMoreBtn.setVisibility(View.VISIBLE);
viewBinding.toolbarTopMessageCenterListRl.topMoreIv.setImageResource(R.drawable.clearall);
//榛樿閫変腑鍏ㄩ儴璁惧
- viewBinding.allDeviceTitleIv.setBackgroundResource(R.drawable.up);
+ viewBinding.allDeviceTitleIv.setBackgroundResource(R.drawable.down);
viewBinding.allGradeTitleIv.setBackgroundResource(R.drawable.down);
viewBinding.allTimeTitleIv.setBackgroundResource(R.drawable.down);
refreshBottomStyle(true);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
index ac55b8b..6493916 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
@@ -290,6 +290,7 @@
dialog.setTitle(getString(R.string.loading_title_tip));
dialog.setContent(getString(R.string.switch_power_station).replace("%s", "\"" + houseIdBean.getHomeName() + "\""));
dialog.show();
+ dialog.isHideTitle(true);
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/UnitConversionUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/UnitConversionUtils.java
index 2729629..cd1bafb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/UnitConversionUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/UnitConversionUtils.java
@@ -1,6 +1,9 @@
package com.hdl.photovoltaic.utils;
+import android.content.Context;
+import android.content.res.Resources;
+
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
@@ -15,6 +18,16 @@
*/
public class UnitConversionUtils {
-
+ /**
+ * 灏哾p鍊艰浆鎹负px
+ *
+ * @param context 涓婁笅闂綘
+ * @param dp 鍊�
+ * @return px
+ */
+ public static float dpToPx(Context context, float dp) {
+ Resources resources = context.getResources();
+ return dp * resources.getDisplayMetrics().density;
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java
index 8668333..e51be8c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java
@@ -1,10 +1,11 @@
package com.hdl.photovoltaic.widget;
-import android.annotation.SuppressLint;
-import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
-import android.view.View;
+import android.view.Gravity;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -12,6 +13,7 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogTypeTitleListBBinding;
+import com.hdl.photovoltaic.utils.UnitConversionUtils;
import com.hdl.photovoltaic.widget.adapter.TypeListDialogAdapter;
import java.util.List;
@@ -27,21 +29,30 @@
private List<String> mList;
- public BTypeTitleListDialog(@NonNull Context context, List<String> list,String selectType) {
+ public BTypeTitleListDialog(@NonNull Context context, List<String> list, String selectType) {
super(context, R.style.Custom_Dialog);
this.mContext = context;
this.mList = list;
- this.mSelectType=selectType;
+ this.mSelectType = selectType;
}
@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.START | Gravity.TOP;
+ layoutParams.width = (int) UnitConversionUtils.dpToPx(mContext, 375 - 32);
+ layoutParams.x = (int) UnitConversionUtils.dpToPx(mContext, 16);
+ layoutParams.y = (int) UnitConversionUtils.dpToPx(mContext, 200);
+ window.setAttributes(layoutParams);
+ }
viewBinding = DialogTypeTitleListBBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
- setDialogTouchOutsideCloseable(this);
LinearLayoutManager linearLayout = new LinearLayoutManager(mContext);
- typeListDialogAdapter = new TypeListDialogAdapter(this.mList, mContext,this.mSelectType);
+ typeListDialogAdapter = new TypeListDialogAdapter(this.mList, mContext, this.mSelectType);
viewBinding.typeListRl.setLayoutManager(linearLayout);
viewBinding.typeListRl.setAdapter(typeListDialogAdapter);
typeListDialogAdapter.setItemOnclickListener(new TypeListDialogAdapter.OnclickListener() {
@@ -58,54 +69,9 @@
@Override
protected void onStart() {
super.onStart();
-// // 鑾峰彇绐楀彛瀵硅薄
-// Window dialogWindow = this.getWindow();
-// if (dialogWindow != null) {
-// // 鑾峰彇瀵硅瘽妗嗗綋鍓嶇殑鍙傛暟鍊�
-// WindowManager.LayoutParams p = dialogWindow.getAttributes();
-// p.width = LinearLayout.LayoutParams.MATCH_PARENT;
-// p.height = LinearLayout.LayoutParams.WRAP_CONTENT;
-//// p.dimAmount = 0.6f;
-// dialogWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-// p.gravity = Gravity.BOTTOM;
-// p.y = DensityUtils.dip2px(mContext, 352);
-//// //杩欓噷璁剧疆鐨勫楂樹紭鍏堢骇楂樹簬XML涓殑甯冨眬璁剧疆
-//// if (this.enumBoxType == BoxType.PhotoAlbumBox) {
-//// p.gravity = Gravity.BOTTOM;
-//// } else if (this.enumBoxType == BoxType.FlashingBox) {
-//// p.dimAmount = 0f;
-//// }
-// // 璁剧疆鍒板睘鎬ч厤缃腑
-// dialogWindow.setAttributes(p);
-// }
-// setDialogTouchOutsideCloseable(this);
}
- @SuppressLint("ClickableViewAccessibility")
- public void setDialogTouchOutsideCloseable(Dialog dialog) {
- viewBinding.typeParentCl.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- int top = viewBinding.dialogParentCl.getTop();
- int left = viewBinding.dialogParentCl.getLeft();
- int bottom = viewBinding.dialogParentCl.getBottom();
- int right = viewBinding.dialogParentCl.getRight();
- int y = (int) v.getY();
- int x = (int) v.getX();
- if (top < y && y < bottom) {
- } else {
- dismiss();
- }
- if (left < x && x < right) {
-
- } else {
- dismiss();
- }
-
- }
- });
- }
public void setOnListener(OnClickListener onClickListener) {
this.mOnClickListener = onClickListener;
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
index f2494f3..a5cba25 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
@@ -4,7 +4,10 @@
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.widget.TextView;
import androidx.annotation.NonNull;
@@ -34,9 +37,10 @@
super.onCreate(savedInstanceState);
viewBinding = DialogConfirmCancelBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
+
// setCancelable(true);//绯荤粺鍚庨��鍙互鍙栨秷
//绌虹櫧澶勪笉鑳藉彇娑堝姩鐢�
- setCanceledOnTouchOutside(false);
+// setCanceledOnTouchOutside(false);
//鍒濆鍖栫晫闈㈡帶浠�
initView();
//鍒濆鍖栫晫闈㈡暟鎹�
@@ -124,6 +128,7 @@
viewBinding.loadingConfirmationContentTv.setText(contentStr);
}
}
+
public TextView getContentTextView() {
if (viewBinding == null) {
return null;
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationTipDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationTipDialog.java
index 2b39bd7..483536f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationTipDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationTipDialog.java
@@ -74,6 +74,18 @@
}
+ /**
+ * 闅愯棌鑷畾涔�"鏍囬"缁勪欢
+ *
+ * @param isHideTitle true 闅愯棌
+ */
+ public void isHideTitle(boolean isHideTitle) {
+ if (isHideTitle) {
+ if (viewBinding != null) {
+ viewBinding.titleTv.setVisibility(View.GONE);
+ }
+ }
+ }
/**
* 鑷畾涔�"鍐呭"鏂囨湰
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
index 6fe6789..8916d08 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
@@ -4,7 +4,11 @@
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
+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 androidx.recyclerview.widget.LinearLayoutManager;
@@ -15,6 +19,7 @@
import com.hdl.photovoltaic.databinding.DialogListBinding;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
import com.hdl.photovoltaic.utils.LocalManageUtil;
+import com.hdl.photovoltaic.utils.UnitConversionUtils;
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
import java.util.List;
@@ -41,9 +46,20 @@
@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.START | Gravity.TOP;
+ layoutParams.width = (int) UnitConversionUtils.dpToPx(mContext, 140);
+ layoutParams.x = (int) UnitConversionUtils.dpToPx(mContext, 20);
+ layoutParams.y = (int) UnitConversionUtils.dpToPx(mContext, 84);
+ window.setAttributes(layoutParams);
+ }
+
viewBinding = DialogListBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
- setDialogTouchOutsideCloseable(this);
initData();
LinearLayoutManager linearLayout = new LinearLayoutManager(mContext);
listDialogAdapter = new ListDialogAdapter(this.list, mContext);
@@ -92,9 +108,9 @@
private void languageSelectionDialog(int position, LanguageAdapter.ItemData itemData) {
ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(this.mContext);
- dialog.setTitle(this.mContext.getString(R.string.loading_title_tip));
dialog.setContent(this.mContext.getString(R.string.loading_app_restart));
dialog.show();
+ dialog.isHideTitle(true);
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
@@ -122,28 +138,4 @@
}
- @SuppressLint("ClickableViewAccessibility")
- public void setDialogTouchOutsideCloseable(Dialog dialog) {
- viewBinding.getRoot().setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- int top = viewBinding.dialogParent.getTop();
- int left = viewBinding.dialogParent.getLeft();
- int bottom = viewBinding.dialogParent.getBottom();
- int right = viewBinding.dialogParent.getRight();
- int y = (int) v.getY();
- int x = (int) v.getX();
- if (top < y && y < bottom) {
- } else {
- dismiss();
- }
- if (left < x && x < right) {
-
- } else {
- dismiss();
- }
-
- }
- });
- }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java
index 8291962..1c69bd6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java
@@ -20,6 +20,7 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogTypeTitleListBinding;
+import com.hdl.photovoltaic.utils.UnitConversionUtils;
import com.hdl.photovoltaic.widget.adapter.TypeListDialogAdapter;
import java.util.List;
@@ -48,6 +49,16 @@
@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.START | Gravity.TOP;
+ layoutParams.width = (int) UnitConversionUtils.dpToPx(mContext, 375 - 32);
+ layoutParams.x = (int) UnitConversionUtils.dpToPx(mContext, 16);
+ layoutParams.y = (int) UnitConversionUtils.dpToPx(mContext, 130);
+ window.setAttributes(layoutParams);
+ }
viewBinding = DialogTypeTitleListBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
setDialogTouchOutsideCloseable(this);
@@ -98,10 +109,10 @@
viewBinding.typeParentCl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- int top = viewBinding.dialogParentCl.getTop();
- int left = viewBinding.dialogParentCl.getLeft();
- int bottom = viewBinding.dialogParentCl.getBottom();
- int right = viewBinding.dialogParentCl.getRight();
+ int top = viewBinding.typeParentCl.getTop();
+ int left = viewBinding.typeParentCl.getLeft();
+ int bottom = viewBinding.typeParentCl.getBottom();
+ int right = viewBinding.typeParentCl.getRight();
int y = (int) v.getY();
int x = (int) v.getX();
if (top < y && y < bottom) {
diff --git a/app/src/main/res/drawable/ffffff_18.xml b/app/src/main/res/drawable/ffffff_18.xml
new file mode 100644
index 0000000..7f057f1
--- /dev/null
+++ b/app/src/main/res/drawable/ffffff_18.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners
+ android:topLeftRadius="@dimen/dp_18"
+ android:topRightRadius="@dimen/text_18" />
+ <solid android:color="@color/text_FFFFFFFF" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_message_center_list.xml b/app/src/main/res/layout/activity_message_center_list.xml
index 8004210..6203914 100644
--- a/app/src/main/res/layout/activity_message_center_list.xml
+++ b/app/src/main/res/layout/activity_message_center_list.xml
@@ -50,7 +50,7 @@
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_7"
- android:background="@drawable/up"
+ android:background="@drawable/down"
app:layout_constraintBottom_toBottomOf="@+id/all_device_title_tv"
app:layout_constraintStart_toEndOf="@+id/all_device_title_tv"
app:layout_constraintTop_toTopOf="@+id/all_device_title_tv" />
@@ -155,15 +155,15 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/message_bottom_cl"
android:layout_width="match_parent"
- android:layout_height="82dp"
- android:background="@color/text_FFFFFFFF"
+ android:layout_height="64dp"
+ android:background="@drawable/ffffff_18"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_49"
+ android:layout_height="@dimen/dp_47"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_confirmation_tip.xml b/app/src/main/res/layout/dialog_confirmation_tip.xml
index 094f768..3622d70 100644
--- a/app/src/main/res/layout/dialog_confirmation_tip.xml
+++ b/app/src/main/res/layout/dialog_confirmation_tip.xml
@@ -8,7 +8,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="280dp"
- android:layout_height="229dp"
+ android:layout_height="wrap_content"
android:background="@drawable/confirmation_bj"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -58,8 +58,8 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_20"
- android:singleLine="false"
android:gravity="center"
+ android:singleLine="false"
android:textColor="@color/text_030D1C"
android:textSize="12sp"
android:visibility="gone"
@@ -81,5 +81,12 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/content_cl" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_16"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/comfirm_tv" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_list.xml b/app/src/main/res/layout/dialog_list.xml
index 7898d71..9b93fc6 100644
--- a/app/src/main/res/layout/dialog_list.xml
+++ b/app/src/main/res/layout/dialog_list.xml
@@ -1,30 +1,23 @@
<?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"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/text_60000000">
+ android:id="@+id/dialog_parent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/language_bj"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/dialog_parent"
- android:layout_width="140.5dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="20dp"
- android:layout_marginTop="40dp"
- android:layout_marginEnd="174dp"
- android:background="@drawable/language_bj"
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/logic_rcv"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/dp_6"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ app:layout_constraintTop_toTopOf="parent"
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/logic_rcv"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginTop="@dimen/dp_6"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ />
+</androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_type_title_list.xml b/app/src/main/res/layout/dialog_type_title_list.xml
index b47740d..46cb140 100644
--- a/app/src/main/res/layout/dialog_type_title_list.xml
+++ b/app/src/main/res/layout/dialog_type_title_list.xml
@@ -3,26 +3,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/type_parent_cl"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/loading_ffffffff_4">
- >
-
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/dialog_parent_cl"
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/type_list_rl"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="103dp"
- android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/loading_ffffffff_4"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/type_list_rl"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ android:layout_height="match_parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_type_title_list_b.xml b/app/src/main/res/layout/dialog_type_title_list_b.xml
index 1f27f4d..7057b12 100644
--- a/app/src/main/res/layout/dialog_type_title_list_b.xml
+++ b/app/src/main/res/layout/dialog_type_title_list_b.xml
@@ -1,28 +1,17 @@
<?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"
- android:id="@+id/type_parent_cl"
+ android:id="@+id/dialog_parent_cl"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/loading_ffffffff_4"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
- >
-
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/dialog_parent_cl"
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/type_list_rl"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="165dp"
- android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/loading_ffffffff_4"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/type_list_rl"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ android:layout_height="match_parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 701cd92..d5f654c 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -9,7 +9,6 @@
android:layout_height="@dimen/dp_99"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
- android:layout_marginBottom="@dimen/dp_16"
android:background="@drawable/house_list_line_parent_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_message_c.xml b/app/src/main/res/layout/item_message_c.xml
index f5469ad..31befe1 100644
--- a/app/src/main/res/layout/item_message_c.xml
+++ b/app/src/main/res/layout/item_message_c.xml
@@ -2,13 +2,13 @@
<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="@dimen/dp_107">
+ android:layout_height="@dimen/dp_115">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="97dp"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_20"
+ android:layout_height="99dp"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/house_list_line_parent_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0649322..56f7b19 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -45,7 +45,7 @@
<item name="android:windowIsFloating">false</item>
<!--鏄剧ず閫氱煡鏍�-->
<item name="android:windowActionBar">false</item>
-<!-- <item name="android:windowFullscreen">true</item>-->
+ <!-- <item name="android:windowFullscreen">true</item>-->
<!-- <item name="android:windowIsTranslucent">false</item>:鏄惁鍗婇�忔槑-->
<!-- <item name="android:windowNoTitle">true</item>:鏄惁鏄剧ずtitle-->
@@ -54,7 +54,6 @@
<style name="Custom_List_Dialog" parent="Custom_Dialog">
<!--鑳屾櫙閫忔槑搴� 鎸囩晫闈㈤�忔槑搴�-->
- <item name="android:backgroundDimAmount">0</item>
</style>
--
Gitblit v1.8.0