From 15cd434674051e5d29215b47862686c773625fd4 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期五, 28 四月 2023 23:20:02 +0800
Subject: [PATCH] 代码提交

---
 app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivity.java |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivity.java
index af8cd4c..d160297 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivity.java
@@ -5,28 +5,23 @@
 import android.widget.PopupWindow;
 
 import androidx.databinding.library.baseAdapters.BR;
-import androidx.lifecycle.Observer;
 
-import com.android.app_base.base.viewmodel.BaseViewModel;
 import com.android.app_base.utils.ScreenSizeUtils;
 import com.android.app_base.widget.LinearItemDecoration;
 import com.application.zhangshi_app_android.R;
 
-import com.application.zhangshi_app_android.adapter.FamilyAssetsRvAdapter;
-import com.application.zhangshi_app_android.adapter.FamilyContactsRvAdapter;
-import com.application.zhangshi_app_android.bean.FamilyContactsBean;
+import com.application.zhangshi_app_android.adapter.ContactsRvAdapter;
 import com.application.zhangshi_app_android.databinding.ActivityContactsBinding;
 ;
 import com.application.zhangshi_app_android.ui.DLBaseActivity;
 
-import java.util.List;
 /**
  * @author Gss
  * @date 2023.04.18. 20:33
- * @desc
+ * @desc 閫氳褰�
  */
-public class ContactsActivity<FamilyContactsActivityViewModel extends BaseViewModel> extends DLBaseActivity<ActivityContactsBinding,FamilyContactsActivityViewModel> {
-    private FamilyContactsRvAdapter adapter;
+public class ContactsActivity extends DLBaseActivity<ActivityContactsBinding,ContactsActivityViewModel> {
+    private ContactsRvAdapter adapter;
     private PopupWindow mOperatePopupWindow;
     @Override
     public int getLayoutId() {
@@ -45,7 +40,7 @@
 
     @Override
     public void initView() {
-        adapter = new FamilyContactsRvAdapter(this);
+        adapter = new ContactsRvAdapter(this);
         LinearItemDecoration itemDecoration = new LinearItemDecoration();
         itemDecoration.setBottomSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_12));
         itemDecoration.setHorizontalSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
@@ -64,17 +59,17 @@
 
     @Override
     public void initData() {
-        viewModel.getFamilyContacts();
+//        viewModel.getFamilyContacts();
     }
 
     @Override
     public void initLiveDataObserve() {
-        viewModel.getDataListLiveData().observe(this, familyContactsBeans -> {
-            adapter.setData(familyContactsBeans);
-        });
+//        viewModel.getDataListLiveData().observe(this, familyContactsBeans -> {
+//            adapter.setData(familyContactsBeans);
+//        });
     }
 
-    private PopupWindow initPopUpWindow(View view){
+    public PopupWindow initPopUpWindow(View view){
         PopupWindow popupWindow = new PopupWindow(this);
         // 璁剧疆甯冨眬鏂囦欢
         popupWindow.setContentView(view);
@@ -84,7 +79,7 @@
         // 璁剧疆pop閫忔槑鏁堟灉
         popupWindow.setBackgroundDrawable(new ColorDrawable(0x0000));
         // 璁剧疆pop鍑哄叆鍔ㄧ敾
-        popupWindow.setAnimationStyle(com.android.app_base.R.style.pop_add);
+        popupWindow.setAnimationStyle(com.android.app_base.R.style.pop_operate);
         // 璁剧疆pop鑾峰彇鐒︾偣锛屽鏋滀负false鐐瑰嚮杩斿洖鎸夐挳浼氶��鍑哄綋鍓岮ctivity锛屽鏋減op涓湁Editor鐨勮瘽锛宖ocusable蹇呴』瑕佷负true
         popupWindow.setFocusable(true);
         // 璁剧疆pop鍙偣鍑伙紝涓篺alse鐐瑰嚮浜嬩欢鏃犳晥锛岄粯璁や负true

--
Gitblit v1.9.1