From 696fb437e6de54bcf546b142123712e5b61d7629 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Thu, 10 Sep 2020 18:03:40 +0800
Subject: [PATCH] d

---
 .../seven/main/find/QuestionsFragment.java    |  2 +-
 .../find/adapter/holder/BeizhuViewHolder.java | 11 +---
 .../find/adapter/holder/BottomViewHolder.java |  4 +-
 .../adapter/holder/CalendarViewHolder.java    |  4 +-
 .../adapter/holder/ContentViewHolder.java     |  4 +-
 .../seven/main/kehu/Bean/addCustomerBean.java | 24 ++++++-
 .../main/kehu/fragment/AddCusFragment.java    | 23 +------
 .../com/fenghoo/seven/widget/ItemProView.java | 32 ++++++++-
 app/src/main/res/layout/dingdan_rv_three.xml  | 16 ++++-
 app/src/main/res/layout/widget_pro_item.xml   | 66 ++++++++++++++++++-
 10 files changed, 145 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java
index 6e2681a..cd58a4a 100644
--- a/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java
+++ b/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(),"","","","3",dy_uid);
+                ShowAty.AddCustDialogActivity(getActivity(),"","1","","3",dy_uid);
             }
         });
         btnSend = (Button) view.findViewById(R.id.btn_send);
diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BeizhuViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BeizhuViewHolder.java
index ead0a8f..f01b084 100644
--- a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BeizhuViewHolder.java
+++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BeizhuViewHolder.java
@@ -89,7 +89,9 @@ public class BeizhuViewHolder extends TypeAbstractViewHolder {
         String order_state = dataBean.getOrder_state();
         String ygd_state = dataBean.getYgd_state();
         String enter_state = dataBean.getEnter_state();
-        itemProView.refresh("0", order_state, ygd_state, enter_state);
+        String ygd_enter = dataBean.getYgd_enter();//进店次数
+        String ygd_order = dataBean.getYgd_order();//成交次数
+        itemProView.refresh("0", order_state, ygd_state, enter_state,ygd_enter,ygd_order);
         //_____________分配客户
         String fp_time = dataBean.getFp_time();
         settime(fp_time, tv_time_01, tv_time_02);
@@ -141,13 +143,6 @@ public class BeizhuViewHolder extends TypeAbstractViewHolder {
                 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);
diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BottomViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BottomViewHolder.java
index 58865c4..ff64bfb 100644
--- a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BottomViewHolder.java
+++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BottomViewHolder.java
@@ -69,7 +69,9 @@ public class BottomViewHolder extends TypeAbstractViewHolder {
         String order_state = dataBean.getOrder_state();
         String ygd_state = dataBean.getYgd_state();
         String enter_state = dataBean.getEnter_state();
-        itemProView.refresh("0", order_state, ygd_state, enter_state);
+        String ygd_enter = dataBean.getYgd_enter();//进店次数
+        String ygd_order = dataBean.getYgd_order();//成交次数
+        itemProView.refresh("0", order_state, ygd_state, enter_state,ygd_enter,ygd_order);
         //_____________分配客户
         String fp_time = dataBean.getFp_time();
         settime(fp_time, tv_time_01, tv_time_02);
diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/CalendarViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/CalendarViewHolder.java
index fdcc792..6f8bfcd 100644
--- a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/CalendarViewHolder.java
+++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/CalendarViewHolder.java
@@ -54,7 +54,9 @@ public class CalendarViewHolder extends TypeAbstractViewHolder{
         String order_state = dataBean.getOrder_state();
         String ygd_state = dataBean.getYgd_state();
         String enter_state = dataBean.getEnter_state();
-        itemProView.refresh("0", order_state, ygd_state, enter_state);
+        String ygd_enter = dataBean.getYgd_enter();//进店次数
+        String ygd_order = dataBean.getYgd_order();//成交次数
+        itemProView.refresh("0", order_state, ygd_state, enter_state,ygd_enter,ygd_order);
         //_____________分配客户
         String fp_time = dataBean.getFp_time();
         settime(fp_time, tv_time_01, tv_time_02);
diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java
index 4d10448..94a9cf6 100644
--- a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java
+++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java
@@ -48,7 +48,9 @@ public class ContentViewHolder extends TypeAbstractViewHolder {
         String order_state = dataBean.getOrder_state();
         String ygd_state = dataBean.getYgd_state();
         String enter_state = dataBean.getEnter_state();
-        itemProView.refresh("0",order_state,ygd_state,enter_state);
+        String ygd_enter = dataBean.getYgd_enter();//进店次数
+        String ygd_order = dataBean.getYgd_order();//成交次数
+        itemProView.refresh("0",order_state,ygd_state,enter_state,ygd_enter,ygd_order);
         String fp_time = dataBean.getFp_time();
         settime(fp_time, tv_time_01, tv_time_02);
         WidgetTools.setTextfive(tv_fphy, "分配行业：", dataBean.getIndustry());
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/addCustomerBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/addCustomerBean.java
index cd259ce..0c92c0e 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/addCustomerBean.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/addCustomerBean.java
@@ -1,10 +1,14 @@
 package com.fenghoo.seven.main.kehu.Bean;
 
+import com.j256.ormlite.field.DatabaseField;
+import com.j256.ormlite.table.DatabaseTable;
+
 /**
  * Time:  2020/8/28
  * Author:  jianbo
  * Description:
  */
+@DatabaseTable(tableName = "tab_customerbean")
 public class addCustomerBean {
 //    private String uid	     string	登录员工的uid	是	否
 //    private String headimg	 string	头像	否	否	base64	空
@@ -18,9 +22,20 @@ public class addCustomerBean {
 //    private String source	        string	客户来源	否	否	1：添加客户	1
 //    private String customer_id	string	客户id	否	否	有值代表完善信息，空代表添加
 
+    @DatabaseField(id = true,columnName = "Id")
+    private String id;
+    public String getId() {
+        return id;
+    }
 
+    public void setId(String id) {
+        this.id = id;
+    }
+    @DatabaseField(columnName = "uid")
     private String uid="";
+    @DatabaseField(columnName = "headimg")
     private String headimg="";
+    @DatabaseField(columnName = "name")
     private String name="";
 
     public String getUid() {
@@ -110,14 +125,21 @@ public class addCustomerBean {
     public void setCustomer_id(String customer_id) {
         this.customer_id = customer_id;
     }
-
+    @DatabaseField(columnName = "phone")
     private String phone="";
+    @DatabaseField(columnName = "wechat")
     private String wechat="";
+    @DatabaseField(columnName = "address")
     private String address="";
+    @DatabaseField(columnName = "decoration")
     private String decoration="1";
+    @DatabaseField(columnName = "style_id")
     private String style_id="";
+    @DatabaseField(columnName = "budget")
     private String budget="";
+    @DatabaseField(columnName = "source")
     private String source="1";
+    @DatabaseField(columnName = "customer_id")
     private String customer_id="";
 
 }
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java
index e38c837..35939b4 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java
@@ -166,6 +166,7 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene
                 case "1":
                     label = addData("1","0","0");
                     break;
+
                 case "2":
                     label = addData("0","1","0");
                     break;
@@ -416,28 +417,6 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene
                         Log.e("测试", "失败");
                     }
                 }).launch();
-//        // 图片选择结果回调
-//        String paymentpaper = "";
-//        selectList = PictureSelector.obtainMultipleResult(data);
-//        StringBuffer sBuffer = new StringBuffer();
-//        for (LocalMedia media : selectList) {
-////                        Log.i("图片-----》", media.getPath());
-//            File file;
-//            if (media.isCompressed() || (media.isCut() && media.isCompressed())) {
-//                path = media.getCompressPath();
-//            } else if (media.isCut()) {
-//                path = media.getCutPath();
-//            } else {
-//                path = media.getPath();
-//            }
-//            ImageCompressUtils.compressBmpToFile(path);
-//            file = new File(path);
-//            String resultt = AbImageUtil.bitmapToBase64(ImageUtils.getBitmap(file));
-//            sBuffer.append(resultt);
-//            paymentpaper = sBuffer.toString();
-//        }
-//        //上传头像
-//        upLoadAvatar(paymentpaper);
     }
 
     @Override
diff --git a/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java b/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java
index d9afab6..2de15b8 100644
--- a/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java
+++ b/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java
@@ -11,6 +11,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.fenghoo.seven.R;
+import com.fenghoo.seven.utils.AbStrUtil;
+import com.fenghoo.seven.utils.WidgetTools;
 
 import androidx.annotation.AttrRes;
 import androidx.annotation.NonNull;
@@ -38,6 +40,7 @@ public class ItemProView extends FrameLayout {
     private ImageView iv_icon_01,iv_icon_02,iv_icon_03;
     private TextView tv_item_pro_01,tv_item_pro_02,tv_item_pro_03;
     private View view_line_01,view_line_02,view_line_03,view_line_04;
+    private TextView left_tvtwo,left_tvthree;
 
 
     public ItemProView(@NonNull Context context) {
@@ -67,6 +70,12 @@ public class ItemProView extends FrameLayout {
         view_line_03 = (View)findViewById(R.id.view_line_03);
         view_line_04 = (View)findViewById(R.id.view_line_04);
 
+
+         left_tvtwo = (TextView)findViewById(R.id.left_tvtwo);
+         left_tvthree = (TextView)findViewById(R.id.left_tvthree);
+
+
+
         initAttrs(attrs);
         setUpView();
     }
@@ -125,9 +134,28 @@ public class ItemProView extends FrameLayout {
 
     }
 
-    public void refresh(String stutas,String order_state,String ygd_state,String enter_state){
+    public void refresh(String stutas,String order_state,String ygd_state,String enter_state,String numtwo,String numthree){
+
+        if(AbStrUtil.isEmpty(numtwo)){
+            left_tvtwo.setVisibility(View.INVISIBLE);
+        }else {
+            if(numtwo.equals("0")){
+                left_tvtwo.setVisibility(View.INVISIBLE);
+            }else {
+                left_tvtwo.setVisibility(View.VISIBLE);
+                WidgetTools.setTextfive(left_tvtwo, "", numtwo);}
+        }
+        if(AbStrUtil.isEmpty(numthree)){
+            left_tvthree.setVisibility(View.INVISIBLE);
+        }else {
+            if(numthree.equals("0")){
+                left_tvthree.setVisibility(View.INVISIBLE);
+            }else {
+                left_tvthree.setVisibility(View.VISIBLE);
+                WidgetTools.setTextfive(left_tvthree, "", numthree);}
+        }
+
 
-    //    iv_icon_01.setImageResource(mIv_icon_01);
         if(order_state.equals("1")&&ygd_state.equals("0")&&enter_state.equals("0")){
             stutas="0";
         }
diff --git a/app/src/main/res/layout/dingdan_rv_three.xml b/app/src/main/res/layout/dingdan_rv_three.xml
index 2c97315..d666443 100644
--- a/app/src/main/res/layout/dingdan_rv_three.xml
+++ b/app/src/main/res/layout/dingdan_rv_three.xml
@@ -19,7 +19,7 @@
         <RelativeLayout
             android:id="@+id/rl_00"
             android:layout_width="130dp"
-            android:layout_height="60dp">
+            android:layout_height="76dp">
 
             <TextView
                 android:id="@+id/tv_time_00"
@@ -41,6 +41,13 @@
                 android:textColor="#ffbfbfbf"
                 android:textSize="11sp"
                 />
+            <View
+                android:layout_width="@dimen/dimen_1dp"
+                android:layout_height="10dp"
+                android:background="#D4D4D4"
+                android:layout_centerHorizontal="true"
+                android:layout_alignParentBottom="true"
+                />
 
         </RelativeLayout>
         <RelativeLayout
@@ -65,6 +72,13 @@
             android:id="@+id/rl_001"
             android:layout_width="130dp"
             android:layout_height="55dp">
+            
+            <View
+                android:layout_width="@dimen/dimen_1dp"
+                android:layout_height="10dp"
+                android:background="#D4D4D4"
+                android:layout_centerHorizontal="true"
+                />
 
             <TextView
                 android:id="@+id/tv_time_001"
diff --git a/app/src/main/res/layout/widget_pro_item.xml b/app/src/main/res/layout/widget_pro_item.xml
index a3b4fac..8cbc733 100644
--- a/app/src/main/res/layout/widget_pro_item.xml
+++ b/app/src/main/res/layout/widget_pro_item.xml
@@ -10,6 +10,7 @@
     <RelativeLayout
         android:id="@+id/rl_pro_iten_01"
         android:layout_width="match_parent"
+        android:layout_marginBottom="2dp"
         android:layout_weight="1"
         android:layout_height="wrap_content"
         android:background="@color/colorWhite">
@@ -18,12 +19,33 @@
             android:id="@+id/tv_item_pro_01"
             android:layout_width="50dp"
             android:layout_height="20dp"
+            android:layout_marginTop="6dp"
             android:gravity="center"
             android:layout_centerHorizontal="true"
 
             android:text="已被抢"
 
             android:textSize="12sp" />
+        <RelativeLayout
+            android:id="@+id/message_num_rlone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            android:layout_marginLeft="-5dp"
+            android:layout_toRightOf="@id/tv_item_pro_01">
+
+            <TextView
+                android:id="@+id/left_tvone"
+                android:layout_width="13dp"
+                android:layout_height="13dp"
+                android:layout_centerInParent="true"
+                android:background="@mipmap/message_remind"
+                android:gravity="center"
+                android:text="0"
+                android:textColor="@color/colorWhite"
+                android:textSize="10sp" />
+
+        </RelativeLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -59,6 +81,7 @@
         android:id="@+id/rl_pro_iten_02"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="2dp"
         android:layout_weight="1"
         android:background="@color/colorWhite">
 
@@ -66,11 +89,30 @@
             android:id="@+id/tv_item_pro_02"
             android:layout_width="50dp"
             android:layout_height="20dp"
+            android:layout_marginTop="6dp"
             android:gravity="center"
             android:layout_centerHorizontal="true"
             android:text="已进店"
             android:textSize="12sp" />
+        <RelativeLayout
+            android:id="@+id/message_num_rltwo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="-5dp"
+            android:layout_toRightOf="@id/tv_item_pro_02">
 
+            <TextView
+                android:id="@+id/left_tvtwo"
+                android:layout_width="13dp"
+                android:layout_height="13dp"
+                android:layout_centerInParent="true"
+                android:background="@mipmap/message_remind"
+                android:gravity="center"
+                android:text="0"
+                android:textColor="@color/colorWhite"
+                android:textSize="10sp" />
+
+        </RelativeLayout>
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -111,20 +153,38 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="2dp"
         android:layout_weight="1"
-
         android:background="@color/colorWhite">
 
         <TextView
             android:id="@+id/tv_item_pro_03"
             android:layout_width="50dp"
             android:layout_height="20dp"
+            android:layout_marginTop="6dp"
             android:gravity="center"
             android:layout_centerHorizontal="true"
-
             android:text="已成交"
-
             android:textSize="12sp" />
+        <RelativeLayout
+            android:id="@+id/message_num_rlthree"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="-5dp"
+            android:layout_toRightOf="@id/tv_item_pro_03">
+
+            <TextView
+                android:id="@+id/left_tvthree"
+                android:layout_width="13dp"
+                android:layout_height="13dp"
+                android:layout_centerInParent="true"
+                android:background="@mipmap/message_remind"
+                android:gravity="center"
+                android:text="0"
+                android:textColor="@color/colorWhite"
+                android:textSize="10sp" />
+
+        </RelativeLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"