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-03 18:10:45 +08:00
parent 8678704456
commit 346415d75e
37 changed files with 1332 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/fenghoo/seven/main/activity/SplashActivity.java
View File

@@ -59,9 +59,9 @@ public class SplashActivity extends BaseActivity implements EasyPermissions.Perm
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//设置共同沉浸式样式
ImmersionBar.with(this).navigationBarColor(R.color.colorPrimary).init();
// ImmersionBar.with(this).navigationBarColor(R.color.colorPrimary).init();
//将屏幕设置为全屏
// getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
methodRequiresTwoPermission();
}

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

@@ -59,18 +59,22 @@ public class CloundSolutionActivity extends BaseActivity implements View.OnClick
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_clound_solution);
initView();
// HotCity();
HotCity();
//开始定位
// location();
}
private void HotCity() {
hotCities = new ArrayList<>();
hotCities.add(new HotCity("全国", "全国", ""));
hotCities.add(new HotCity("北京", "北京", "101010100"));
hotCities.add(new HotCity("上海", "上海", "101020100"));
hotCities.add(new HotCity("广州", "广东", "101280101"));
hotCities.add(new HotCity("深圳", "广东", "101280601"));
hotCities.add(new HotCity("西安", "西安", "101280601"));
hotCities.add(new HotCity("杭州", "浙江", "101210101"));
hotCities.add(new HotCity("成都", "成都", "101210101"));
hotCities.add(new HotCity("武汉", "武汉", "101210101"));
}
private void initView() {

67
app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java
View File

@@ -2,28 +2,15 @@ package com.fenghoo.seven.main.find;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.fenghoo.seven.R;
import com.fenghoo.seven.main.find.ui.FindFragmenttwo;
import com.fenghoo.seven.main.kehu.activity.ShowAty;
import com.fenghoo.seven.test.BaseFragment;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.zaaach.citypicker.CityPicker;
import com.zaaach.citypicker.adapter.OnPickListener;
import com.zaaach.citypicker.model.City;
import com.zaaach.citypicker.model.HotCity;
import com.zaaach.citypicker.model.LocateState;
import com.zaaach.citypicker.model.LocatedCity;
import java.util.List;
/**
* 发现
@@ -35,11 +22,6 @@ public class FindFragment extends BaseFragment {
private String pagetype="0";//0是家居 1是私信
private RelativeLayout dianpubuju;
private LinearLayout dianyuanbuju;
private TextView marking_fragment;
private List<HotCity> hotCities;
private int anim;
private boolean enable;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -63,7 +45,7 @@ public class FindFragment extends BaseFragment {
}
private void initView(View mContentView) {
marking_fragment = (TextView)view.findViewById(R.id.marking_fragment);
dianpubuju = (RelativeLayout)view.findViewById(R.id.dianpubuju);
dianyuanbuju = (LinearLayout)view.findViewById(R.id.dianyuanbuju);
rl_live = (RelativeLayout)view.findViewById(R.id.rl_live);
@@ -93,52 +75,5 @@ public class FindFragment extends BaseFragment {
}
});
marking_fragment.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
// ShowAty.CloundSolutionActivity(getActivity());
// ShowAty.MainActivitytwot(getActivity());
CityPicker.from(getActivity())
.enableAnimation(enable)
.setAnimationStyle(anim)
.setLocatedCity(null)
.setHotCities(hotCities)
.setOnPickListener(new OnPickListener() {
@Override
public void onPick(int position, City data) {
// mDangqianchengshi.setText(String.format("当前城市：%s，%s", data.getName(), data.getCode()));
marking_fragment.setText(String.format(data.getName()));
Toast.makeText(
getActivity().getApplicationContext(),
String.format("点击的数据：%s，%s", data.getName(), data.getCode()),
Toast.LENGTH_SHORT)
.show();
}
@Override
public void onCancel() {
Toast.makeText(getActivity().getApplicationContext(), "取消选择", Toast.LENGTH_SHORT).show();
}
@Override
public void onLocate() {
//开始定位，这里模拟一下定位
// new Handler().postDelayed(new Runnable() {
// @Override
// public void run() {
// CityPicker.from(getActivity()).locateComplete(new LocatedCity(city, province, adCode), LocateState.SUCCESS);
// }
// }, 3000);
}
})
.show();
}
});
}
}

86
app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java
View File

@@ -2,11 +2,13 @@ package com.fenghoo.seven.main.find;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.R;
@@ -17,7 +19,14 @@ import com.fenghoo.seven.main.kehu.Dialog.HangyeSelectDialog;
import com.fenghoo.seven.okgonet.NetApi;
import com.fenghoo.seven.okgonet.Observer;
import com.lzy.okgo.model.Response;
import com.zaaach.citypicker.CityPicker;
import com.zaaach.citypicker.adapter.OnPickListener;
import com.zaaach.citypicker.model.City;
import com.zaaach.citypicker.model.HotCity;
import com.zaaach.citypicker.model.LocateState;
import com.zaaach.citypicker.model.LocatedCity;
import java.util.ArrayList;
import java.util.List;
/**
@@ -32,6 +41,16 @@ public class PriLetFragment extends BaseFragment {
private TextView marking_fragment_title;
private PrivateletterFragment privateletterFragment;
private List<industryBean.ResultBean.DataBean> industryData;
private TextView marking_fragment;
private List<HotCity> hotCities;
private int anim;
private boolean enable;
private String city="西安";
private String province;
private String adCode;
private String danqiancity="全国";
private String danqianindustry_id="";
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -50,6 +69,7 @@ public class PriLetFragment extends BaseFragment {
}
view = inflater.inflate(R.layout.findfragment, container, false);
initView(view);
HotCity();
new NetApi().industry().subscribe(new Observer<Response>() {
@Override
public void onNext(Response response) {
@@ -74,7 +94,21 @@ public class PriLetFragment extends BaseFragment {
return view;
}
private void HotCity() {
hotCities = new ArrayList<>();
hotCities.add(new HotCity("全国", "全国", ""));
hotCities.add(new HotCity("北京", "北京", "101010100"));
hotCities.add(new HotCity("上海", "上海", "101020100"));
hotCities.add(new HotCity("广州", "广东", "101280101"));
hotCities.add(new HotCity("深圳", "广东", "101280601"));
hotCities.add(new HotCity("西安", "西安", "101280601"));
hotCities.add(new HotCity("杭州", "浙江", "101210101"));
hotCities.add(new HotCity("成都", "成都", "101210101"));
hotCities.add(new HotCity("武汉", "武汉", "101210101"));
}
private void initView(View mContentView) {
marking_fragment = (TextView)view.findViewById(R.id.marking_fragment);
rl_privateletter = (RelativeLayout)view.findViewById(R.id.rl_privateletter);
left_tvtwo = (TextView)view.findViewById(R.id.left_tvtwo);
marking_fragment_title = (TextView)view.findViewById(R.id.marking_fragment_title);
@@ -85,12 +119,60 @@ public class PriLetFragment extends BaseFragment {
@Override
public void uploadAvatar(String industry_id, String industry) {
marking_fragment_title.setText(industry);
danqianindustry_id=industry_id;
//刷新抖音列表数据
privateletterFragment.onRefresh(industry_id);
}
privateletterFragment.refresh(danqiancity,danqianindustry_id);
}
}).show();
}
});
marking_fragment.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
// ShowAty.CloundSolutionActivity(getActivity());
// ShowAty.MainActivitytwot(getActivity());
CityPicker.from(getActivity())
.enableAnimation(enable)
.setAnimationStyle(anim)
.setLocatedCity(null)
.setHotCities(hotCities)
.setOnPickListener(new OnPickListener() {
@Override
public void onPick(int position, City data) {
// mDangqianchengshi.setText(String.format("当前城市：%s，%s", data.getName(), data.getCode()));
marking_fragment.setText(String.format(data.getName()));
danqiancity=String.format(data.getName());
// Toast.makeText(
// getActivity().getApplicationContext(),
// String.format("点击的数据：%s，%s", data.getName(), data.getCode()),
// Toast.LENGTH_SHORT)
// .show();
//刷新数据
privateletterFragment.refresh(danqiancity,danqianindustry_id);
}
@Override
public void onCancel() {
Toast.makeText(getActivity().getApplicationContext(), "取消选择", Toast.LENGTH_SHORT).show();
}
@Override
public void onLocate() {
//开始定位，这里模拟一下定位
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
CityPicker.from(getActivity()).locateComplete(new LocatedCity(city, province, adCode), LocateState.SUCCESS);
}
}, 3000);
}
})
.show();
}
});
}
interface ClickCallback {

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

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

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

@@ -1,14 +1,16 @@
package com.fenghoo.seven.main.find.ui;
import android.view.View;
import android.view.ViewParent;
import android.widget.FrameLayout;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.main.find.adapter.AwemeAdapter;
import com.fenghoo.seven.main.kehu.Bean.awemeBean;
import com.fenghoo.seven.main.kehu.fragment.MobanFragment;
import com.fenghoo.seven.main.kehu.activity.ShowAty;
import com.fenghoo.seven.main.kehu.fragment.MobanFragment;
import com.fenghoo.seven.okgonet.HttpConstants;
import com.fenghoo.seven.okgonet.NetApi;
import com.fenghoo.seven.okgonet.Observer;
@@ -28,6 +30,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
public class PrivateletterFragment extends MobanFragment {
TextView left_tvtwo;
private String industry_id="";
private String city="";
public PrivateletterFragment(TextView left_tvtwo) {
super();
this.left_tvtwo=left_tvtwo;
@@ -53,11 +56,22 @@ public class PrivateletterFragment extends MobanFragment {
});
}
public void refresh(String city,String industry_id){
mMarkingFragmentRecyclerView.removeAllViews();
this.city=city;
this.industry_id=industry_id;
IS_LOADED=false;
sendMessage();
}
@Override
public void requestData() {
if(city.equals("全国")){
city="";
}
final HttpParams paramsPost = new HttpParams();
paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
paramsPost.put("city", "");
paramsPost.put("city", city);
paramsPost.put("industry_id", industry_id);
paramsPost.put("page", mNextRequestPage);
new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppDouyin_aweme).subscribe(new Observer<Response>() {
@@ -80,6 +94,10 @@ public class PrivateletterFragment extends MobanFragment {
List<awemeBean.ResultBean.DataBean> data = result.getData();
if (mNextRequestPage == 1) {
if (data.size() == 0) {
ViewParent parent = notDataView.getParent();
FrameLayout mFrameLayout = (FrameLayout)parent;
if(mFrameLayout!=null){
mFrameLayout.removeView(notDataView);}
markingtwoAdapter.setEmptyView(notDataView);
return;
}
@@ -102,11 +120,6 @@ public class PrivateletterFragment extends MobanFragment {
});
}
public void onRefresh(String industry_id){
this.industry_id=industry_id;
requestData();
}
@Override
public void onDestroy() {
super.onDestroy();

3
app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CustomerListBean.java
View File

@@ -2,6 +2,7 @@ package com.fenghoo.seven.main.kehu.Bean;
import com.fenghoo.seven.test.BaseModel;
import java.io.Serializable;
import java.util.List;
/**
@@ -80,7 +81,7 @@ public class CustomerListBean extends BaseModel {
this.data = data;
}
public static class DataBean {
public static class DataBean implements Serializable {
/**
* headimg :
* phone : 15862656263

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

@@ -22,6 +22,8 @@ public class AddCustDialogActivity extends BaseActivity {
private TitleBar mTitleBar;
private String customer_id="";
private String source="";
private String search="";
private String pagetype="";
@Override
@@ -32,7 +34,9 @@ public class AddCustDialogActivity extends BaseActivity {
StatusBarUtil.StatusBarLightMode(this); //设置白底黑字
customer_id = getIntent().getStringExtra("customer_id");
source = getIntent().getStringExtra("source");
addCusFragment = new AddCusFragment(customer_id,source);
search = getIntent().getStringExtra("search");
pagetype = getIntent().getStringExtra("pagetype");
addCusFragment = new AddCusFragment(customer_id,source,search,pagetype,null);
getSupportFragmentManager().beginTransaction().replace(R.id.containerrr,addCusFragment).commit();
findViewById(R.id.btn_comit).setOnClickListener(new View.OnClickListener() {

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

@@ -6,6 +6,7 @@ import android.view.View;
import com.fenghoo.seven.R;
import com.fenghoo.seven.base.BaseActivity;
import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
import com.fenghoo.seven.main.kehu.fragment.AddCusFragment;
import com.fenghoo.seven.widget.TitleBar;
@@ -18,6 +19,8 @@ public class AddCustomerActivity extends BaseActivity {
private TitleBar mTitleBar;
private String customer_id="";
private String source="";
private String search="";
private String pagetype="";
@Override
@@ -27,9 +30,15 @@ public class AddCustomerActivity extends BaseActivity {
mTitleBar = (TitleBar) findViewById(R.id.title_bar);
mTitleBar.setTitle("信息完善");
initNormalBack();
customer_id = getIntent().getStringExtra("customer_id");
source = getIntent().getStringExtra("source");
addCusFragment = new AddCusFragment(customer_id,source);
// customer_id = getIntent().getStringExtra("customer_id");
// source = getIntent().getStringExtra("source");
search = getIntent().getStringExtra("search");
pagetype = getIntent().getStringExtra("pagetype");
CustomerListBean.ResultBean.DataBean dataBean = (CustomerListBean.ResultBean.DataBean) getIntent().getSerializableExtra("dataBean");
customer_id = dataBean.getCustomer_id();
source = dataBean.getSource();
addCusFragment = new AddCusFragment(this.customer_id, this.source,search,pagetype,dataBean);
getSupportFragmentManager().beginTransaction().replace(R.id.containerrr,addCusFragment).commit();
findViewById(R.id.btn_comit).setOnClickListener(new View.OnClickListener() {

15
app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java
View File

@@ -129,10 +129,15 @@ public class ShowAty {
* @param
* @return
*/
public static void AddCustomerActivity(Context ctx,String customer_id,String source) {
public static void AddCustomerActivity(Context ctx,CustomerListBean.ResultBean.DataBean dataBean,String search,String pagetype) {
Intent i = new Intent(ctx, AddCustomerActivity.class);
i.putExtra("customer_id",customer_id);
i.putExtra("source",source);
// i.putExtra("customer_id",customer_id);
// i.putExtra("source",source);
i.putExtra("search",search);
i.putExtra("pagetype",pagetype);
Bundle bundle = new Bundle();
bundle.putSerializable("dataBean", dataBean);
i.putExtras(bundle);
ctx.startActivity(i);
}
/**
@@ -140,10 +145,12 @@ public class ShowAty {
* @param
* @return
*/
public static void AddCustDialogActivity(Context ctx,String customer_id,String source) {
public static void AddCustDialogActivity(Context ctx,String customer_id,String source,String search,String pagetype) {
Intent i = new Intent(ctx, AddCustDialogActivity.class);
i.putExtra("customer_id",customer_id);
i.putExtra("source",source);
i.putExtra("search",search);
i.putExtra("pagetype",pagetype);
ctx.startActivity(i);
}

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

@@ -18,6 +18,8 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.R;
import com.fenghoo.seven.base.BaseBean;
import com.fenghoo.seven.main.find.entity.ThreeEvent;
import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
import com.fenghoo.seven.main.kehu.Bean.FirstEvent;
import com.fenghoo.seven.main.kehu.Bean.LabelBean;
import com.fenghoo.seven.main.kehu.Bean.SecondEvent;
@@ -31,6 +33,7 @@ import com.fenghoo.seven.utils.AbStrUtil;
import com.fenghoo.seven.utils.GlideTools;
import com.fenghoo.seven.utils.ImageUtils;
import com.fenghoo.seven.utils.ToastUtils;
import com.fenghoo.seven.utils.WidgetTools;
import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
import com.fenghoo.seven.widget.CircleImageView;
import com.lzy.okgo.model.Response;
@@ -76,12 +79,18 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene
private TextView textView14;
private String customer_id;
private String source;
private String search;
private String pagetype;
private ArrayList<LabelBean> label=new ArrayList<>();
CustomerListBean.ResultBean.DataBean dataBean;
public AddCusFragment(String customer_id,String source) {
public AddCusFragment(String customer_id, String source, String search, String pagetype, CustomerListBean.ResultBean.DataBean dataBean) {
super();
this.customer_id=customer_id;
this.source=source;
this.search=search;
this.pagetype=pagetype;//pagetype为""说明是添加客户，否则是信息完善
this.dataBean=dataBean;
addCustomerBean = new addCustomerBean();
EventBus.getDefault().register(this);
}
@@ -139,6 +148,13 @@ 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("")){
WidgetTools.setTextfive(textView0, "", dataBean.getName());
WidgetTools.setTextfive(textView4, "", dataBean.getPhone());
WidgetTools.setTextfive(textView6, "", dataBean.getWechat());
GlideTools.init(mContext).displaypic(imageView, dataBean.getHeadimg(), R.mipmap.icon_default_head);
}
ConstraintLayout constraintLayout7 = (ConstraintLayout) view.findViewById(R.id.constraintLayout7);
constraintLayout7.setOnClickListener(this);
ConstraintLayout constraintLayout8 = (ConstraintLayout) view.findViewById(R.id.constraintLayout8);
@@ -168,22 +184,22 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene
ToastUtils.showToast(mContext, "请输入客户电话");
return;
}
if( AbStrUtil.isEmpty(addCustomerBean.getWechat())){
ToastUtils.showToast(mContext, "请输入客户微信");
return;
}
if( AbStrUtil.isEmpty(addCustomerBean.getAddress())){
ToastUtils.showToast(mContext, "请输入客户住址");
return;
}
if( AbStrUtil.isEmpty(addCustomerBean.getStyle_id())){
ToastUtils.showToast(mContext, "请选择装修风格");
return;
}
if( AbStrUtil.isEmpty(addCustomerBean.getBudget())){
ToastUtils.showToast(mContext, "请选择装修预算");
return;
}
// if( AbStrUtil.isEmpty(addCustomerBean.getWechat())){
// ToastUtils.showToast(mContext, "请输入客户微信");
// return;
// }
// if( AbStrUtil.isEmpty(addCustomerBean.getAddress())){
// ToastUtils.showToast(mContext, "请输入客户住址");
// return;
// }
// if( AbStrUtil.isEmpty(addCustomerBean.getStyle_id())){
// ToastUtils.showToast(mContext, "请选择装修风格");
// return;
// }
// if( AbStrUtil.isEmpty(addCustomerBean.getBudget())){
// ToastUtils.showToast(mContext, "请选择装修预算");
// return;
// }
//网络请求提交数据
new NetApi().addCustomer(addCustomerBean.getUid(),addCustomerBean.getHeadimg(),addCustomerBean.getName(),addCustomerBean.getPhone(),addCustomerBean.getWechat(),addCustomerBean.getAddress(),addCustomerBean.getDecoration(),addCustomerBean.getStyle_id(),addCustomerBean.getBudget(),addCustomerBean.getSource(),addCustomerBean.getCustomer_id()).subscribe(new Observer<Response>() {
@@ -192,6 +208,8 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene
String body = (String) response.body();
BaseBean.ResultBean result = JsonUtils.fromJson(body, BaseBean.class).getResult();
if(result.getSuccess()==0){
//通知客户列表刷新数据
EventBus.getDefault().post(new ThreeEvent(pagetype,search));
getActivity().finish();
}else {
String msg = result.getMsg();

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

@@ -1,6 +1,8 @@
package com.fenghoo.seven.main.kehu.fragment;
import android.util.Log;
import android.view.ViewParent;
import android.widget.FrameLayout;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.R;
@@ -80,7 +82,8 @@ public class CustomerFragment extends MobanFragment {
//进入添加客户和完善信息
String customer_id = item.getCustomer_id();
String source = item.getSource();
ShowAty.AddCustomerActivity(getActivity(),customer_id,source);
// ShowAty.AddCustomerActivity(getActivity(),customer_id,source,search,"0");
ShowAty.AddCustomerActivity(getActivity(),item,search,"0");
}
}).show();
@@ -122,6 +125,10 @@ public class CustomerFragment extends MobanFragment {
List<CustomerListBean.ResultBean.DataBean> data = result.getData();
if (mNextRequestPage == 1) {
if (data.size() == 0) {
ViewParent parent = notDataView.getParent();
FrameLayout mFrameLayout = (FrameLayout)parent;
if(mFrameLayout!=null){
mFrameLayout.removeView(notDataView);}
markingtwoAdapter.setEmptyView(notDataView);
return;
}

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

@@ -1,6 +1,8 @@
package com.fenghoo.seven.main.kehu.fragment;
import android.util.Log;
import android.view.ViewParent;
import android.widget.FrameLayout;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.main.find.entity.ThreeEvent;
@@ -83,6 +85,10 @@ public class DealFragment extends MobanFragment {
List<orderListBean.ResultBean.DataBean> data = result.getData();
if (mNextRequestPage == 1) {
if (data.size() == 0) {
ViewParent parent = notDataView.getParent();
FrameLayout mFrameLayout = (FrameLayout)parent;
if(mFrameLayout!=null){
mFrameLayout.removeView(notDataView);}
markingtwoAdapter.setEmptyView(notDataView);
return;
}

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

@@ -1,6 +1,8 @@
package com.fenghoo.seven.main.kehu.fragment;
import android.util.Log;
import android.view.ViewParent;
import android.widget.FrameLayout;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.main.find.entity.ThreeEvent;
@@ -82,6 +84,10 @@ public class DistriFragment extends MobanFragment {
List<FpListBean.ResultBean.DataBean> data = result.getData();
if (mNextRequestPage == 1) {
if (data.size() == 0) {
ViewParent parent = notDataView.getParent();
FrameLayout mFrameLayout = (FrameLayout)parent;
if(mFrameLayout!=null){
mFrameLayout.removeView(notDataView);}
markingtwoAdapter.setEmptyView(notDataView);
return;
}

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

@@ -42,6 +42,7 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener
private DealFragment yichengjiaoFragment;
private Savaselect savaselect;
private String pagetype="0";
private TextView floatingActionButton;
@SuppressLint("HandlerLeak")
private Handler handler = new Handler() {
@@ -154,6 +155,14 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener
mEnterShopTitle.setOnClickListener(this);
bt_fenpei = (RelativeLayout)view.findViewById(R.id.bt_fenpei);
bt_fenpei.setOnClickListener(this);
floatingActionButton = (TextView)view.findViewById(R.id.floatingActionButton);
floatingActionButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
//进入添加客户和完善信息
ShowAty.AddCustDialogActivity(getActivity(),"","","","");
}
});
}
@Override

8
app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java
View File

@@ -158,10 +158,10 @@ public class MyFragment
switch (view.getId()) {
case R.id.item_my_twitter:
XfiveWebActivity.runActivity(getActivity(), "隐私政策", "http://www.fenghoo.cn/public/statement/7");
// XfiveWebActivity.runActivity(getActivity(), "隐私政策", "http://192.168.1.3/public/statement/statement");
// WebActivitytwo.runActivity(getActivity(), "隐私政策", "http://192.168.1.3/public/statement/statement");
// webView.loadUrl("file:///android_asset/h5Text0.html"); //加载assets文件中的H5页面
// XfiveWebActivity.runActivity(getActivity(), "隐私政策", "http://www.fenghoo.cn/public/statement/7");
XfiveWebActivity.runActivity(getActivity(), "隐私政策", "file:///android_asset/privacy.html");
// WebActivitytwo.runActivity(getActivity(), "隐私政策", "file:///android_asset/privacy.html");
break;
}