From 4b52a0f50137eb9f8d25d4943eb3df48d1e6d346 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Tue, 6 Feb 2018 14:28:13 +0800
Subject: [PATCH] no message

---
 .../com/qhclh/ytzh/index/JPInfoActivity.java  | 93 ++++++++++++-------
 .../ytzh/index/planorder/WarningActivity.java |  4 +-
 app/src/main/res/layout/view_jp.xml           |  5 -
 3 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/com/qhclh/ytzh/index/JPInfoActivity.java b/app/src/main/java/com/qhclh/ytzh/index/JPInfoActivity.java
index 9555b6c..f8a78ec 100644
--- a/app/src/main/java/com/qhclh/ytzh/index/JPInfoActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/index/JPInfoActivity.java
@@ -16,6 +16,7 @@ import com.qhclh.ytzh.index.planorder.WarningActivity;
 
 import org.litepal.crud.DataSupport;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
@@ -30,6 +31,7 @@ public class JPInfoActivity extends BaseActivity {
     Toolbar mToolbar;
 
     private List<NewsBean> newsBeanListsystem;
+    private List<NewsBean> newsBeanList;
 
     @BindView(R.id.jpcontent)
     LinearLayout jpcontent;
@@ -66,53 +68,72 @@ public class JPInfoActivity extends BaseActivity {
     private TextView system_red;
 
     private LinearLayout system_ll;
-    private TextView typetype;
+
+    private List<String> typeList;
 
     @Override
     protected void onResume() {
         super.onResume();
-        newsBeanListsystem = DataSupport.select("id", "url", "title", "content", "time", "type","red").order("time desc").find(NewsBean.class);
-
-        if (newsBeanListsystem!=null && newsBeanListsystem.size()>0) {
-            for (int i=0;i<newsBeanListsystem.size();i++) {
-                View view = LayoutInflater.from(this).inflate(R.layout.view_jp, null);
-                system_pic = view.findViewById(R.id.system_pic);
-                system_title = view.findViewById(R.id.system_title);
-                system_content = view.findViewById(R.id.system_content);
-                system_time = view.findViewById(R.id.system_time);
-                system_red = view.findViewById(R.id.system_red);
-                system_ll = view.findViewById(R.id.system_ll);
-                typetype = view.findViewById(R.id.typetype);
-
-//            Glide.with(this).load(newsBeanListsystem.get(0).getUrl()).placeholder(R.mipmap.ic_launcher_round).error(R.mipmap.ic_launcher_round).into(system_pic);
-                system_title.setText(newsBeanListsystem.get(i).getTitle());
-                system_content.setText(newsBeanListsystem.get(i).getContent());
-                system_time.setText(newsBeanListsystem.get(i).getTime());
-                if (newsBeanListsystem.get(i).getRed() == 1) {
-                    system_red.setVisibility(View.VISIBLE);
-                } else {
-                    system_red.setVisibility(View.INVISIBLE);
+        getTypelist();
+        for (int j = 0; j < typeList.size(); j++) {
+            newsBeanList = DataSupport.select("id", "url", "title", "content", "time", "type", "red").where("type = ?", typeList.get(j)).order("time desc").find(NewsBean.class);
+            View view = LayoutInflater.from(this).inflate(R.layout.view_jp, null);
+            system_pic = view.findViewById(R.id.system_pic);
+            system_title = view.findViewById(R.id.system_title);
+            system_content = view.findViewById(R.id.system_content);
+            system_time = view.findViewById(R.id.system_time);
+            system_red = view.findViewById(R.id.system_red);
+            system_ll = view.findViewById(R.id.system_ll);
+
+            system_title.setText(newsBeanList.get(0).getTitle());
+            system_content.setText(newsBeanList.get(0).getContent());
+            system_time.setText(newsBeanList.get(0).getTime());
+            if (newsBeanList.get(0).getRed() == 1) {
+                system_red.setVisibility(View.VISIBLE);
+            } else {
+                system_red.setVisibility(View.INVISIBLE);
+            }
+
+            system_ll.setTag(newsBeanList.get(0).getType());
+            System.out.println("aaa+++"+newsBeanList.toString());
+            System.out.println("aaa++type+"+newsBeanList.get(0).getType());
+            System.out.println("aaa++title+"+newsBeanList.get(0).getTitle());
+            system_ll.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent intent = new Intent(JPInfoActivity.this, WarningActivity.class);
+                    intent.putExtra("type", view.getTag().toString());
+                    System.out.println("aaa++++typevvv+++"+view.getTag());
+                    startActivity(intent);
                 }
+            });
 
-                typetype.setText(newsBeanListsystem.get(i).getType());
-                system_ll.setTag(newsBeanListsystem.get(i).getType());
-                final int finalI = i;
-                system_ll.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        Intent intent = new Intent(JPInfoActivity.this,WarningActivity.class);
-                        intent.putExtra("type",view.getTag().toString());
-                        intent.putExtra("title",newsBeanListsystem.get(finalI).getTitle());
-                        startActivity(intent);
-                    }
-                });
+            jpcontent.addView(view);
 
-                jpcontent.addView(view);
-            }
         }
+    }
+
+    private List<String> getTypelist() {
+        newsBeanListsystem = DataSupport.select("id", "url", "title", "content", "time", "type", "red").order("time desc").find(NewsBean.class);
 
+        typeList = new ArrayList<>();
+        if (newsBeanListsystem != null && newsBeanListsystem.size() > 0) {
+            for (int i = 0; i < newsBeanListsystem.size(); i++) {
+
+                typeList.add(newsBeanListsystem.get(i).getType());
+                for (int j = 0; j < typeList.size() - 1; j++) {
+                    for (int k = typeList.size() - 1; k > j; k--) {
+                        if (typeList.get(k).equals(typeList.get(j))) {
+                            typeList.remove(k);
+                        }
+                    }
+                }
+            }
+        }
+        return typeList;
     }
 
+
     @Override
     protected void onPause() {
         super.onPause();
diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java
index a030572..7887d09 100644
--- a/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java
@@ -34,7 +34,6 @@ public class WarningActivity extends BaseActivity{
     private WarningAdapter warningAdapter;
     private String type;
 
-    private String title;
     private List<NewsBean> newsBeanList;
     @Override
     protected int setLayoutId() {
@@ -54,8 +53,7 @@ public class WarningActivity extends BaseActivity{
     @Override
     protected void initData() {
         type =getIntent().getStringExtra("type");
-        title =getIntent().getStringExtra("title");
-        tv_toolbar_title.setText(title);
+        tv_toolbar_title.setText(type);
 
         getDatas();
     }
diff --git a/app/src/main/res/layout/view_jp.xml b/app/src/main/res/layout/view_jp.xml
index 2603244..e6389d9 100644
--- a/app/src/main/res/layout/view_jp.xml
+++ b/app/src/main/res/layout/view_jp.xml
@@ -69,11 +69,6 @@
             android:layout_marginLeft="@dimen/dp_5"
             android:background="@drawable/shape_red"
             android:visibility="invisible" />
-        <TextView
-            android:id="@+id/typetype"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
 
     </LinearLayout>