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-08-29 17:34:29 +08:00
parent 0e3553e29c
commit 441081398e
20 changed files with 59 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@@ -18,7 +18,7 @@
android:theme="@style/AppTheme">
<activity android:name=".main.kehu.activity.FpOrderInfoActivitytwo"></activity>
<activity android:name=".main.kehu.activity.FpOrderInfoActivity"></activity>
<activity android:name=".main.kehu.MoActivity" />
<activity android:name=".main.kehu.activity.MoActivity" />
<activity android:name=".main.activity.ForgetPasActivity" />
<activity android:name=".main.activity.ModifyPasActivity" />
<activity android:name=".main.find.ConversationActivity" />

3
app/src/main/java/com/fenghoo/seven/main/activity/MainActivity.java
View File

@@ -1,6 +1,5 @@
package com.fenghoo.seven.main.activity;
import android.graphics.Color;
import android.os.Bundle;
import android.view.View;
import android.widget.RelativeLayout;
@@ -9,7 +8,7 @@ import android.widget.TextView;
import com.fenghoo.seven.R;
import com.fenghoo.seven.base.BaseActivity;
import com.fenghoo.seven.main.find.FindFragment;
import com.fenghoo.seven.main.kehu.TraceFragment;
import com.fenghoo.seven.main.kehu.fragment.TraceFragment;
import com.fenghoo.seven.main.my.MyFragment;
import com.fenghoo.seven.main.task.HomeFragment;
import com.fenghoo.seven.main.zhibo.LivebroFragment;

2
app/src/main/java/com/fenghoo/seven/main/find/adapter/AwemeAdapter.java
View File

@@ -48,8 +48,6 @@ public class AwemeAdapter extends BaseQuickAdapter<awemeBean.ResultBean.DataBean
WidgetTools.setTextfive((TextView) helper.getView(R.id.left_tvtwo), "", item.getComment_num());}
}
RelativeLayout tv_cuslist_caozuo = (RelativeLayout)helper.getView(R.id.tv_cuslist_caozuo);
tv_cuslist_caozuo.setOnClickListener(new View.OnClickListener() {
@Override

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

@@ -1,17 +1,12 @@
package com.fenghoo.seven.main.find.ui;
import android.widget.Toast;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.R;
import com.fenghoo.seven.dialog.BaseTipsDialog;
import com.fenghoo.seven.main.find.adapter.CommentAdapter;
import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
import com.fenghoo.seven.main.kehu.Dialog.CusOperationDialog;
import com.fenghoo.seven.main.kehu.Dialog.RreplyDialog;
import com.fenghoo.seven.main.kehu.MobanFragment;
import com.fenghoo.seven.main.kehu.fragment.MobanFragment;
import com.fenghoo.seven.main.kehu.activity.ShowAty;
import com.fenghoo.seven.main.kehu.adapter.CusListAdapter;
import com.fenghoo.seven.okgonet.NetApi;
import com.fenghoo.seven.okgonet.Observer;
import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;

2
app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java
View File

@@ -3,7 +3,7 @@ package com.fenghoo.seven.main.find.ui;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.main.find.adapter.PrivateletAdapter;
import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
import com.fenghoo.seven.main.kehu.MobanFragment;
import com.fenghoo.seven.main.kehu.fragment.MobanFragment;
import com.fenghoo.seven.main.kehu.activity.ShowAty;
import com.fenghoo.seven.okgonet.NetApi;
import com.fenghoo.seven.okgonet.Observer;

10
app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java
View File

@@ -3,11 +3,11 @@ package com.fenghoo.seven.main.find.ui;
import android.view.View;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.R;
import com.fenghoo.seven.main.find.adapter.AwemeAdapter;
import com.fenghoo.seven.main.kehu.Bean.awemeBean;
import com.fenghoo.seven.main.kehu.MobanFragment;
import com.fenghoo.seven.main.kehu.fragment.MobanFragment;
import com.fenghoo.seven.main.kehu.activity.ShowAty;
import com.fenghoo.seven.okgonet.HttpConstants;
import com.fenghoo.seven.okgonet.NetApi;
@@ -36,6 +36,12 @@ public class PrivateletterFragment extends MobanFragment {
public void initAdapter() {
mMarkingFragmentRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
AwemeAdapter markingtwoAdapter = new AwemeAdapter(mContext, null);
markingtwoAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
loadMore();
}
});
getAdpter(markingtwoAdapter);
mMarkingFragmentRecyclerView.setAdapter(markingtwoAdapter);
markingtwoAdapter.operationListenner(new AwemeAdapter.OnViewClickListener() {

2
app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java
View File

@@ -9,7 +9,7 @@ import android.view.WindowManager;
import com.fenghoo.seven.R;
import com.fenghoo.seven.base.BaseActivity;
import com.fenghoo.seven.main.kehu.ui.AddCusFragment;
import com.fenghoo.seven.main.kehu.fragment.AddCusFragment;
import com.fenghoo.seven.utils.StatusBarUtil;
import com.fenghoo.seven.widget.TitleBar;

2
app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java
View File

@@ -6,7 +6,7 @@ import android.view.View;
import com.fenghoo.seven.R;
import com.fenghoo.seven.base.BaseActivity;
import com.fenghoo.seven.main.kehu.ui.AddCusFragment;
import com.fenghoo.seven.main.kehu.fragment.AddCusFragment;
import com.fenghoo.seven.widget.TitleBar;
/**

2
app/src/main/java/com/fenghoo/seven/main/kehu/activity/BudgetActivity.java
View File

@@ -8,9 +8,7 @@ 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.kehu.Bean.FirstEvent;
import com.fenghoo.seven.main.kehu.Bean.SecondEvent;
import com.fenghoo.seven.main.kehu.MoActivity;
import com.fenghoo.seven.utils.WidgetTools;
import com.fenghoo.seven.widget.TitleBar;

1
app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java
View File

@@ -7,7 +7,6 @@ import com.fenghoo.seven.R;
import com.fenghoo.seven.main.find.adapter.FpOrderInfoAdapter;
import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
import com.fenghoo.seven.main.kehu.Dialog.RreplyDialog;
import com.fenghoo.seven.main.kehu.MoActivity;
import com.fenghoo.seven.okgonet.NetApi;
import com.fenghoo.seven.okgonet.Observer;
import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;

2
app/src/main/java/com/fenghoo/seven/main/kehu/MoActivity.java → app/src/main/java/com/fenghoo/seven/main/kehu/activity/MoActivity.java
View File

@@ -1,4 +1,4 @@
package com.fenghoo.seven.main.kehu;
package com.fenghoo.seven.main.kehu.activity;
import android.annotation.SuppressLint;
import android.os.Bundle;

2
app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java
View File

@@ -7,8 +7,6 @@ import com.fenghoo.seven.R;
import com.fenghoo.seven.main.find.adapter.StyleAdapter;
import com.fenghoo.seven.main.find.entity.StyleBean;
import com.fenghoo.seven.main.kehu.Bean.FirstEvent;
import com.fenghoo.seven.main.kehu.Bean.WxuSerinfo;
import com.fenghoo.seven.main.kehu.MoActivity;
import com.fenghoo.seven.okgonet.NetApi;
import com.fenghoo.seven.okgonet.Observer;
import com.fenghoo.seven.widget.TitleBar;

12
app/src/main/java/com/fenghoo/seven/main/kehu/adapter/CusListAdapter.java
View File

@@ -9,7 +9,9 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.fenghoo.seven.R;
import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
import com.fenghoo.seven.utils.GlideTools;
import com.fenghoo.seven.utils.WidgetTools;
import com.fenghoo.seven.widget.CircleImageView;
import java.util.List;
@@ -25,9 +27,19 @@ public class CusListAdapter extends BaseQuickAdapter<CustomerListBean.ResultBean
@Override
protected void convert(final BaseViewHolder helper, final CustomerListBean.ResultBean.DataBean item) {
WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_source_name), "", item.getSource_name());
WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_name), "", item.getName());
WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_phone), "", item.getPhone());
WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_watch), "", item.getWechat());
CircleImageView iv_dea_avatar = helper.getView(R.id.iv_dea_avatar);
GlideTools.init(mContext).displaypic(iv_dea_avatar, item.getHeadimg(), R.mipmap.icon_default_head);
TextView tv_cus_01 = helper.getView(R.id.tv_cus_01);
String type = item.getType();
if(type.equals("old")){
tv_cus_01.setVisibility(View.INVISIBLE);
}else {
tv_cus_01.setVisibility(View.VISIBLE);
}
TextView tv_cuslist_caozuo = (TextView)helper.getView(R.id.tv_cuslist_caozuo);
tv_cuslist_caozuo.setOnClickListener(new View.OnClickListener() {
@Override

3
app/src/main/java/com/fenghoo/seven/main/kehu/ui/AddCusFragment.java → app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java
View File

@@ -1,4 +1,4 @@
package com.fenghoo.seven.main.kehu.ui;
package com.fenghoo.seven.main.kehu.fragment;
import android.Manifest;
import android.content.Intent;
@@ -22,7 +22,6 @@ import com.fenghoo.seven.main.kehu.Bean.FirstEvent;
import com.fenghoo.seven.main.kehu.Bean.LabelBean;
import com.fenghoo.seven.main.kehu.Bean.SecondEvent;
import com.fenghoo.seven.main.kehu.Bean.addCustomerBean;
import com.fenghoo.seven.main.kehu.MobanFragment;
import com.fenghoo.seven.main.kehu.activity.ShowAty;
import com.fenghoo.seven.main.kehu.adapter.AddCusAdapter;
import com.fenghoo.seven.okgonet.NetApi;

32
app/src/main/java/com/fenghoo/seven/main/kehu/CustomerFragment.java → app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java
View File

@@ -1,4 +1,4 @@
package com.fenghoo.seven.main.kehu;
package com.fenghoo.seven.main.kehu.fragment;
import android.widget.Toast;
@@ -9,9 +9,11 @@ import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
import com.fenghoo.seven.main.kehu.Dialog.CusOperationDialog;
import com.fenghoo.seven.main.kehu.activity.ShowAty;
import com.fenghoo.seven.main.kehu.adapter.CusListAdapter;
import com.fenghoo.seven.okgonet.HttpConstants;
import com.fenghoo.seven.okgonet.NetApi;
import com.fenghoo.seven.okgonet.Observer;
import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
import com.lzy.okgo.model.HttpParams;
import com.lzy.okgo.model.Response;
import java.util.List;
@@ -86,7 +88,11 @@ public class CustomerFragment extends MobanFragment {
@Override
public void requestData() {
new NetApi().customerList(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(),"").subscribe(new Observer<Response>() {
final HttpParams paramsPost = new HttpParams();
paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
paramsPost.put("search", "");
// paramsPost.put("page", mNextRequestPage);
new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_customerList).subscribe(new Observer<Response>() {
@Override
public void onNext(Response response) {
String body = (String) response.body();
@@ -95,25 +101,11 @@ public class CustomerFragment extends MobanFragment {
if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
List<CustomerListBean.ResultBean.DataBean> data = result.getData();
// List<CustomerListBean.ResultBean.DataBean> data = new ArrayList<CustomerListBean.ResultBean.DataBean>();
// for (int i = 0; i < 20; i++)
// {
// CustomerListBean.ResultBean.DataBean dataBean = new CustomerListBean.ResultBean.DataBean();
// dataBean.setName("小斐");
// dataBean.setPhone("15862656263");
// dataBean.setSource_name("添加客户");
// dataBean.setWechat("weixin");
// dataBean.setHeadimg("");
// dataBean.setSource("1");
// dataBean.setType("old");
// data.add(dataBean);
// }
if (data.size() == 0) {
markingtwoAdapter.setEmptyView(notDataView);
return;
}
if (mNextRequestPage == 1) {
if (data.size() == 0) {
markingtwoAdapter.setEmptyView(notDataView);
return;
}
setData(true, data);
} else {
setData(false, data);

2
app/src/main/java/com/fenghoo/seven/main/kehu/DealFragment.java → app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java
View File

@@ -1,4 +1,4 @@
package com.fenghoo.seven.main.kehu;
package com.fenghoo.seven.main.kehu.fragment;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.main.kehu.Bean.orderListBean;

2
app/src/main/java/com/fenghoo/seven/main/kehu/DistriFragment.java → app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java
View File

@@ -1,4 +1,4 @@
package com.fenghoo.seven.main.kehu;
package com.fenghoo.seven.main.kehu.fragment;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.main.kehu.Bean.FpListBean;

8
app/src/main/java/com/fenghoo/seven/main/kehu/MobanFragment.java → app/src/main/java/com/fenghoo/seven/main/kehu/fragment/MobanFragment.java
View File

@@ -1,4 +1,4 @@
package com.fenghoo.seven.main.kehu;
package com.fenghoo.seven.main.kehu.fragment;
import android.annotation.SuppressLint;
import android.os.Bundle;
@@ -106,12 +106,6 @@ public abstract class MobanFragment extends BaseFragment {
public void requesdata() {
initAdapter();
markingtwoAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
loadMore();
}
});
initRefreshLayout();
mSwl.setRefreshing(true);
refresh();

6
app/src/main/java/com/fenghoo/seven/main/kehu/TraceFragment.java → app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java
View File

@@ -1,4 +1,4 @@
package com.fenghoo.seven.main.kehu;
package com.fenghoo.seven.main.kehu.fragment;
import android.annotation.SuppressLint;
import android.os.Bundle;
@@ -27,9 +27,7 @@ import androidx.fragment.app.FragmentPagerAdapter;
import androidx.viewpager.widget.ViewPager;
/**
* 功能：追踪模块
* Created by jianbo .
* on 2017/8/31.
* 功能：客户列表
*/
@SuppressLint("ValidFragment")

18
app/src/main/res/layout/cuslist_item.xml
View File

@@ -7,6 +7,7 @@
<RelativeLayout
android:id="@+id/rl_cus_01"
android:layout_width="match_parent"
android:background="@color/colorWhite"
android:layout_height="24dp">
<TextView
android:id="@+id/tv_cus_01"
@@ -18,6 +19,7 @@
/>
<TextView
android:layout_toRightOf="@+id/tv_cus_01"
android:id="@+id/tv_source_name"
android:layout_width="wrap_content"
android:layout_height="17dp"
android:layout_marginLeft="10dp"
@@ -51,7 +53,7 @@
<TextView
android:id="@+id/tv_dea_name"
android:layout_width="59dp"
android:layout_width="wrap_content"
android:layout_height="21dp"
android:layout_marginLeft="13.5dp"
android:layout_marginTop="19.5dp"
@@ -60,12 +62,20 @@
android:textColor="#ff333333"
android:textSize="15sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="22dp"
android:layout_marginLeft="4dp"
android:layout_toRightOf="@+id/tv_dea_name"
android:text=" • "
/>
<TextView
android:id="@+id/tv_dea_phone"
android:layout_width="67dp"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:layout_marginTop="19.5dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="22dp"
android:layout_toRightOf="@+id/tv_dea_name"
android:text="18971614151"
android:textColor="#ff333333"