Merge branch 'master' of https://gitee.com/renjianbo0118/HouseProperty
Conflicts: app/src/main/java/com/sl/house_property/DoConfig.java app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
This commit is contained in:
@@ -167,6 +167,22 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
|
||||
}
|
||||
;
|
||||
}
|
||||
String wy_id=(String) SPUtils.getSp(getActivity(), DoConfig.MY_HOUST_WYID,"");
|
||||
if (wy_id.equals("")) {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
RegisterUser registerUser = Config.getInstance(getContext()).getUser();
|
||||
if (registerUser != null) {
|
||||
map.put("userid", registerUser.getUserid());
|
||||
} else {
|
||||
map.put("userid", 0 + "");
|
||||
}
|
||||
|
||||
map.put("sign", Md5.md5("Cas" + "GetMyAddress" + Md5.secret));
|
||||
map.put("app", "Cas");
|
||||
map.put("class", "GetMyAddress");
|
||||
getGankList(ApiConfig.BASE_URL, map, "", 1);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
private ArrayList<HomelistitemEntity> list;
|
||||
@@ -249,6 +265,8 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
|
||||
if (list.size() > 0) {
|
||||
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());
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -260,6 +278,36 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
|
||||
}
|
||||
|
||||
|
||||
break;
|
||||
case 1:
|
||||
Gson gss = new Gson();
|
||||
LinkedTreeMap adtaa = (LinkedTreeMap) resultcode.data;
|
||||
String ss = gss.toJson(adtaa);
|
||||
try {
|
||||
JSONObject jsonObject = new JSONObject(ss);
|
||||
JSONArray jsonArray = jsonObject.getJSONArray("home");
|
||||
Type type = new TypeToken<ArrayList<HomelistitemEntity>>() {
|
||||
}.getType();
|
||||
list = new Gson().fromJson(jsonArray.toString(), type);
|
||||
if (list == null || list.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
final ArrayList<String> strings = new ArrayList<>();
|
||||
for (int i = 0; i < list.size(); i++) {
|
||||
strings.add(list.get(i).getAddress());
|
||||
}
|
||||
if (list.size() > 0) {
|
||||
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());
|
||||
|
||||
}
|
||||
|
||||
} catch (JSONException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user