This commit is contained in:
2021-03-24 17:36:43 +08:00
parent 45f7fcaccf
commit d14c687296
6 changed files with 29 additions and 11 deletions

View File

@@ -9,5 +9,5 @@ public class DoConfig {
public static String FANGCHAN_DATA = "0";//0代表没有数据 1代表有数据
public static String MY_HOUST_ADDRESS = "";
public static String MY_HOUST_WYID = "";
// public static String MY_HOUST_WYID = "";
}

View File

@@ -119,6 +119,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
private BaseRecycleViewAdapter baseRecycleViewAdapterv;
private RegisterUser user;
private String miyuetime;
private String wy_id="";
public MainFragment() {
// Required empty public constructor
@@ -167,7 +168,11 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
}
;
}
String wy_id=(String) SPUtils.getSp(getActivity(), DoConfig.MY_HOUST_WYID,"");
// String wy_id=(String) SPUtils.getSp(getActivity(), DoConfig.MY_HOUST_WYID,"");
String area=(String) SPUtils.getSp(getActivity(), DoConfig.MY_HOUST_ADDRESS,"");
if(!area.equals("")){
wy_id="-";
}
if (wy_id.equals("")) {
Map<String, String> map = new HashMap<>();
RegisterUser registerUser = Config.getInstance(getContext()).getUser();
@@ -263,10 +268,11 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
@Override
public void onOptionsSelect(int position, int option2, int options3) {
if (list.size() > 0) {
Log.e("设置的数据1",list.get(position).getAddress());
SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_ADDRESS, list.get(position).getAddress());
mDataBinding.tv1Address.setText(list.get(position).getAddress());
SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_WYID, list.get(position).getWy_id());
// SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_WYID, list.get(position).getWy_id());
wy_id=list.get(position).getWy_id();
}
}
@@ -297,10 +303,11 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
strings.add(list.get(i).getAddress());
}
if (list.size() > 0) {
Log.e("设置的数据3",list.get(0).getAddress());
SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_ADDRESS, list.get(0).getAddress());
mDataBinding.tv1Address.setText(list.get(0).getAddress());
SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_WYID, list.get(0).getWy_id());
// SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_WYID, list.get(0).getWy_id());
wy_id=list.get(0).getWy_id();
}
} catch (JSONException e) {
@@ -371,6 +378,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
banner.setLayoutParams(bannerLP);
mDataBinding.taobaoRefreshLayout.autoRefresh();
String area = (String) SPUtils.getSp(getContext(), DoConfig.MY_HOUST_ADDRESS, "智慧小区");
Log.e("地址1",area);
mDataBinding.tv1Address.setText(area);
mDataBinding.tv1Address.setOnClickListener(new View.OnClickListener() {
@Override
@@ -401,7 +409,10 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
@Override
public void onOptionsSelect(int position, int option2, int options3) {
if (list.size() > 0) {
Log.e("设置的数据2",list.get(position).getAddress());
SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_ADDRESS, list.get(position).getAddress());
// SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_WYID, list.get(position).getWy_id());
wy_id=list.get(position).getWy_id();
mDataBinding.tv1Address.setText(list.get(position).getAddress());
}
@@ -454,6 +465,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
final RegisterUser user =
Config.getInstance(getActivity()).getUser();
intent.putExtra("userId", user.getUserid());
intent.putExtra("wyuserId", wy_id);
intent.putExtra("userName", user.getNickname());
intent.putExtra("title", "物业服务");
intent.putExtra("dataType",1);

View File

@@ -93,7 +93,7 @@ public class HistoryRecordActivity extends BaseActivity<LayoutHistoryRecordBindi
// strings[1] = "商品";
fragments = new ArrayList<>();
fragments.add(HistoryRecordFragment.newInstance(1, userId,0,getIntent().getIntExtra("dataType",0)));
fragments.add(HistoryRecordFragment.newInstance(1, userId,0,getIntent().getIntExtra("dataType",0),""));
// fragments.add(HistoryRecordFragment.newInstance(2, userId,0,getIntent().getIntExtra("dataType",0)));
MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getSupportFragmentManager());
mDataBinding.fl.setAdapter(myViewPagerAdapter);

View File

@@ -62,6 +62,7 @@ public class HistoryRecordActivitytwo extends BaseActivity<LayoutHistoryRecordtw
private ArrayList<DiscoveryListEntity> discoveryListEntities = new ArrayList<>();
private ArrayList<Fragment> fragments;
private String[] strings;
private String wy_id;
@Override
protected int getLayoutResId() {
@@ -80,6 +81,7 @@ public class HistoryRecordActivitytwo extends BaseActivity<LayoutHistoryRecordtw
// | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出
.init();
userId = getIntent().getStringExtra("userId");
wy_id = getIntent().getStringExtra("wyuserId");
String title = getIntent().getStringExtra("title");
mDataBinding.tvTitle.setText(title);
// mDataBinding.tvTitle.setText(userName);
@@ -94,7 +96,7 @@ public class HistoryRecordActivitytwo extends BaseActivity<LayoutHistoryRecordtw
// strings[1] = "商品";
fragments = new ArrayList<>();
fragments.add(HistoryRecordFragment.newInstance(1, userId,0,getIntent().getIntExtra("dataType",0)));
fragments.add(HistoryRecordFragment.newInstance(1, userId,0,getIntent().getIntExtra("dataType",0),wy_id));
// fragments.add(HistoryRecordFragment.newInstance(2, userId,0,getIntent().getIntExtra("dataType",0)));
MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getSupportFragmentManager());
mDataBinding.fl.setAdapter(myViewPagerAdapter);

View File

@@ -76,19 +76,22 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
private Loader loader;
private ArrayList<DiscoveryListEntity> discoveryListEntities = new ArrayList<>();
private int num;
private String wy_id;
@Override
protected int getLayoutId() {
return R.layout.fragment_history_record;
}
public static HistoryRecordFragment newInstance(int param1, String param2, int i, int num) {
public static HistoryRecordFragment newInstance(int param1, String param2, int i, int num,String wy_id) {
HistoryRecordFragment fragment = new HistoryRecordFragment();
Bundle args = new Bundle();
args.putInt("param1", param1);
args.putString("param2", param2);
args.putInt("num",i);
args.putInt("dataType",num);
args.putString("wy_id",wy_id);
fragment.setArguments(args);
return fragment;
}
@@ -98,6 +101,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
super.onCreate(savedInstanceState);
type = getArguments().getInt("param1");
userId = getArguments().getString("param2");
wy_id = getArguments().getString("wy_id");
num = getArguments().getInt("num", 0);
}
@@ -701,7 +705,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
map.put("type", type + "");
map.put("app", "Goods");
if (getArguments().getInt("dataType")==1){
String wy_id=(String) SPUtils.getSp(getActivity(), DoConfig.MY_HOUST_WYID,"");
// String wy_id=(String) SPUtils.getSp(getActivity(), DoConfig.MY_HOUST_WYID,"");
Log.e("物业id",wy_id);
map.put("userid", wy_id);
map.put("class", "WyGoodsLists");

View File

@@ -88,7 +88,7 @@ public class LikeFragment extends BaseFragment<FragmentLikeBinding> {
userId = "0";
}
fragments.add(HistoryRecordFragment.newInstance(1, userId, 0, 3));
fragments.add(HistoryRecordFragment.newInstance(1, userId, 0, 3,""));
// fragments.add(HistoryRecordFragment.newInstance(2, userId, 0, 3));
MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getChildFragmentManager());
mDataBinding.fl.setAdapter(myViewPagerAdapter);