From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev

---
 app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java |   49 ++++++++-----------------------------------------
 1 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java b/app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java
index 4085c56..e325346 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java
@@ -10,18 +10,18 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
 
 import java.util.List;
 
 public class ListDialogAdapter extends RecyclerView.Adapter<ListDialogAdapter.MyViewHolder> {
 
 
-    private List<ListDialogAdapter.DialogItemData> mList;
+    private List<LanguageAdapter.ItemData> mList;
     private final Context mContext;
     private ListDialogAdapter.OnclickListener itemOnclickListener;//鐐瑰嚮浜嗙殑鐩戝惉鍣�
 
-    public ListDialogAdapter(List<ListDialogAdapter.DialogItemData> list, Context context) {
+    public ListDialogAdapter(List<LanguageAdapter.ItemData> list, Context context) {
 
         this.mList = list;
         this.mContext = context;
@@ -37,11 +37,11 @@
 
     @Override
     public void onBindViewHolder(@NonNull ListDialogAdapter.MyViewHolder holder, int position) {
-        ListDialogAdapter.DialogItemData itemData = this.mList.get(position);
+        LanguageAdapter.ItemData itemData = this.mList.get(position);
         holder.list_item_title_tv.setText(itemData.getTitle());
-        holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_50FFFFFF));
+        holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_FF5B5B5B));
         if (itemData.isState()) {
-            holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_FFFFFFFF));
+            holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_FFACACAC));
         }
         if (position == this.mList.size() - 1) {
             holder.list_item_line_v.setVisibility(View.GONE);
@@ -63,7 +63,7 @@
     }
 
 
-    public void setList(List<ListDialogAdapter.DialogItemData> list) {
+    public void setList(List<LanguageAdapter.ItemData> list) {
         this.mList = list;
     }
 
@@ -89,41 +89,8 @@
     }
 
     public interface OnclickListener {
-        void onClick(int position, ListDialogAdapter.DialogItemData itemData);
+        void onClick(int position, LanguageAdapter.ItemData itemData);
     }
 
-    public static class DialogItemData {
-
-        private String title;
-        private boolean state;
-        //app褰撳墠璇█
-        private String language = UserConfigManage.getInstance().getCurrentAppLanguage();
-
-        public String getLanguage() {
-            return language;
-        }
-
-        public void setLanguage(String language) {
-            this.language = language;
-        }
-
-        public String getTitle() {
-            return title == null ? "" : title;
-        }
-
-        public void setTitle(String title) {
-            this.title = title;
-        }
-
-        public boolean isState() {
-            return state;
-        }
-
-        public void setState(boolean state) {
-            this.state = state;
-        }
-
-
-    }
 
 }

--
Gitblit v1.8.0