admin/July
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d

Browse Source
This commit is contained in:
jianbo
2020-09-11 10:44:51 +08:00
parent 696fb437e6
commit 5c8c30a394
11 changed files with 121 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/fenghoo/seven/main/find/ConversationActivity.java
View File

@@ -34,9 +34,11 @@ public class ConversationActivity extends BaseActivity {
dataBean = (privateListBean.ResultBean.DataBean) getIntent().getSerializableExtra("dataBean");
String private_id = dataBean.getPrivate_id();
String dy_uid = dataBean.getDy_uid();
String nick_name = dataBean.getNick_name();
String nick_img = dataBean.getNick_img();
mTitleBar.setTitle("抖音昵称"+"**");
getSupportFragmentManager().beginTransaction().replace(R.id.container,new QuestionsFragment(private_id,dy_uid)).commit();
mTitleBar.setTitle(nick_name);
getSupportFragmentManager().beginTransaction().replace(R.id.container,new QuestionsFragment(private_id,dy_uid,nick_img)).commit();
}
public void onEvent(SixEvent event) {

7
app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java
View File

@@ -62,10 +62,12 @@ public class QuestionsFragment extends BaseTreeFragment<QuestionsContract.View,
private List<commonWordsBean.ResultBean.DataBean> data;
private String private_id;
private String dy_uid;
private String nick_img;
public QuestionsFragment(String private_id,String dy_uid){
public QuestionsFragment(String private_id,String dy_uid,String nick_img){
this.private_id=private_id;
this.dy_uid=dy_uid;
this.nick_img=nick_img;
}
@Override
@@ -173,6 +175,8 @@ public class QuestionsFragment extends BaseTreeFragment<QuestionsContract.View,
QuestionsEntity questionsEntity = new QuestionsEntity();
questionsEntity.setIs_self(data.get(i).getIs_self());//表明是自己发送的
questionsEntity.setMsg(data.get(i).getContent());//设置问题内容
questionsEntity.setImg(data.get(i).getNick_img());
questionsEntity.setImgr(data.get(i).getUser_head());
question.add(questionsEntity);
}
mAdapter.upDate(question);
@@ -228,6 +232,7 @@ public class QuestionsFragment extends BaseTreeFragment<QuestionsContract.View,
QuestionsEntity questionsEntity = new QuestionsEntity();
questionsEntity.setIs_self("0");//表明是自己发送的
questionsEntity.setMsg(input);//设置问题内容
questionsEntity.setImgr(ProfileSpUtils.getInstance().getUserProfie().getData().getUser_head());
question.add(questionsEntity);
upDataAdd(question);
final HttpParams paramsPost = new HttpParams();

8
app/src/main/java/com/fenghoo/seven/main/find/adapter/QuestionsAdapter.java
View File

@@ -15,6 +15,7 @@ import com.fenghoo.seven.R;
import com.fenghoo.seven.base.BaseRecycleAdapter;
import com.fenghoo.seven.base.BaseViewHolder;
import com.fenghoo.seven.main.find.entity.QuestionsEntity;
import com.fenghoo.seven.main.kehu.activity.CustomerDetailActivity;
import com.fenghoo.seven.utils.GlideTools;
import com.fenghoo.seven.widget.CircleImageView;
@@ -115,6 +116,7 @@ public class QuestionsAdapter extends BaseRecycleAdapter<QuestionsEntity, Questi
class ViewHolder extends BaseViewHolder<QuestionsEntity> {
TextView tvContent;
CircleImageView cirimage_left;
private FrameLayout view_content_fl;
private LinearLayout view_content_ll;
@@ -125,6 +127,7 @@ public class QuestionsAdapter extends BaseRecycleAdapter<QuestionsEntity, Questi
@Override
protected void initView(View itemView) {
tvContent = (TextView) itemView.findViewById(R.id.tv_content);
cirimage_left = (CircleImageView) itemView.findViewById(R.id.cirimage_left);
view_content_fl = (FrameLayout) itemView.findViewById(R.id.view_content_fl);
view_content_ll = (LinearLayout) itemView.findViewById(R.id.view_content_ll);
}
@@ -134,6 +137,9 @@ public class QuestionsAdapter extends BaseRecycleAdapter<QuestionsEntity, Questi
protected void bindView(final QuestionsEntity entity, int position) {
Log.e("entity.getMsg()", "bindView: " + entity.getMsg());
tvContent.setText(entity.getMsg());
GlideTools.init(mContext).displaypic(cirimage_left, entity.getImg(), R.mipmap.icon_default_head);
//0 = 解答内容回复 , 1 = 回答满意/不满意 ,2 = 点击提交问题
if (entity.getReply_type() == 1) {
view_content_fl.setVisibility(View.GONE);//隐藏帧布局，使用线性布局
@@ -224,7 +230,7 @@ public class QuestionsAdapter extends BaseRecycleAdapter<QuestionsEntity, Questi
@Override
protected void bindView(QuestionsEntity entity, int position) {
tvContent.setText(entity.getMsg());
GlideTools.init(mContext).displaypic(ivAvatar, "", R.mipmap.icon_default_head);
GlideTools.init(mContext).displaypic(ivAvatar, entity.getImgr(), R.mipmap.icon_default_head);
}
}
}

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

@@ -66,12 +66,13 @@ public class BottomViewHolder extends TypeAbstractViewHolder {
/**
* 三个字段，有7种状态
*/
String order_state = dataBean.getOrder_state();
String ygd_state = dataBean.getYgd_state();
String enter_state = dataBean.getEnter_state();
String ygd_state = dataBean.getYgd_state();//0：未被抢，1：已被抢
String enter_state = dataBean.getEnter_state();//0：未进店，1：已进店
String order_state = dataBean.getOrder_state();//0：未成交，1：已成交
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);
itemProView.refresh("0", ygd_state, enter_state,order_state,ygd_enter,ygd_order);
//_____________分配客户
String fp_time = dataBean.getFp_time();
settime(fp_time, tv_time_01, tv_time_02);

20
app/src/main/java/com/fenghoo/seven/main/find/entity/QuestionsEntity.java
View File

@@ -24,6 +24,26 @@ public class QuestionsEntity {
private List<DataEntity> data;
private String question;
public String getImg() {
return img;
}
public void setImg(String img) {
this.img = img;
}
private String img;
public String getImgr() {
return imgr;
}
public void setImgr(String imgr) {
this.imgr = imgr;
}
private String imgr;
public String getMessage_type() {
return message_type;
}

119
app/src/main/java/com/fenghoo/seven/widget/ItemProView.java
View File

@@ -77,7 +77,7 @@ public class ItemProView extends FrameLayout {
initAttrs(attrs);
setUpView();
// setUpView();
}
/**
@@ -88,28 +88,29 @@ public class ItemProView extends FrameLayout {
private void initAttrs(AttributeSet attrs) {
TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.ItemProView);
mIv_icon_01 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_01, R.drawable.shape_pro_yuan);
mIv_icon_01_h = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_01, R.drawable.shape_pro_yuan_hui);
mIv_icon_02 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_02, R.drawable.shape_pro_yuan);
mIv_icon_02_h = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_02, R.drawable.shape_pro_yuan_hui);
mIv_icon_03 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_03, R.drawable.shape_pro_yuan);
mIv_icon_03_h = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_03, R.drawable.shape_pro_yuan_hui);
mIv_icon_01 = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_01_t, R.drawable.shape_pro_yuan);
mIv_icon_01_h = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_01_t, R.drawable.shape_pro_yuan_hui);
// mIv_icon_02 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_02, R.drawable.shape_pro_yuan);
// mIv_icon_02_h = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_02, R.drawable.shape_pro_yuan_hui);
// mIv_icon_03 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_03, R.drawable.shape_pro_yuan);
// mIv_icon_03_h = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_03, R.drawable.shape_pro_yuan_hui);
mTv_item_pro_01 = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_01, R.drawable.shape_pro_tv);
mTv_item_pro_01_h = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_01, R.drawable.shape_pro_tv_hui);
mTv_item_pro_02 = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_02, R.drawable.shape_pro_tv);
mTv_item_pro_02_h = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_02, R.drawable.shape_pro_tv_hui);
mTv_item_pro_03 = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_03, R.drawable.shape_pro_tv);
mTv_item_pro_03_h = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_03, R.drawable.shape_pro_tv_hui);
// mTv_item_pro_02 = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_02, R.drawable.shape_pro_tv);
// mTv_item_pro_02_h = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_02, R.drawable.shape_pro_tv_hui);
// mTv_item_pro_03 = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_03, R.drawable.shape_pro_tv);
// mTv_item_pro_03_h = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_03, R.drawable.shape_pro_tv_hui);
mView_line_01 = typedArray.getResourceId(R.styleable.ItemProView_view_line_01, R.color.colortheme);
mView_line_01_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_01, R.color.ffb1b1b1);
mView_line_02 = typedArray.getResourceId(R.styleable.ItemProView_view_line_02, R.color.colortheme);
mView_line_02_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_02, R.color.ffb1b1b1);
mView_line_03 = typedArray.getResourceId(R.styleable.ItemProView_view_line_03, R.color.colortheme);
mView_line_03_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_03, R.color.ffb1b1b1);
mView_line_04 = typedArray.getResourceId(R.styleable.ItemProView_view_line_04, R.color.colortheme);
mView_line_04_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_04, R.color.ffb1b1b1);
// mView_line_02 = typedArray.getResourceId(R.styleable.ItemProView_view_line_02, R.color.colortheme);
// mView_line_02_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_02, R.color.ffb1b1b1);
// mView_line_03 = typedArray.getResourceId(R.styleable.ItemProView_view_line_03, R.color.colortheme);
// mView_line_03_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_03, R.color.ffb1b1b1);
// mView_line_04 = typedArray.getResourceId(R.styleable.ItemProView_view_line_04, R.color.colortheme);
// mView_line_04_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_04, R.color.ffb1b1b1);
typedArray.recycle();
}
@@ -118,9 +119,9 @@ public class ItemProView extends FrameLayout {
*/
private void setUpView() {
iv_icon_01.setImageResource(mIv_icon_01_h) ;
iv_icon_02.setImageResource(mIv_icon_01_h) ;
iv_icon_03.setImageResource(mIv_icon_01_h) ;
// iv_icon_01.setImageResource(mIv_icon_01_h) ;
// iv_icon_02.setImageResource(mIv_icon_01_h) ;
// iv_icon_03.setImageResource(mIv_icon_01_h) ;
tv_item_pro_01.setBackgroundResource(mTv_item_pro_01_h);
tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1));
tv_item_pro_02.setBackgroundResource(mTv_item_pro_01_h);
@@ -134,7 +135,7 @@ public class ItemProView extends FrameLayout {
}
public void refresh(String stutas,String order_state,String ygd_state,String enter_state,String numtwo,String numthree){
public void refresh(String stutas,String ygd_state,String enter_state,String order_state,String numtwo,String numthree){
if(AbStrUtil.isEmpty(numtwo)){
left_tvtwo.setVisibility(View.INVISIBLE);
@@ -156,47 +157,36 @@ public class ItemProView extends FrameLayout {
}
if(order_state.equals("1")&&ygd_state.equals("0")&&enter_state.equals("0")){
if(ygd_state.equals("0")&&enter_state.equals("0")&&order_state.equals("0")){
stutas="0";
}
if(order_state.equals("0")&&ygd_state.equals("0")&&enter_state.equals("0")){
if(ygd_state.equals("0")&&enter_state.equals("0")&&order_state.equals("1")){
stutas="1";
}
if(order_state.equals("0")&&ygd_state.equals("1")&&enter_state.equals("0")){
if(ygd_state.equals("0")&&enter_state.equals("1")&&order_state.equals("0")){
stutas="2";
}
if(order_state.equals("0")&&ygd_state.equals("1")&&enter_state.equals("1")){
if(ygd_state.equals("0")&&enter_state.equals("1")&&order_state.equals("1")){
stutas="3";
}
if(order_state.equals("1")&&ygd_state.equals("0")&&enter_state.equals("1")){
if(ygd_state.equals("1")&&enter_state.equals("0")&&order_state.equals("0")){
stutas="4";
}
if(order_state.equals("1")&&ygd_state.equals("1")&&enter_state.equals("0")){
if(ygd_state.equals("1")&&enter_state.equals("0")&&order_state.equals("1")){
stutas="5";
}
if(order_state.equals("1")&&ygd_state.equals("1")&&enter_state.equals("1")){
if(ygd_state.equals("1")&&enter_state.equals("1")&&order_state.equals("0")){
stutas="6";
}
if(ygd_state.equals("1")&&enter_state.equals("1")&&order_state.equals("1")){
stutas="7";
}
Log.e("状态==",stutas);
switch (stutas) {
case "0"://100三个字段的状态
iv_icon_01.setImageResource(mIv_icon_01_h) ;
iv_icon_02.setImageResource(mIv_icon_01_h) ;
iv_icon_03.setImageResource(mIv_icon_01_h) ;
tv_item_pro_01.setBackgroundResource(R.mipmap.icon_pro_ima_bq);
tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1));
tv_item_pro_02.setBackgroundResource(mTv_item_pro_01_h);
tv_item_pro_02.setTextColor(getResources().getColor(R.color.ffb1b1b1));
tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h);
tv_item_pro_03.setTextColor(getResources().getColor(R.color.ffb1b1b1));
view_line_01.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_02.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
break;
case "1"://000三个字段的状态
case "0"://000三个字段的状态
iv_icon_01.setImageResource(mIv_icon_01_h) ;
iv_icon_02.setImageResource(mIv_icon_01_h) ;
iv_icon_03.setImageResource(mIv_icon_01_h) ;
@@ -211,6 +201,22 @@ public class ItemProView extends FrameLayout {
view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
break;
case "1"://001三个字段的状态
iv_icon_01.setImageResource(mIv_icon_01_h) ;
iv_icon_02.setImageResource(mIv_icon_01_h) ;
iv_icon_03.setImageResource(mIv_icon_01_h) ;
tv_item_pro_01.setBackgroundResource(mTv_item_pro_01_h);
tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1));
tv_item_pro_02.setBackgroundResource(mTv_item_pro_01_h);
tv_item_pro_02.setTextColor(getResources().getColor(R.color.ffb1b1b1));
tv_item_pro_03.setBackgroundResource(R.mipmap.icon_pro_ima_cj);
tv_item_pro_03.setText("");
tv_item_pro_03.setTextColor(getResources().getColor(R.color.colortheme));
view_line_01.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_02.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_03.setBackgroundColor(getResources().getColor(R.color.colortheme));
view_line_04.setBackgroundColor(getResources().getColor(R.color.colortheme));
break;
case "2"://010
iv_icon_01.setImageResource(mIv_icon_01_h) ;
iv_icon_02.setImageResource(mIv_icon_01) ;
@@ -245,7 +251,26 @@ public class ItemProView extends FrameLayout {
view_line_03.setBackgroundColor(getResources().getColor(R.color.colortheme));
view_line_04.setBackgroundColor(getResources().getColor(R.color.colortheme));
break;
case "4"://101
case "4"://100三个字段的状态
iv_icon_01.setImageResource(mIv_icon_01) ;
iv_icon_02.setImageResource(mIv_icon_01_h) ;
iv_icon_03.setImageResource(mIv_icon_01_h) ;
tv_item_pro_01.setBackgroundResource(R.mipmap.icon_pro_ima_bq);
tv_item_pro_01.setText("");
tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1));
tv_item_pro_02.setBackgroundResource(mTv_item_pro_01_h);
tv_item_pro_02.setTextColor(getResources().getColor(R.color.ffb1b1b1));
tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h);
tv_item_pro_03.setTextColor(getResources().getColor(R.color.ffb1b1b1));
view_line_01.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_02.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
break;
case "5"://101
iv_icon_01.setImageResource(mIv_icon_01) ;
iv_icon_02.setImageResource(mIv_icon_01_h) ;
iv_icon_03.setImageResource(mIv_icon_01) ;
@@ -262,7 +287,7 @@ public class ItemProView extends FrameLayout {
view_line_03.setBackgroundColor(getResources().getColor(R.color.colortheme));
view_line_04.setBackgroundColor(getResources().getColor(R.color.colortheme));
break;
case "5"://110
case "6"://110
iv_icon_01.setImageResource(mIv_icon_01) ;
iv_icon_02.setImageResource(mIv_icon_01) ;
iv_icon_03.setImageResource(mIv_icon_01_h) ;
@@ -279,7 +304,7 @@ public class ItemProView extends FrameLayout {
view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
break;
case "6"://111
case "7"://111
iv_icon_01.setImageResource(mIv_icon_01) ;
iv_icon_02.setImageResource(mIv_icon_01) ;
iv_icon_03.setImageResource(mIv_icon_01) ;

2
app/src/main/res/layout/activity_refactor_marking_detail.xml
View File

@@ -15,6 +15,6 @@
android:layout_below="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="49dp" />
/>
</RelativeLayout>

4
app/src/main/res/layout/fragment_kehu.xml
View File

@@ -129,8 +129,8 @@
<TextView
android:id="@+id/floatingActionButton"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_gravity="right|bottom"
android:background="@mipmap/icon_fudong"
android:clickable="true" />

4
app/src/main/res/layout/fragment_questions.xml
View File

@@ -83,8 +83,8 @@
android:layout_alignParentRight="true"
android:layout_marginRight="5dp"
android:layout_marginBottom="60dp"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="70dp"
android:layout_height="70dp"
android:clickable="true"
android:background="@mipmap/icon_fudong"
/>

1
app/src/main/res/layout/item_question_left.xml
View File

@@ -7,6 +7,7 @@
android:padding="13dp">
<com.fenghoo.seven.widget.CircleImageView
android:id="@+id/cirimage_left"
android:layout_width="45dp"
android:layout_height="45dp"
android:src="@mipmap/icon_default_head"/>

1
app/src/main/res/values/styles.xml
View File

@@ -159,6 +159,7 @@
<attr name="iv_icon_01" format="reference"/>
<attr name="iv_icon_02" format="reference"/>
<attr name="iv_icon_03" format="reference"/>
<attr name="tv_item_pro_01_t" format="reference"/>
<attr name="tv_item_pro_01" format="reference"/>
<attr name="tv_item_pro_02" format="reference"/>
<attr name="tv_item_pro_03" format="reference"/>