diff --git a/app/src/main/java/com/sl/house_property/DoConfig.java b/app/src/main/java/com/sl/house_property/DoConfig.java index d53681d..c732440 100644 --- a/app/src/main/java/com/sl/house_property/DoConfig.java +++ b/app/src/main/java/com/sl/house_property/DoConfig.java @@ -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 = ""; } diff --git a/app/src/main/java/com/sl/house_property/MainFragment.java b/app/src/main/java/com/sl/house_property/MainFragment.java index 035350e..f6fca6f 100644 --- a/app/src/main/java/com/sl/house_property/MainFragment.java +++ b/app/src/main/java/com/sl/house_property/MainFragment.java @@ -119,6 +119,7 @@ public class MainFragment extends BaseFragment 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 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 map = new HashMap<>(); RegisterUser registerUser = Config.getInstance(getContext()).getUser(); @@ -263,10 +268,11 @@ public class MainFragment extends BaseFragment 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 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 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 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 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); diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java index 85850fc..6c6a820 100644 --- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java +++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java @@ -93,7 +93,7 @@ public class HistoryRecordActivity extends BaseActivity(); - 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); diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivitytwo.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivitytwo.java index 930a9da..4cd9149 100644 --- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivitytwo.java +++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivitytwo.java @@ -62,6 +62,7 @@ public class HistoryRecordActivitytwo extends BaseActivity discoveryListEntities = new ArrayList<>(); private ArrayList fragments; private String[] strings; + private String wy_id; @Override protected int getLayoutResId() { @@ -80,6 +81,7 @@ public class HistoryRecordActivitytwo extends BaseActivity(); - 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); diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java index f4656ad..d950bc6 100644 --- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java +++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java @@ -76,19 +76,22 @@ public class HistoryRecordFragment extends BaseFragment 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 { 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);