d

app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java

@@ -86,7 +86,7 @@ public class QuestionsFragment extends BaseTreeFragment<QuestionsContract.View,
             @Override
             public void onClick(View view) {
                 //进入添加客户和完善信息
-                ShowAty.AddCustDialogActivity(getActivity(),"","","","",dy_uid);
+                ShowAty.AddCustDialogActivity(getActivity(),"","","","3",dy_uid);
             }
         });
         btnSend = (Button) view.findViewById(R.id.btn_send);

app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BeizhuViewHolder.java

@@ -8,14 +8,22 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
 import com.fenghoo.seven.R;
 import com.fenghoo.seven.main.find.entity.markquestions;
 import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener;
+import com.fenghoo.seven.main.kehu.Bean.FpListBean;
 import com.fenghoo.seven.main.kehu.Bean.fpOrderInfoBean;
 import com.fenghoo.seven.utils.AbStrUtil;
 import com.fenghoo.seven.utils.WidgetTools;
 import com.fenghoo.seven.widget.ItemProView;
 
+import java.util.List;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class BeizhuViewHolder extends TypeAbstractViewHolder {
     private ItemProView itemProView;
     private final TextView tv_time_01;
@@ -28,11 +36,14 @@ public class BeizhuViewHolder extends TypeAbstractViewHolder {
     private final TextView tv_pl;
     private final TextView tv_md;
     private final TextView tv_qdr;
-    private final TextView tv_time_00;
+//    private final TextView tv_time_00;
-    private final TextView tv_time_000;
+//    private final TextView tv_time_000;
-    private final ImageView tv_fphy_0;
+//    private final ImageView tv_fphy_0;
-    private final TextView tv_cjr;
+//    private final TextView tv_cjr;
-    private final TextView tv_cjje;
+//    private final TextView tv_cjje;
+    private final TextView tv_jzjd;
+    private final TextView tv_pp;
+    private final RecyclerView recy_dis;
 
     public BeizhuViewHolder(View itemView) {
         super(itemView);
@@ -49,13 +60,15 @@ public class BeizhuViewHolder extends TypeAbstractViewHolder {
         tv_md = (TextView) itemView.findViewById(R.id.tv_md);
         tv_qdr = (TextView) itemView.findViewById(R.id.tv_qdr);
 
-        tv_time_00 = (TextView) itemView.findViewById(R.id.tv_time_00);
+//        tv_time_00 = (TextView) itemView.findViewById(R.id.tv_time_00);
-        tv_time_000 = (TextView) itemView.findViewById(R.id.tv_time_000);
+//        tv_time_000 = (TextView) itemView.findViewById(R.id.tv_time_000);
-        tv_fphy_0 = (ImageView) itemView.findViewById(R.id.tv_fphy_0);
+    //    tv_fphy_0 = (ImageView) itemView.findViewById(R.id.tv_fphy_0);
-
-        tv_cjr = (TextView) itemView.findViewById(R.id.tv_cjr);
-        tv_cjje = (TextView) itemView.findViewById(R.id.tv_cjje);
 
+//        tv_cjr = (TextView) itemView.findViewById(R.id.tv_cjr);
+//        tv_cjje = (TextView) itemView.findViewById(R.id.tv_cjje);
+        tv_jzjd = (TextView) itemView.findViewById(R.id.tv_jzjd);
+        tv_pp = (TextView) itemView.findViewById(R.id.tv_pp);
+        recy_dis = (RecyclerView)itemView.findViewById(R.id.recy_dis);
 
     }
 
@@ -81,25 +94,68 @@ public class BeizhuViewHolder extends TypeAbstractViewHolder {
         String fp_time = dataBean.getFp_time();
         settime(fp_time, tv_time_01, tv_time_02);
         WidgetTools.setTextfive(tv_fphy, "分配行业：", dataBean.getIndustry());
+        String decoration = dataBean.getDecoration();//1：毛坯，2：精装，3：旧房改造
+        switch (decoration) {
+            case "1":
+                WidgetTools.setTextfive(tv_jzjd, "家装阶段：", "毛胚");
+                break;
+            case "2":
+                WidgetTools.setTextfive(tv_jzjd, "家装阶段：", "精装");
+                break;
+            case "3":
+                WidgetTools.setTextfive(tv_jzjd, "家装阶段：", "旧房改造");
+                break;
+        }
         WidgetTools.setTextfive(tv_fpcs, "分配城市：", dataBean.getCity());
         WidgetTools.setTextfive(tv_khys, "客户预算：", dataBean.getBudget());
         //_____________抢单客户
         String rob_time = dataBean.getRob_time();
         settime(rob_time, tv_time_001, tv_time_002);
-        WidgetTools.setTextfive(tv_pl, "品类：", dataBean.getIndustry());
+        WidgetTools.setTextfive(tv_pl, "品类：", dataBean.getYgd_brand_type());
-        WidgetTools.setTextfive(tv_md, "门店：", dataBean.getCity());
+        WidgetTools.setTextfive(tv_pp, "品牌：", dataBean.getYgd_brand_name());
-        WidgetTools.setTextfive(tv_qdr, "抢单人：", dataBean.getYgd_rob_name());
+        WidgetTools.setTextfive(tv_md, "门店：", dataBean.getYgd_store_name());
+        WidgetTools.setTextfive(tv_qdr, "抢单人：", dataBean.getYgd_brand_name());
         //_____________成交客户
-        String type_time = dataBean.getType_time();
+//        String type_time = dataBean.getType_time();
-        settime(type_time, tv_time_00, tv_time_000);
+//        settime(type_time, tv_time_00, tv_time_000);
-        WidgetTools.setTextfive(tv_pl, "成交人：", dataBean.getIndustry());
+//        WidgetTools.setTextfive(tv_cjr, "成交人：", dataBean.getIndustry());
-        WidgetTools.setTextfive(tv_md, "成交金额：", dataBean.getCity());
+//        WidgetTools.setTextfive(tv_cjje, "成交金额：", dataBean.getBudget());
-        String type = dataBean.getType();
+//        String type = dataBean.getType();
-        if (type.equals("1")) {
+//        if (type.equals("1")) {
-            tv_fphy_0.setBackgroundResource(R.mipmap.icon_yihuishou);
+//            tv_fphy_0.setBackgroundResource(R.mipmap.icon_yihuishou);
-        } else {
+//        } else {
-            tv_fphy_0.setBackgroundResource(R.mipmap.icon_ycj);
+//            tv_fphy_0.setBackgroundResource(R.mipmap.icon_ycj);
-        }
+//        }
+        LinearLayoutManager manager = new LinearLayoutManager(mContext);
+        recy_dis.setLayoutManager(manager);
+        recy_dis.setAdapter(new BaseQuickAdapter<fpOrderInfoBean.ResultBean.DataBean.OrderBean, BaseViewHolder>(R.layout.item_recy_cjxq, dataBean.getOrder()) {
+            @Override
+            protected void convert(final BaseViewHolder helper, final fpOrderInfoBean.ResultBean.DataBean.OrderBean item) {
+
+                TextView tv_time_00 = helper.getView(R.id.tv_time_00);
+                TextView tv_time_000 = helper.getView(R.id.tv_time_000);
+                TextView tv_cjr = helper.getView(R.id.tv_cjr);
+                TextView tv_cjje = helper.getView(R.id.tv_cjje);
+                ImageView tv_fphy_0 = helper.getView(R.id.tv_fphy_0);
+                String type_time = item.getTime();
+                settime(type_time, tv_time_00, tv_time_000);
+                WidgetTools.setTextfive(tv_cjr, "成交人：", item.getOrder_name());
+                WidgetTools.setTextfive(tv_cjje, "成交金额：", item.getRecudesum());
+
+                int adapterPosition = helper.getAdapterPosition();
+                if(adapterPosition==0){
+                    tv_fphy_0.setVisibility(View.VISIBLE);
+                }else {
+                    tv_fphy_0.setVisibility(View.GONE);
+                }
+                String type = dataBean.getType();
+                if (type.equals("1")) {
+                    tv_fphy_0.setBackgroundResource(R.mipmap.icon_yihuishou);
+                } else {
+                    tv_fphy_0.setBackgroundResource(R.mipmap.icon_ycj);
+                }
+            }
+        });
     }
 
     private void settime(String rob_time, TextView tv_time_001, TextView tv_time_002) {

app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BottomViewHolder.java

@@ -27,6 +27,8 @@ public class BottomViewHolder extends TypeAbstractViewHolder {
     private final TextView tv_time_00;
     private final TextView tv_time_000;
     private final ImageView tv_fphy_0;
+    private final TextView tv_jzjd;
+    private final TextView tv_pp;
 
     public BottomViewHolder(View itemView) {
         super(itemView);
@@ -46,6 +48,8 @@ public class BottomViewHolder extends TypeAbstractViewHolder {
         tv_time_00 = (TextView) itemView.findViewById(R.id.tv_time_00);
         tv_time_000 = (TextView) itemView.findViewById(R.id.tv_time_000);
         tv_fphy_0 = (ImageView) itemView.findViewById(R.id.tv_fphy_0);
+        tv_jzjd = (TextView) itemView.findViewById(R.id.tv_jzjd);
+        tv_pp = (TextView) itemView.findViewById(R.id.tv_pp);
     }
 
     /**
@@ -70,14 +74,27 @@ public class BottomViewHolder extends TypeAbstractViewHolder {
         String fp_time = dataBean.getFp_time();
         settime(fp_time, tv_time_01, tv_time_02);
         WidgetTools.setTextfive(tv_fphy, "分配行业：", dataBean.getIndustry());
+        String decoration = dataBean.getDecoration();//1：毛坯，2：精装，3：旧房改造
+        switch (decoration) {
+            case "1":
+                WidgetTools.setTextfive(tv_jzjd, "家装阶段：", "毛胚");
+                break;
+            case "2":
+                WidgetTools.setTextfive(tv_jzjd, "家装阶段：", "精装");
+                break;
+            case "3":
+                WidgetTools.setTextfive(tv_jzjd, "家装阶段：", "旧房改造");
+                break;
+        }
         WidgetTools.setTextfive(tv_fpcs, "分配城市：", dataBean.getCity());
         WidgetTools.setTextfive(tv_khys, "客户预算：", dataBean.getBudget());
         //_____________抢单客户
         String rob_time = dataBean.getRob_time();
         settime(rob_time, tv_time_001, tv_time_002);
-        WidgetTools.setTextfive(tv_pl, "品类：", dataBean.getIndustry());
+        WidgetTools.setTextfive(tv_pl, "品类：", dataBean.getYgd_brand_type());
-        WidgetTools.setTextfive(tv_md, "门店：", dataBean.getCity());
+        WidgetTools.setTextfive(tv_pp, "品牌：", dataBean.getYgd_brand_name());
-        WidgetTools.setTextfive(tv_qdr, "抢单人：", dataBean.getBudget());
+        WidgetTools.setTextfive(tv_md, "门店：", dataBean.getYgd_store_name());
+        WidgetTools.setTextfive(tv_qdr, "抢单人：", dataBean.getYgd_brand_name());
         //_____________成交客户
         String type_time = dataBean.getType_time();
         settime(type_time, tv_time_00, tv_time_000);

app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/CalendarViewHolder.java

@@ -25,6 +25,8 @@ public class CalendarViewHolder extends TypeAbstractViewHolder{
     private final TextView tv_pl;
     private final TextView tv_md;
     private final TextView tv_qdr;
+    private final TextView tv_jzjd;
+    private final TextView tv_pp;
 
     public CalendarViewHolder(View itemView) {
         super(itemView);
@@ -40,6 +42,8 @@ public class CalendarViewHolder extends TypeAbstractViewHolder{
         tv_pl = (TextView) itemView.findViewById(R.id.tv_pl);
         tv_md = (TextView) itemView.findViewById(R.id.tv_md);
         tv_qdr = (TextView) itemView.findViewById(R.id.tv_qdr);
+        tv_jzjd = (TextView) itemView.findViewById(R.id.tv_jzjd);
+        tv_pp = (TextView) itemView.findViewById(R.id.tv_pp);
 
     }
 
@@ -55,14 +59,27 @@ public class CalendarViewHolder extends TypeAbstractViewHolder{
         String fp_time = dataBean.getFp_time();
         settime(fp_time, tv_time_01, tv_time_02);
         WidgetTools.setTextfive(tv_fphy, "分配行业：", dataBean.getIndustry());
+        String decoration = dataBean.getDecoration();//1：毛坯，2：精装，3：旧房改造
+        switch (decoration) {
+            case "1":
+                WidgetTools.setTextfive(tv_jzjd, "家装阶段：", "毛胚");
+                break;
+            case "2":
+                WidgetTools.setTextfive(tv_jzjd, "家装阶段：", "精装");
+                break;
+            case "3":
+                WidgetTools.setTextfive(tv_jzjd, "家装阶段：", "旧房改造");
+                break;
+        }
         WidgetTools.setTextfive(tv_fpcs, "分配城市：", dataBean.getCity());
         WidgetTools.setTextfive(tv_khys, "客户预算：", dataBean.getBudget());
         //_____________抢单客户
         String rob_time = dataBean.getRob_time();
         settime(rob_time, tv_time_001, tv_time_002);
-        WidgetTools.setTextfive(tv_pl, "品类：", dataBean.getIndustry());
+        WidgetTools.setTextfive(tv_pl, "品类：", dataBean.getYgd_brand_type());
-        WidgetTools.setTextfive(tv_md, "门店：", dataBean.getCity());
+        WidgetTools.setTextfive(tv_pp, "品牌：", dataBean.getYgd_brand_name());
-        WidgetTools.setTextfive(tv_qdr, "抢单人：", dataBean.getBudget());
+        WidgetTools.setTextfive(tv_md, "门店：", dataBean.getYgd_store_name());
+        WidgetTools.setTextfive(tv_qdr, "抢单人：", dataBean.getYgd_brand_name());
     }
 
     private void settime(String rob_time, TextView tv_time_001, TextView tv_time_002) {

app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java

@@ -16,6 +16,7 @@ public class ContentViewHolder extends TypeAbstractViewHolder {
     private final TextView tv_time_01;
     private final TextView tv_time_02;
     private final TextView tv_fphy;
+    private final TextView tv_jzjd;
     private final TextView tv_fpcs;
     private final TextView tv_khys;
 
@@ -25,6 +26,7 @@ public class ContentViewHolder extends TypeAbstractViewHolder {
         tv_time_01 = (TextView) itemView.findViewById(R.id.tv_time_01);
         tv_time_02 = (TextView) itemView.findViewById(R.id.tv_time_02);
         tv_fphy = (TextView) itemView.findViewById(R.id.tv_fphy);
+        tv_jzjd = (TextView) itemView.findViewById(R.id.tv_jzjd);
         tv_fpcs = (TextView) itemView.findViewById(R.id.tv_fpcs);
         tv_khys = (TextView) itemView.findViewById(R.id.tv_khys);
 
@@ -50,6 +52,18 @@ public class ContentViewHolder extends TypeAbstractViewHolder {
         String fp_time = dataBean.getFp_time();
         settime(fp_time, tv_time_01, tv_time_02);
         WidgetTools.setTextfive(tv_fphy, "分配行业：", dataBean.getIndustry());
+        String decoration = dataBean.getDecoration();//1：毛坯，2：精装，3：旧房改造
+        switch (decoration) {
+            case "1":
+                WidgetTools.setTextfive(tv_jzjd, "家装阶段：", "毛胚");
+                break;
+            case "2":
+                WidgetTools.setTextfive(tv_jzjd, "家装阶段：", "精装");
+                break;
+            case "3":
+                WidgetTools.setTextfive(tv_jzjd, "家装阶段：", "旧房改造");
+                break;
+        }
         WidgetTools.setTextfive(tv_fpcs, "分配城市：", dataBean.getCity());
         WidgetTools.setTextfive(tv_khys, "客户预算：", dataBean.getBudget());
     }

app/src/main/java/com/fenghoo/seven/main/kehu/Bean/fpOrderInfoBean.java

@@ -13,7 +13,7 @@ public class fpOrderInfoBean extends BaseModel {
 
 
     /**
-     * result : {"msg":"成功","data":[{"ygd_brand_type":"","rob_time":"","enter_state":"0","city":"太原市","fp_time":"2020-08-25 15:13:40","industry":"家具","ygd_order":"","type":"","ygd_store_name":"","ygd_state":"0","ygd_enter":"","province":"山西省","id":"9f4b9abff5bb3120ddbcd1253c3c9d6d","ygd_brand_name":"","travel":"1","ygd_rob_name":"","order_state":"0","decoration":"精装","budget":"15万-20万"}],"success":0}
+     * result : {"msg":"成功","data":[{"ygd_brand_type":"","rob_time":"1970-01-01 08:00","enter_state":"0","city":null,"type_time":"1970-01-01 08:00","fp_time":"1970-01-01 08:00","industry":"家具","ygd_order":"0","type":"0","ygd_store_name":"","ygd_state":"0","ygd_enter":"0","province":null,"id":"1","ygd_brand_name":"","travel":"1","ygd_rob_name":"","order_state":"0","decoration":"1","budget":"","order":[{"recudesum":"1.00","fh_id":"1","time":"2020-09-08 10:14","order_name":"qqq"}]}],"success":0}
      * status : 0
      */
 
@@ -39,7 +39,7 @@ public class fpOrderInfoBean extends BaseModel {
     public static class ResultBean {
         /**
          * msg : 成功
-         * data : [{"ygd_brand_type":"","rob_time":"","enter_state":"0","city":"太原市","fp_time":"2020-08-25 15:13:40","industry":"家具","ygd_order":"","type":"","ygd_store_name":"","ygd_state":"0","ygd_enter":"","province":"山西省","id":"9f4b9abff5bb3120ddbcd1253c3c9d6d","ygd_brand_name":"","travel":"1","ygd_rob_name":"","order_state":"0","decoration":"精装","budget":"15万-20万"}]
+         * data : [{"ygd_brand_type":"","rob_time":"1970-01-01 08:00","enter_state":"0","city":null,"type_time":"1970-01-01 08:00","fp_time":"1970-01-01 08:00","industry":"家具","ygd_order":"0","type":"0","ygd_store_name":"","ygd_state":"0","ygd_enter":"0","province":null,"id":"1","ygd_brand_name":"","travel":"1","ygd_rob_name":"","order_state":"0","decoration":"1","budget":"","order":[{"recudesum":"1.00","fh_id":"1","time":"2020-09-08 10:14","order_name":"qqq"}]}]
          * success : 0
          */
 
@@ -74,41 +74,34 @@ public class fpOrderInfoBean extends BaseModel {
         public static class DataBean {
             /**
              * ygd_brand_type :
-             * rob_time :
+             * rob_time : 1970-01-01 08:00
              * enter_state : 0
-             * city : 太原市
+             * city : null
-             * fp_time : 2020-08-25 15:13:40
+             * type_time : 1970-01-01 08:00
+             * fp_time : 1970-01-01 08:00
              * industry : 家具
-             * ygd_order :
+             * ygd_order : 0
-             * type :
+             * type : 0
              * ygd_store_name :
              * ygd_state : 0
-             * ygd_enter :
+             * ygd_enter : 0
-             * province : 山西省
+             * province : null
-             * id : 9f4b9abff5bb3120ddbcd1253c3c9d6d
+             * id : 1
              * ygd_brand_name :
              * travel : 1
              * ygd_rob_name :
              * order_state : 0
-             * decoration : 精装
+             * decoration : 1
-             * budget : 15万-20万
+             * budget :
+             * order : [{"recudesum":"1.00","fh_id":"1","time":"2020-09-08 10:14","order_name":"qqq"}]
              */
 
             private String ygd_brand_type;
-
-            public String getType_time() {
-                return type_time;
-            }
-
-            public void setType_time(String type_time) {
-                this.type_time = type_time;
-            }
-
-            private String type_time;
             private String rob_time;
             private String enter_state;
             private String city;
-            private String fp_time;//分配客户时间
+            private String type_time;
+            private String fp_time;
             private String industry;
             private String ygd_order;
             private String type;
@@ -123,6 +116,7 @@ public class fpOrderInfoBean extends BaseModel {
             private String order_state;
             private String decoration;
             private String budget;
+            private List<OrderBean> order;
 
             public String getYgd_brand_type() {
                 return ygd_brand_type;
@@ -156,6 +150,14 @@ public class fpOrderInfoBean extends BaseModel {
                 this.city = city;
             }
 
+            public String getType_time() {
+                return type_time;
+            }
+
+            public void setType_time(String type_time) {
+                this.type_time = type_time;
+            }
+
             public String getFp_time() {
                 return fp_time;
             }
@@ -275,6 +277,60 @@ public class fpOrderInfoBean extends BaseModel {
             public void setBudget(String budget) {
                 this.budget = budget;
             }
+
+            public List<OrderBean> getOrder() {
+                return order;
+            }
+
+            public void setOrder(List<OrderBean> order) {
+                this.order = order;
+            }
+
+            public static class OrderBean {
+                /**
+                 * recudesum : 1.00
+                 * fh_id : 1
+                 * time : 2020-09-08 10:14
+                 * order_name : qqq
+                 */
+
+                private String recudesum;
+                private String fh_id;
+                private String time;
+                private String order_name;
+
+                public String getRecudesum() {
+                    return recudesum;
+                }
+
+                public void setRecudesum(String recudesum) {
+                    this.recudesum = recudesum;
+                }
+
+                public String getFh_id() {
+                    return fh_id;
+                }
+
+                public void setFh_id(String fh_id) {
+                    this.fh_id = fh_id;
+                }
+
+                public String getTime() {
+                    return time;
+                }
+
+                public void setTime(String time) {
+                    this.time = time;
+                }
+
+                public String getOrder_name() {
+                    return order_name;
+                }
+
+                public void setOrder_name(String order_name) {
+                    this.order_name = order_name;
+                }
+            }
         }
     }
 }

app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java

@@ -149,7 +149,8 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene
         textView8 = (EditText) view.findViewById(R.id.textView8);
         textView12 = (TextView) view.findViewById(R.id.textView12);
         textView14 = (TextView) view.findViewById(R.id.textView14);
-        if(pagetype.equals("0")||pagetype.equals("1")||pagetype.equals("2")){
+        //3代表从会话列表进入
+        if(pagetype.equals("0")||pagetype.equals("1")||pagetype.equals("2")||pagetype.equals("3")){
             //添加客户
             label = addData("1","0","0");
         }else {

app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java

@@ -13,8 +13,6 @@ public class HttpConstants {
   //  public static String URiBase = "http://192.168.1.3";// 7月7
     public static String URiBase = "http://106.53.92.2";// 7月7
 
-
-
     /**
      * 七月七
      */

app/src/main/res/layout/addcus_head_view.xml

@@ -273,6 +273,17 @@
             app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/textView18"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#FF6A6A"
+            android:layout_marginRight="5dp"
+            android:text="*"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/textView11"
+            app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/dingdan_rv_four.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout android:layout_width="match_parent"
-    android:layout_height="283dp"
+    android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/colorWhite"
     xmlns:android="http://schemas.android.com/apk/res/android">
@@ -11,77 +11,83 @@
         android:layout_height="2dp"
         android:background="#F5F5F5"
         />
-    <RelativeLayout
+<!--    <RelativeLayout-->
-        android:id="@+id/rl_par_00"
+<!--        android:id="@+id/rl_par_00"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_below="@+id/view2"-->
+<!--        android:layout_height="76dp">-->
+<!--        <RelativeLayout-->
+<!--            android:id="@+id/rl_00"-->
+<!--            android:layout_width="130dp"-->
+<!--            android:layout_height="60dp">-->
+
+<!--            <TextView-->
+<!--                android:id="@+id/tv_time_00"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="21dp"-->
+<!--                android:text="12:47"-->
+<!--                android:layout_marginTop="20dp"-->
+<!--                android:layout_centerHorizontal="true"-->
+<!--                android:textColor="#ff545454"-->
+<!--                android:textSize="15sp"-->
+<!--                />-->
+<!--            <TextView-->
+<!--                android:id="@+id/tv_time_000"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="15dp"-->
+<!--                android:text="2020-07-01"-->
+<!--                android:layout_centerHorizontal="true"-->
+<!--                android:layout_below="@+id/tv_time_00"-->
+<!--                android:textColor="#ffbfbfbf"-->
+<!--                android:textSize="11sp"-->
+<!--                />-->
+
+<!--        </RelativeLayout>-->
+<!--        <RelativeLayout-->
+<!--            android:layout_toRightOf="@+id/rl_00"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="76dp">-->
+
+<!--            <TextView-->
+<!--                android:id="@+id/tv_cjr"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginTop="24dp"-->
+<!--                android:text="成交人："-->
+<!--                android:textColor="#ff545454"-->
+<!--                android:textSize="13sp" />-->
+<!--            <TextView-->
+<!--                android:id="@+id/tv_cjje"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_below="@+id/tv_cjr"-->
+<!--                android:text="成交金额："-->
+<!--                android:textColor="#ff545454"-->
+<!--                android:textSize="13sp"-->
+<!--                />-->
+
+<!--            <ImageView-->
+<!--                android:id="@+id/tv_fphy_0"-->
+<!--                android:layout_width="46dp"-->
+<!--                android:layout_height="46dp"-->
+<!--                android:layout_marginTop="15dp"-->
+<!--                android:layout_alignParentRight="true"-->
+<!--                android:layout_marginRight="60dp"-->
+<!--                android:background="@mipmap/icon_ycj"-->
+<!--                />-->
+<!--        </RelativeLayout>-->
+<!--    </RelativeLayout>-->
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recy_dis"
+        android:layout_below="@+id/ima_dea_watch"
         android:layout_width="match_parent"
-        android:layout_below="@+id/view2"
+        android:layout_height="wrap_content"
-        android:layout_height="76dp">
+        />
-        <RelativeLayout
-            android:id="@+id/rl_00"
-            android:layout_width="130dp"
-            android:layout_height="60dp">
-
-            <TextView
-                android:id="@+id/tv_time_00"
-                android:layout_width="wrap_content"
-                android:layout_height="21dp"
-                android:text="12:47"
-                android:layout_marginTop="20dp"
-                android:layout_centerHorizontal="true"
-                android:textColor="#ff545454"
-                android:textSize="15sp"
-                />
-            <TextView
-                android:id="@+id/tv_time_000"
-                android:layout_width="wrap_content"
-                android:layout_height="15dp"
-                android:text="2020-07-01"
-                android:layout_centerHorizontal="true"
-                android:layout_below="@+id/tv_time_00"
-                android:textColor="#ffbfbfbf"
-                android:textSize="11sp"
-                />
-
-        </RelativeLayout>
-        <RelativeLayout
-            android:layout_toRightOf="@+id/rl_00"
-            android:layout_width="match_parent"
-            android:layout_height="76dp">
-
-            <TextView
-                android:id="@+id/tv_cjr"
-                android:layout_marginTop="24dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="成交人："
-                android:textColor="#ff545454"
-                android:textSize="13sp"
-                />
-            <TextView
-                android:id="@+id/tv_cjje"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/tv_cjr"
-                android:text="成交金额："
-                android:textColor="#ff545454"
-                android:textSize="13sp"
-                />
-
-            <ImageView
-                android:id="@+id/tv_fphy_0"
-                android:layout_width="46dp"
-                android:layout_height="46dp"
-                android:layout_marginTop="15dp"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="60dp"
-                android:background="@mipmap/icon_ycj"
-                />
-        </RelativeLayout>
-    </RelativeLayout>
     <RelativeLayout
         android:id="@+id/rl_par_01"
         android:layout_width="match_parent"
-        android:layout_below="@+id/rl_par_00"
+        android:layout_below="@+id/recy_dis"
         android:layout_height="60dp">
         <RelativeLayout
             android:id="@+id/rl_001"
@@ -122,6 +128,15 @@
                 android:textColor="#ff545454"
                 android:textSize="13sp"
                 />
+            <TextView
+                android:id="@+id/tv_pp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/tv_pl"
+                android:layout_marginLeft="10dp"
+                android:text="品牌："
+                android:textColor="#ff545454"
+                android:textSize="13sp" />
             <TextView
                 android:id="@+id/tv_md"
                 android:layout_width="wrap_content"
@@ -197,6 +212,15 @@
                 android:textColor="#ff545454"
                 android:textSize="13sp"
                 />
+            <TextView
+                android:id="@+id/tv_jzjd"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/tv_fphy"
+                android:layout_marginLeft="10dp"
+                android:text="家装阶段："
+                android:textColor="#ff545454"
+                android:textSize="13sp" />
             <TextView
                 android:id="@+id/tv_fpcs"
                 android:layout_width="wrap_content"

app/src/main/res/layout/dingdan_rv_three.xml

@@ -100,6 +100,15 @@
                 android:textColor="#ff545454"
                 android:textSize="13sp"
                 />
+            <TextView
+                android:id="@+id/tv_pp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/tv_pl"
+                android:layout_marginLeft="10dp"
+                android:text="品牌："
+                android:textColor="#ff545454"
+                android:textSize="13sp" />
             <TextView
                 android:id="@+id/tv_md"
                 android:layout_width="wrap_content"
@@ -175,6 +184,15 @@
                 android:textColor="#ff545454"
                 android:textSize="13sp"
                 />
+            <TextView
+                android:id="@+id/tv_jzjd"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/tv_fphy"
+                android:layout_marginLeft="10dp"
+                android:text="家装阶段："
+                android:textColor="#ff545454"
+                android:textSize="13sp" />
             <TextView
                 android:id="@+id/tv_fpcs"
                 android:layout_width="wrap_content"

app/src/main/res/layout/dingdan_rv_threetwo.xml

@@ -56,6 +56,15 @@
                 android:textColor="#ff545454"
                 android:textSize="13sp"
                 />
+            <TextView
+                android:id="@+id/tv_pp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/tv_pl"
+                android:layout_marginLeft="10dp"
+                android:text="品牌："
+                android:textColor="#ff545454"
+                android:textSize="13sp" />
             <TextView
                 android:id="@+id/tv_md"
                 android:layout_width="wrap_content"
@@ -131,6 +140,15 @@
                 android:textColor="#ff545454"
                 android:textSize="13sp"
                 />
+            <TextView
+                android:id="@+id/tv_jzjd"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/tv_fphy"
+                android:layout_marginLeft="10dp"
+                android:text="家装阶段："
+                android:textColor="#ff545454"
+                android:textSize="13sp" />
             <TextView
                 android:id="@+id/tv_fpcs"
                 android:layout_width="wrap_content"

app/src/main/res/layout/dingdan_rv_two.xml

@@ -68,6 +68,16 @@
                 android:textColor="#ff545454"
                 android:textSize="13sp" />
 
+            <TextView
+                android:id="@+id/tv_jzjd"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/tv_fphy"
+                android:layout_marginLeft="10dp"
+                android:text="家装阶段："
+                android:textColor="#ff545454"
+                android:textSize="13sp" />
+
             <TextView
                 android:id="@+id/tv_fpcs"
                 android:layout_width="wrap_content"

app/src/main/res/layout/item_recy_cjxq.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rl_par_00"
+    android:layout_width="match_parent"
+    android:layout_height="76dp"
+    android:layout_below="@+id/view2">
+
+    <RelativeLayout
+        android:id="@+id/rl_00"
+        android:layout_width="130dp"
+        android:layout_height="60dp">
+
+        <TextView
+            android:id="@+id/tv_time_00"
+            android:layout_width="wrap_content"
+            android:layout_height="21dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="24dp"
+            android:text="12:47"
+            android:textColor="#ff545454"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/tv_time_000"
+            android:layout_width="wrap_content"
+            android:layout_height="15dp"
+            android:layout_below="@+id/tv_time_00"
+            android:layout_centerHorizontal="true"
+            android:text="2020-07-01"
+            android:textColor="#ffbfbfbf"
+            android:textSize="11sp" />
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="76dp"
+        android:layout_toRightOf="@+id/rl_00">
+
+        <TextView
+            android:id="@+id/tv_cjr"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="成交人："
+            android:textColor="#ff545454"
+            android:textSize="13sp" />
+
+        <TextView
+            android:id="@+id/tv_cjje"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/tv_cjr"
+            android:text="成交金额："
+            android:textColor="#ff545454"
+            android:textSize="13sp" />
+
+        <ImageView
+            android:id="@+id/tv_fphy_0"
+            android:layout_width="46dp"
+            android:layout_height="46dp"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="15dp"
+            android:layout_marginRight="60dp"
+            android:background="@mipmap/icon_ycj" />
+    </RelativeLayout>
+</RelativeLayout>
+
+

app/src/main/res/layout/widget_pro_item.xml

@@ -28,7 +28,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="3dp"
             android:layout_below="@+id/tv_item_pro_01"
             android:background="@color/colorWhite">
 
@@ -45,9 +45,10 @@
             <View
                 android:id="@+id/view_line_01"
                 android:layout_width="match_parent"
-                android:layout_height="2dp"
+                android:layout_height="1dp"
                 android:layout_toRightOf="@+id/iv_icon_01"
                 android:layout_alignParentRight="true"
+                android:layout_marginLeft="5dp"
                 android:layout_centerVertical="true"
                  />
 
@@ -73,24 +74,27 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="3dp"
             android:layout_below="@+id/tv_item_pro_02"
             android:background="@color/colorWhite">
 
             <View
                 android:id="@+id/view_line_02"
                 android:layout_width="50dp"
-                android:layout_height="2dp"
+                android:layout_toLeftOf="@+id/iv_icon_02"
+                android:layout_marginRight="5dp"
+                android:layout_height="1dp"
                 android:layout_centerVertical="true"
                />
 
             <View
                 android:id="@+id/view_line_03"
                 android:layout_width="50dp"
-                android:layout_height="2dp"
+                android:layout_height="1dp"
+                android:layout_toRightOf="@+id/iv_icon_02"
+                android:layout_marginLeft="5dp"
                 android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
+                android:layout_centerVertical="true" />
-                 />
 
             <ImageView
                 android:id="@+id/iv_icon_02"
@@ -125,14 +129,15 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="3dp"
             android:layout_below="@+id/tv_item_pro_03"
             android:background="@color/colorWhite">
 
             <View
                 android:id="@+id/view_line_04"
                 android:layout_width="match_parent"
-                android:layout_height="2dp"
+                android:layout_height="1dp"
+                android:layout_marginRight="5dp"
                 android:layout_toLeftOf="@+id/iv_icon_03"
                 android:layout_centerVertical="true"
                 />