From 092181c08836dde72efc695f8512fdffa124a8fe Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Tue, 9 Mar 2021 17:40:00 +0800 Subject: [PATCH] d --- .../com/sl/house_property/DialogHelptwo.java | 34 ++--- .../com/sl/house_property/Main4Fragment.java | 81 ++++++++++-- .../MarkingFinishAwardDialong.java | 69 ++++++++++ .../sl/house_property/RedPackagedialog.java | 53 ++++++++ .../FileUpLoad/retrofit/HttpStaticApi.java | 1 + .../java/utils/SelectPicDanimicActivity.java | 26 ++-- app/src/main/res/drawable/bg_btn_yellow.xml | 15 +++ app/src/main/res/drawable/close.png | Bin 0 -> 2391 bytes .../main/res/layout/item_leibiandialog.xml | 123 ++++++------------ .../res/layout/marking_award_activity.xml | 44 +++++++ 10 files changed, 323 insertions(+), 123 deletions(-) create mode 100644 app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java create mode 100644 app/src/main/java/com/sl/house_property/RedPackagedialog.java create mode 100644 app/src/main/res/drawable/bg_btn_yellow.xml create mode 100644 app/src/main/res/drawable/close.png create mode 100644 app/src/main/res/layout/marking_award_activity.xml diff --git a/app/src/main/java/com/sl/house_property/DialogHelptwo.java b/app/src/main/java/com/sl/house_property/DialogHelptwo.java index 2258f5c..672fc70 100644 --- a/app/src/main/java/com/sl/house_property/DialogHelptwo.java +++ b/app/src/main/java/com/sl/house_property/DialogHelptwo.java @@ -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); diff --git a/app/src/main/java/com/sl/house_property/Main4Fragment.java b/app/src/main/java/com/sl/house_property/Main4Fragment.java index db7ec0d..4910913 100644 --- a/app/src/main/java/com/sl/house_property/Main4Fragment.java +++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java @@ -10,6 +10,7 @@ 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; @@ -20,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; @@ -36,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; @@ -210,9 +215,10 @@ public class Main4Fragment extends BaseFragment 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); @@ -246,6 +252,7 @@ public class Main4Fragment extends BaseFragment implements } }); + } }); mDataBinding.ll1.setOnClickListener(new View.OnClickListener() { @@ -589,6 +596,7 @@ public class Main4Fragment extends BaseFragment 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); @@ -630,7 +638,8 @@ public class Main4Fragment extends BaseFragment 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(); } @@ -655,7 +664,7 @@ public class Main4Fragment extends BaseFragment implements } }; - private void uploaduPuserImage(File file) { + private void uploaduPuserImage(String file) { progressDialog.setMessage(getString(R.string.requsting)); progressDialog.setCancelable(false); progressDialog.show(); @@ -669,17 +678,17 @@ public class Main4Fragment extends BaseFragment 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 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); } @@ -691,11 +700,32 @@ public class Main4Fragment extends BaseFragment 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); } @@ -711,6 +741,33 @@ public class Main4Fragment extends BaseFragment 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 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 params = retrofitHttpUpLoad.addParameter(map).bulider(); + retrofitHttpUpLoad.setHandler(handler); + retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, params), + this, HttpStaticApi.HTTP_UPLOADIMAGE); + + } } diff --git a/app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java b/app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java new file mode 100644 index 0000000..2f138be --- /dev/null +++ b/app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java @@ -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); +// } +} diff --git a/app/src/main/java/com/sl/house_property/RedPackagedialog.java b/app/src/main/java/com/sl/house_property/RedPackagedialog.java new file mode 100644 index 0000000..9a8fa53 --- /dev/null +++ b/app/src/main/java/com/sl/house_property/RedPackagedialog.java @@ -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) { + + + } + }); + } + +} diff --git a/app/src/main/java/http/FileUpLoad/retrofit/HttpStaticApi.java b/app/src/main/java/http/FileUpLoad/retrofit/HttpStaticApi.java index 64452c6..9d4f6b2 100644 --- a/app/src/main/java/http/FileUpLoad/retrofit/HttpStaticApi.java +++ b/app/src/main/java/http/FileUpLoad/retrofit/HttpStaticApi.java @@ -6,4 +6,5 @@ package http.FileUpLoad.retrofit; public class HttpStaticApi { public static final int HTTP_UPLOADIMAGE = 21007;//上传图片 + public static final int HTTP_UPLOADIMAGF = 21008;//上传图片 } diff --git a/app/src/main/java/utils/SelectPicDanimicActivity.java b/app/src/main/java/utils/SelectPicDanimicActivity.java index 479719a..c48605f 100644 --- a/app/src/main/java/utils/SelectPicDanimicActivity.java +++ b/app/src/main/java/utils/SelectPicDanimicActivity.java @@ -45,6 +45,7 @@ public class SelectPicDanimicActivity extends Activity implements OnClickListene private int photeid; private boolean crop;//裁剪 private int cropx, cropy;//裁剪的高和宽 + private int entertype=1;// @Override protected void onCreate(Bundle savedInstanceState) { @@ -101,22 +102,23 @@ public class SelectPicDanimicActivity extends Activity implements OnClickListene crop = getIntent().getBooleanExtra("crop", false); cropx = getIntent().getIntExtra("cropx", 1); cropy = getIntent().getIntExtra("cropy", 2); + entertype = getIntent().getIntExtra("entertype", 1); fileolod = Environment.getExternalStorageDirectory().getPath() + string + filelodother; break; } - - try { + if(entertype==100){ + 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); + 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但我发现在有些机子中会出问题，所以优先选择这个 + //拍照我们用Action为MediaStore.ACTION_IMAGE_CAPTURE， + //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个 /* Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); @@ -124,10 +126,10 @@ public class SelectPicDanimicActivity extends Activity implements OnClickListene Environment.getExternalStorageDirectory(), "temp.jpg"))); System.out.println("=============" + Environment.getExternalStorageDirectory());*/ - } catch (Exception e) { - e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } } - } diff --git a/app/src/main/res/drawable/bg_btn_yellow.xml b/app/src/main/res/drawable/bg_btn_yellow.xml new file mode 100644 index 0000000..e343767 --- /dev/null +++ b/app/src/main/res/drawable/bg_btn_yellow.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/close.png b/app/src/main/res/drawable/close.png new file mode 100644 index 0000000000000000000000000000000000000000..650705a4206f6b9db141d667cd9eb5c3e6fc1acd GIT binary patch literal 2391 zcmaJ@dpuNmAD(e7MJg29I!1_?D>0MXm>C(&u;Y>>HD*ps%$(`WVB8HUmr55EU6zVA ztDB^Yl#$!o#;sZijYKpJO?C2%MqA#Weh<%`);%GJuBFJ1Q1O(`Ob|}aK+1!}jji5aOp=`wS z4G;$~JV_jgk7mzd&=S5-!A2nLog_jwCma+5Az&y^;DGvYw+aRDxDKezHViC7NCCrm zZm}@v6U+4F#D;T-T$Ga|U@svl1o)ts4M_MA0uf2#fcm0KQtaohF(}{*L>%sb`X{LX zhBrWgU=XlD+gNe1IBUR`h{oCAtnF}?03M4YV6X%Xj$nnuldwb*&Ib7UpcK(y?oJYm z>iRX7;^cq|6N`l;3?@1{8XZkQLvSbtM;8P6+FK@kV$ z3B^1}0L&?}L!d~p14@zUKPB*m-(&@%uWeE^3?pF+F*r1KuB3S&gYo~NeEv7INX!EN z&G&x_i+p2*Ach5sph%db7~D?dxllq91qRt-2=;}bi1{vhhe2XU6b1^w6Q7P6~0u}E0?{epyz!xeaQ$d&)1#(?sh!1?Jn8f>jF2wKZedTh$p9}fB zT#O+G`%0e61H&V9X*yk9 z?FD@|oeM7l78YT3?%FzJO@E!7$#W~u(?+CAE@dtm`LpI$hHG7Ja=L5UI&DsTPOZVQ z+JGbenJk|SI6=?Nq?qL#yS~+>xI46}t?}dV%X@b_7nx06-xwVldY>5AFV7>`UcG#| zDZ|-SsaIN->?7q!LkbXos6{C?$*wvpkClrormLgEY;7c4;5-Tas7?rieqhBr*zpV`>#Pi-^#&Q3jMJvplm$tPD864eF%r3*eD6`agp z|N6Zwt=R|wHg@9kiv%avAl|k9Z6XULq6W68KhN%UITs_-sVpP;jd=|P4yD?i_>?Wh z8QmF34X_cGHz0Tm>-$#}?V1(t$WAo0${!vKMlvrDq)mao70O3GFSzYFQ3rIKBv1Q} zCw@$F9BemeGIV2hv%jgt0u)7Nq37v7Dw&LY!HavCC-Ei{jch~nEt$CwoK9I{u@gi!3DSfgSHuvjb zOcp)Ov@2R%8$J`IHaZ2rIV}@Cd!`zDbG^swoNj3;su>xNZmMXs$eOe)F!gA80^TDW z?rSI>p~>hcS`n4~2>uLQpnO{`VD&Yp8WB}mo;Gc|=V33xm8aF3Ah_0_%(pl*$}*&k zgA%RGMuB-%+IYuI;Zd&3?gV5#{rBU=o(t(OB5Xfz@hzS*_IsvZox`p zg3VA#$UOuwo7S)+wbR!2sl5B^Hu_Tf#lN*WBO?dz1Lx|;ZUm2)Cf@a%I=!w?W(vuR zwo?y?kQI*}Ny=uDQf;apxV?yYLQg!U(Lik-aSw;#u}bH&k$20r`u4p$|4jbl5!;Sm z2refzqGxqSH=GFEFq`#U;JuC<9k}cqrbe_?t}$-57YM$pa>N)K)i1vLe zWic0;a`D@8&dM5*{1>^u>FTGH3BrH)qXemvr+n123Rg!kU3F&lgZfZ&$CkB>Px#Nx zNY$;0%7iP;seYF>{8>r2^qY(bbv7`ZFf3Wi8bG)m7@Zmp+GY#5O*hw$Q7(=2gk8?b zi-^ChRDr%zO_kkwRJh|HUVG2YxUgAFLaD}+god!hl5!}ay@8pDKD71bDWzq$?}Jok zUX62q>U2myktI1&>r+1DCCebSjm)nrMOs&VY z-4iPJEg~%bc+siLiW8NqI}~5ALMy6%f6Vk|-&MR1(LRKo)5&)&Z^d+1%a2PZRk9?0 zgRU>FJmf_Qd&@&M^aYLq!D}}y+niEBeY>QAG3I(jU2o{8^{*U=?UKC5qAuF&?dA?} zPtyJNUT&XXPt?mX&s|I?e06PJd*T*a{kC3jGrntcOP-FI;LfpzO8>~$kwOB>B&i+d-CDgjh?-)M&+KhWkz1ag_59Ci#MT< zo&C`Ho6)eA_H+D%V~57g+vFsb!lC%O6-cJ+XXKKtZH4DC*IZvko)0< zT!_XmFI>FwO!e}S6W28ky39-@AMWGJ{ER&JroJg{g0;KzBe^T8s~m4j&3#fb^i#;p vmVAo{+v}U8K_#e0Qqg;Znwg(8 + android:orientation="vertical" + android:paddingLeft="40px" + android:paddingRight="40px" + android:gravity="center_vertical"> - + - + + + + +