admin/HouseProperty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/renjianbo0118/HouseProperty

Browse Source
This commit is contained in:
renjianbo0118
2021-03-10 01:13:41 +08:00
parent ec75b36074 092181c088
commit 990e09ba2c
16 changed files with 404 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/com/sl/house_property/DialogHelptwo.java
View File

@@ -28,15 +28,17 @@ public class DialogHelptwo {
this.money_sum=money_sum;
this.bond=bond;
final Dialog dialog = new Dialog(mcontext, R.style.DialogStyle);
dialog.setCancelable(false);
dialog.setCanceledOnTouchOutside(false);
dialog.setCancelable(true);
dialog.setCanceledOnTouchOutside(true);
View view = LayoutInflater.from(mcontext).inflate(R.layout.item_leibiandialog, null);
dialog.setContentView(view);
TextView tv_title = (TextView) view.findViewById(R.id.tv_title);
TextView tvSexCancel = (TextView) view.findViewById(R.id.tvSexCancel);
TextView tvPhone = (TextView) view.findViewById(R.id.tvPhone);
TextView tvSexSend = (TextView) view.findViewById(R.id.tvSexSend);
tv_title.setText("温馨提示");
dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
// TextView tv_title = (TextView) view.findViewById(R.id.tv_title);
// TextView tvSexCancel = (TextView) view.findViewById(R.id.tvSexCancel);
// TextView tvPhone = (TextView) view.findViewById(R.id.tvPhone);
// TextView tvSexSend = (TextView) view.findViewById(R.id.tvSexSend);
TextView tvSexSend = (TextView) view.findViewById(R.id.btn_oreder_back);
// tv_title.setText("温馨提示");
tvSexSend.setText(s2);
tvSexSend.setOnClickListener(new View.OnClickListener() {
@@ -47,15 +49,15 @@ public class DialogHelptwo {
dialog.dismiss();
}
});
tvSexCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
clickListener.cancle();
dialog.dismiss();
}
});
// tvSexCancel.setOnClickListener(new View.OnClickListener() {
//
// @Override
// public void onClick(View v) {
// clickListener.cancle();
// dialog.dismiss();
//
// }
// });
Window mWindow = dialog.getWindow();
WindowManager.LayoutParams lp = mWindow.getAttributes();
lp.width = MyDialog.getScreenWidth(mcontext);

108
app/src/main/java/com/sl/house_property/Main4Fragment.java
View File

@@ -8,8 +8,11 @@ import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
import android.provider.MediaStore;
import android.support.v4.app.Fragment;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
@@ -18,6 +21,8 @@ import android.widget.RelativeLayout;
import com.cutil.SizeUtils;
import com.cutil.StringUtils;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.sl.house_property.cart.AddressListActivity;
import com.sl.house_property.databinding.FragmentMain4Binding;
import com.sl.house_property.discovery.LikeActivity;
@@ -34,6 +39,8 @@ import com.sl.house_property.user.MyUserMessage;
import com.sl.house_property.user.MyWalletActivity;
import com.squareup.picasso.Picasso;
import org.json.JSONObject;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -84,6 +91,7 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
private BaseRecycleViewAdapter baseRecycleViewAdapter;
private ImageView userImageView;
BaseActivity baseActivity;
private String fileolod = "";
public Main4Fragment() {
// Required empty public constructor
@@ -207,12 +215,35 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
startActivityForResult(intent, 0);
return;
}
// RedPackagedialog.build(getActivity()).showAwardRedPackagedialog("");
//弹出激活对话框
new DialogHelptwo().showDownloadDialog(getActivity(), "", "","确认", new DialogHelptwo.ClickListener() {
new DialogHelptwo().showDownloadDialog(getActivity(), "", "","好的，去上传人脸照片", new DialogHelptwo.ClickListener() {
@Override
public void confirm() {
takeMyPhoto(1000);
// try {
//
//
// Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
// intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
// intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
// .fromFile(new File(fileolod)));
// startActivityForResult(intent, 1);
//
//
// //拍照我们用Action为MediaStore.ACTION_IMAGE_CAPTURE，
// //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个
//
//
// /* Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
// intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
// Environment.getExternalStorageDirectory(), "temp.jpg")));
// System.out.println("=============" + Environment.getExternalStorageDirectory());*/
//
// } catch (Exception e) {
// e.printStackTrace();
// }
}
@Override
@@ -221,6 +252,7 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
}
});
}
});
mDataBinding.ll1.setOnClickListener(new View.OnClickListener() {
@@ -564,6 +596,7 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
intent.putExtra("crop", true);
intent.putExtra("cropx", 100);
intent.putExtra("cropy", 100);
intent.putExtra("entertype", 100);
startActivityForResult(intent, userImgeREQUST);
getActivity().overridePendingTransition(R.anim.slide_from_bottom,
R.anim.slide_out_bottom);
@@ -571,7 +604,7 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
Log.e("测试","测试");
try {
if (!(data == null)) {
setIconDataFromIntent(data, requestCode,resultCode);
@@ -605,7 +638,8 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
file = BitmapTools.saveFile(image, Environment.getExternalStorageDirectory().getPath() + "/haotian", itmepath+requestCode + otherphoto);
// Picasso.with(getActivity()).load(file).into(mDataBinding.myphoto);
uploaduPuserImage(file);
uploaduPuserImageone(file);
// uploaduPuserImage(file);
} catch (IOException e) {
e.printStackTrace();
}
@@ -630,7 +664,7 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
}
};
private void uploaduPuserImage(File file) {
private void uploaduPuserImage(String file) {
progressDialog.setMessage(getString(R.string.requsting));
progressDialog.setCancelable(false);
progressDialog.show();
@@ -644,17 +678,17 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
} else {
map.put("userid", 0 + "");
}
map.put("app", "Cas");
map.put("class", "UploadAvatar");
map.put("sign", Md5.md5("Cas" + "UploadAvatar" + Md5.secret));
map.put("app", "Door");
map.put("class", "AddFaceInfo");
map.put("sign", Md5.md5("Door" + "AddFaceInfo" + Md5.secret));
map.put("avatar", file);
map.put("faceinfo", file);
Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
retrofitHttpUpLoad.setHandler(handler);
retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, params),
this, HttpStaticApi.HTTP_UPLOADIMAGE);
this, HttpStaticApi.HTTP_UPLOADIMAGF);
}
@@ -666,11 +700,32 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
Resultcode resultcode = (Resultcode)response.body();
if (0==(resultcode.status)) {
baseActivity.setToast("修改成功");
// baseActivity.setToast("修改成功");
Object body= (Object)resultcode.data;
Gson gson = new Gson();
String bodyy = gson.toJson(body);
try {
JSONObject jsonObject = new JSONObject(bodyy);
String success = jsonObject.optString("filepath");
Log.e("获得的图片链接",success);
uploaduPuserImage(success);
} catch (Exception e) {
}
// updatePortrait = true;
RegisterUser user=Config.getInstance(getActivity()).getUser();
user.setAvatar((String)resultcode.data);
Config.getInstance(getActivity()).putUser(user);
// RegisterUser user=Config.getInstance(getActivity()).getUser();
// user.setAvatar((String)resultcode.data);
// Config.getInstance(getActivity()).putUser(user);
} else {
baseActivity.setToast(resultcode.msg);
}
break;
case HttpStaticApi.HTTP_UPLOADIMAGF:
resultcode = (Resultcode)response.body();
if (0==(resultcode.status)) {
baseActivity.setToast("上传成功");
} else {
baseActivity.setToast(resultcode.msg);
}
@@ -686,6 +741,33 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
baseActivity.setToast(getString(R.string.getdatafailure));
}
private void uploaduPuserImageone(File file) {
progressDialog.setMessage(getString(R.string.requsting));
progressDialog.setCancelable(false);
progressDialog.show();
RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
retrofitHttpUpLoad.clear();
Map<String, Object> map = new HashMap<>();
RegisterUser user =
Config.getInstance(getActivity()).getUser();
if (user != null) {
map.put("userid", user.getUserid());
} else {
map.put("userid", 0 + "");
}
map.put("app", "Cas");
map.put("class", "UploadFacePic");
map.put("sign", Md5.md5("Cas" + "UploadFacePic" + Md5.secret));
map.put("avatar", file);
Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
retrofitHttpUpLoad.setHandler(handler);
retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, params),
this, HttpStaticApi.HTTP_UPLOADIMAGE);
}
}

2
app/src/main/java/com/sl/house_property/MainTabActivity.java
View File

@@ -6,6 +6,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.Gravity;
import android.view.MotionEvent;
import android.view.View;
@@ -328,6 +329,7 @@ public class MainTabActivity extends BaseActivity<ActivityMainTabBinding>
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
Log.e("测试","测试");
if (resultCode == RESUlT_CODE_4) {
if (currentFragment == fragment4) {
// if(fragment0!=null){

69
app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java Normal file
View File

@@ -0,0 +1,69 @@
package com.sl.house_property;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import utils.SelectPicDanimicActivity;
/**
* Created by 蔡雅楠 on 2018/4/24.
*/
public class MarkingFinishAwardDialong extends Dialog implements View.OnClickListener{
private ImageView mIvClose;
private TextView mTvMoney;
private String awardMoney;
private Button btn_oreder_back;
public MarkingFinishAwardDialong(@NonNull Context context, int themeResId, String moneyStr) {
super(context, themeResId);
this.awardMoney = moneyStr;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.setContentView(R.layout.marking_award_activity);
mIvClose = (ImageView) findViewById(R.id.close);
btn_oreder_back = (Button) findViewById(R.id.btn_oreder_back);
// mTvMoney = findViewById(R.id.tv_award_money);
mIvClose.setOnClickListener(this);
btn_oreder_back.setOnClickListener(this);
// mTvMoney.setText(awardMoney);
}
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.close:
MarkingFinishAwardDialong.this.dismiss();
break;
case R.id.btn_oreder_back:
// takeMyPhoto(1000);
break;
default:
break;
}
}
// private void takeMyPhoto(int userImgeREQUST) {
// //拍照
// Intent intent = new Intent(getActivity(),
// SelectPicDanimicActivity.class);
// intent.putExtra("photoid", userImgeREQUST);
// intent.putExtra("crop", true);
// intent.putExtra("cropx", 100);
// intent.putExtra("cropy", 100);
// intent.putExtra("entertype", 100);
// startActivityForResult(intent, userImgeREQUST);
// getActivity().overridePendingTransition(R.anim.slide_from_bottom,
// R.anim.slide_out_bottom);
// }
}

53
app/src/main/java/com/sl/house_property/RedPackagedialog.java Normal file
View File

@@ -0,0 +1,53 @@
package com.sl.house_property;
import android.app.Activity;
import android.content.DialogInterface;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.view.Window;
public class RedPackagedialog {
Activity context;
private MarkingFinishAwardDialong myDialog;
public RedPackagedialog(Activity contextt) {
this.context = contextt;
}
public static RedPackagedialog build(Activity contextt) {
return new RedPackagedialog(contextt);
}
public void showAwardRedPackagedialog(String moneyStr) {
//若想让弹出的dialog之外的背景为半透明，第二个参数传0 或者自定义样式
myDialog = new MarkingFinishAwardDialong(context, 0, moneyStr);
myDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);//代码中取消标题栏
myDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
myDialog.show();
myDialog.setCancelable(true);
myDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
}
});
}
public void showAwardRedPackagedialogtwo(String moneyStr) {
//若想让弹出的dialog之外的背景为半透明，第二个参数传0 或者自定义样式
myDialog = new MarkingFinishAwardDialong(context, 0, moneyStr);
myDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);//代码中取消标题栏
myDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
myDialog.show();
myDialog.setCancelable(false);
myDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
}
});
}
}

15
app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
View File

@@ -245,12 +245,23 @@ public class MyAuthorizedFamilyHistory extends BaseActivity<ActivityMyAuthorized
public void onBindViewHolder(Object b, final int position) {
if (!(position >= simpleEntities.size())) {
final FamilynumberpermissionBinding homeGridAdapterItemBinding = (FamilynumberpermissionBinding) b;
simpleEntities.get(position).setString12(position+1+"");
if(position==0){
simpleEntities.get(position).setString14("户主");
simpleEntities.get(position).setString12("");
}else {
simpleEntities.get(position).setString14("家庭成员");
simpleEntities.get(position).setString12(position+"");
}
homeGridAdapterItemBinding.setMyentity(simpleEntities.get(position));
homeGridAdapterItemBinding.edit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
DelFamilyMember(simpleEntities.get(position).getString3());
if(position>0){
DelFamilyMember(simpleEntities.get(position).getString3());}else {
setToast("户主不能删除自己");
}
}
});
}

67
app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java
View File

@@ -10,13 +10,10 @@ import android.view.View;
import com.google.gson.Gson;
import com.google.gson.internal.LinkedTreeMap;
import com.google.gson.reflect.TypeToken;
import com.lljjcoder.style.citylist.Toast.ToastUtils;
import com.lxj.xpopup.XPopup;
import com.lxj.xpopup.interfaces.OnInputConfirmListener;
import com.selectpicker.OptionsPopupWindow;
import com.sl.house_property.BaseActivity;
import com.sl.house_property.DoConfig;
import com.sl.house_property.LoginActivity;
import com.sl.house_property.MyHouseEntity;
import com.sl.house_property.R;
import com.sl.house_property.databinding.ActivityMyPropertyBinding;
@@ -39,7 +36,6 @@ import rx.Subscription;
import rx.functions.Action1;
import tools.Config;
import utils.Md5;
import utils.SPUtils;
import static android.view.View.VISIBLE;
@@ -103,15 +99,19 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
} else {
homeGridAdapterItemBinding.llS.setVisibility(VISIBLE);
}
// MyHouseList 返回了一个 is_verify 参数，1.是已通过 2.是未通过 0.是待验证
if (homegridentityvArrayList.get(position).getIs_verify() != null) {
if (homegridentityvArrayList.get(position).getIs_verify().equals("0")) {
homeGridAdapterItemBinding.tvYz.setText("未验证");
} else {
homeGridAdapterItemBinding.tvYz.setText("已验证");
homeGridAdapterItemBinding.tvYz.setText("待验证");
} else if(homegridentityvArrayList.get(position).getIs_verify().equals("1")){
homeGridAdapterItemBinding.tvYz.setText("已通过");
}else {
homeGridAdapterItemBinding.tvYz.setText("未通过");
}
}else {
homeGridAdapterItemBinding.tvYz.setText("未验证");
homeGridAdapterItemBinding.tvYz.setText("");
}
if (homegridentityvArrayList.get(position).isString9()){
homeGridAdapterItemBinding.tvFamily.setVisibility(VISIBLE);
@@ -121,7 +121,8 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
homeGridAdapterItemBinding.tvFamily.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (homegridentityvArrayList.get(position).getString13().equals("1")) {
//此处接口返回的is_host是1，但是解析后是double类型的1.0，所以做了特别处理，如果日后有问题，看看后台返回的is_host值
if (homegridentityvArrayList.get(position).getString13().equals("1.0")) {
AddFamilyDialog addFamilyDialog = new AddFamilyDialog(MyPropertyActivity.this, new AddFamilyDialog.OnAddFamilyListener() {
@Override
public void click(String phone,String username) {
@@ -140,7 +141,8 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
public void onClick(View view) {
if (homegridentityvArrayList.get(position).getIs_verify() != null) {
if (homegridentityvArrayList.get(position).getIs_verify().equals("0")) {
if (homegridentityvArrayList.get(position).getIs_verify().equals("0")||homegridentityvArrayList.get(position).getIs_verify().equals("2")) {
RegisterUser user =
Config.getInstance(MyPropertyActivity.this).getUser();
Map<String, String> map = new HashMap<>();
@@ -169,38 +171,9 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 100000 + position);
} else {
setToast(2, "已验证房产无法删除如需帮助请联系物业");
setToast("已验证通过的不允许删除");
}
}else {
RegisterUser user =
Config.getInstance(MyPropertyActivity.this).getUser();
Map<String, String> map = new HashMap<>();
if (user != null) {
map.put("userid", user.getUserid());
} else {
map.put("userid", 0 + "");
}
map.put("app", "Cas");
map.put("class", "DelMyHouse");
if (homegridentityvArrayList.get(position).getString8() == null || homegridentityvArrayList.get(position).getString8().equals("")) {
homegridentityvArrayList.remove(position);
baseRecycleViewAdapterv.setData(homegridentityvArrayList);
adding = false;
return;
}
if (homegridentityvArrayList.get(position).isString9() == false) {
homegridentityvArrayList.remove(position);
baseRecycleViewAdapterv.setData(homegridentityvArrayList);
adding = false;
return;
}
progressDialog.show();
map.put("user_home_id", homegridentityvArrayList.get(position).getString8());
map.put("sign", Md5.md5("Cas" + "DelMyHouse" + Md5.secret));
getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 100000 + position);
}
}
});
homeGridAdapterItemBinding.qu.setOnClickListener(new View.OnClickListener() {
@@ -482,14 +455,17 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
mDataBinding.myaddress.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Log.e("dsfsdfdsfs",adding+"");
if (!adding) {
adding = true;
homegridentityvArrayList.add(new SimpleEntity());
baseRecycleViewAdapterv.setData(homegridentityvArrayList);
// int size = homegridentityvArrayList.size();
// Log.e("dsfsdfsdfs",size+"");
// mDataBinding.recyView.scrollToPosition(size+2); // 将ListView定位到最后一行
} else {
setToast("您添加的信息尚未保存，请先保存信息");
}
}
});
}
@@ -563,14 +539,6 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
Type type = new TypeToken<ArrayList<MyHouseEntity>>() {
}.getType();
final ArrayList<MyHouseEntity> list = new Gson().fromJson(s, type);
if(list.size()==0){
SPUtils.setSP(MyPropertyActivity.this, DoConfig.FANGCHAN_DATA, "0");
Log.e("fuzhi","0");
}else {
SPUtils.setSP(MyPropertyActivity.this, DoConfig.FANGCHAN_DATA, "1");
Log.e("fuzhi","1");
}
for (int i = 0; i < list.size(); i++) {
// if (list.get(i).getAddress().contains("小区")) {
// list.get(i).setAddress(list.get(i).getAddress().replace("小区", "小区 "));
@@ -742,6 +710,7 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
homegridentityvArrayList.remove(requstecode - 100000);
}
if (requstecode >= 200000) {
adding=false;
homegridentityvArrayList.get(requstecode - 200000).setString9(true);
}