diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3378229..08f1998 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,10 +5,19 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/qaplug_profiles.xml b/.idea/qaplug_profiles.xml
new file mode 100644
index 0000000..3dfd21f
--- /dev/null
+++ b/.idea/qaplug_profiles.xml
@@ -0,0 +1,465 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 cb5a499..246344f 100644
--- a/app/src/main/java/com/sl/house_property/DoConfig.java
+++ b/app/src/main/java/com/sl/house_property/DoConfig.java
@@ -9,4 +9,7 @@ public class DoConfig {
public static String FANGCHAN_DATA = "0";//0代表没有数据 1代表有数据
public static String MY_HOUST_ADDRESS = "";
+
+ public static String MY_HOUST_NUM = "5";//申请密钥的次数
+ public static String MY_HOUST_TIME = "";//申请密钥的时间
}
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 4910913..2b9fd29 100644
--- a/app/src/main/java/com/sl/house_property/Main4Fragment.java
+++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java
@@ -23,9 +23,14 @@ import com.cutil.SizeUtils;
import com.cutil.StringUtils;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
+import com.google.gson.internal.LinkedTreeMap;
+import com.google.gson.reflect.TypeToken;
import com.sl.house_property.cart.AddressListActivity;
import com.sl.house_property.databinding.FragmentMain4Binding;
+import com.sl.house_property.db.CommentBeanData;
+import com.sl.house_property.dialog.DialogHelp;
import com.sl.house_property.discovery.LikeActivity;
+import com.sl.house_property.discovery.ShareCodeActivity;
import com.sl.house_property.f1.UserdlistActivity;
import com.sl.house_property.order.OrderActivity;
import com.sl.house_property.user.MyAuthorizedFamilyHistory;
@@ -39,24 +44,30 @@ import com.sl.house_property.user.MyUserMessage;
import com.sl.house_property.user.MyWalletActivity;
import com.squareup.picasso.Picasso;
+import org.json.JSONException;
import org.json.JSONObject;
import java.io.File;
import java.io.IOException;
+import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import adapter.BaseRecycleViewAdapter;
+import entity.Advertorial_listEntity;
import entity.MyUserFEntity;
import entity.RegisterUser;
import http.ApiConfig;
import http.FileUpLoad.retrofit.HttpStaticApi;
import http.FileUpLoad.retrofit.RetrofitCallBack;
import http.FileUpLoad.retrofit.RetrofitHttpUpLoad;
+import my_loader.Loader;
import my_loader.Resultcode;
import okhttp3.RequestBody;
import retrofit2.Response;
+import rx.Subscription;
+import rx.functions.Action1;
import tools.Config;
import tools.ImageCompress;
import utils.BitmapTools;
@@ -92,10 +103,11 @@ public class Main4Fragment extends BaseFragment implements
private ImageView userImageView;
BaseActivity baseActivity;
private String fileolod = "";
-
+ private Loader mGankLoader;
public Main4Fragment() {
// Required empty public constructor
}
+ private double data=0;
@Override
protected void onCreateVew(LayoutInflater inflater, Bundle savedInstanceState) {
@@ -117,6 +129,7 @@ public class Main4Fragment extends BaseFragment implements
startActivityForResult(intent, 0);
}
});
+ getlist(0);
initTopView();
// initMyReycyView();
initData();
@@ -208,6 +221,8 @@ public class Main4Fragment extends BaseFragment implements
mDataBinding.ll3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+
+
String fangchan = (String) SPUtils.getSp(getActivity(), DoConfig.FANGCHAN_DATA, "0");
if(fangchan.equals("0")){
Intent intent = new Intent(getActivity(), MyPropertyActivity.class);
@@ -217,33 +232,36 @@ public class Main4Fragment extends BaseFragment implements
}
// RedPackagedialog.build(getActivity()).showAwardRedPackagedialog("");
+ if(data==1.0){
+ new DialogHelp().showDownloadDialog(getActivity(), "该用户已进行人脸识别验证，是否进重新录入?", "确定", new DialogHelp.ClickListener() {
+ @Override
+ public void confirm() {
+ //弹出激活对话框
+ new DialogHelptwo().showDownloadDialog(getActivity(), "", "","好的，去上传人脸照片", new DialogHelptwo.ClickListener() {
+ @Override
+ public void confirm() {
+ takeMyPhoto(1000);
+ }
+
+ @Override
+ public void cancle() {
+
+ }
+ });
+ }
+
+ @Override
+ public void cancle() {
+
+ }
+ });
+ return;
+ }
//弹出激活对话框
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
@@ -769,5 +787,49 @@ public class Main4Fragment extends BaseFragment implements
}
+ private void getlist(int mypage) {
+ RegisterUser user =
+ Config.getInstance(getContext()).getUser();
+ Map map = new HashMap<>();
+ if (user != null) {
+ map.put("userid", user.getUserid());
+ } else {
+ map.put("userid", 0 + "");
+ }
+ map.put("app", "Door");
+ map.put("class", "IsExsitFace");
+ map.put("sign", Md5.md5("Door" + "IsExsitFace" + Md5.secret));
+ getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), mypage);
+
+ }
+ private void getGankList(String myurl, Map map, String msg, final int requstecode) {
+
+ mGankLoader = new Loader();
+ Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1() {
+
+ @Override
+ public void call(Resultcode resultcode) {
+ if (!(resultcode.status == 0)) {
+ baseActivity.setToast(1, resultcode.msg);
+ }
+ if (resultcode.status == 0) {
+ if (requstecode == 0) {
+ data =(double) resultcode.data;
+ }
+ }
+ }
+
+ }, new Action1() {
+ @Override
+ public void call(Throwable throwable) {
+ progressDialog.dismiss();
+ baseActivity.setToast(2, getString(R.string.getdatafailure));
+ throwable.printStackTrace();
+ }
+ });
+
+ baseActivity.addSubscription(subscription);
+ }
+
}
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 6f131d2..58421a5 100644
--- a/app/src/main/java/com/sl/house_property/MainFragment.java
+++ b/app/src/main/java/com/sl/house_property/MainFragment.java
@@ -37,6 +37,8 @@ import com.selectpicker.OptionsPopupWindow;
import com.sl.house_property.databinding.FragmentMainBinding;
import com.sl.house_property.databinding.ItemCommentBinding;
import com.sl.house_property.databinding.ItemDiscoveryBinding;
+import com.sl.house_property.db.CommentBeanData;
+import com.sl.house_property.db.dao.CommentDao;
import com.sl.house_property.discovery.GoodsInfoDialog;
import com.sl.house_property.discovery.HistoryRecordActivity;
import com.sl.house_property.discovery.HistoryRecordActivitytwo;
@@ -56,6 +58,7 @@ import org.json.JSONException;
import org.json.JSONObject;
import java.lang.reflect.Type;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -78,6 +81,7 @@ import rx.functions.Action1;
import tools.Config;
import utils.CommonUtils;
import utils.DateUtils;
+import utils.DateUtilss;
import utils.KeyboardUtil;
import utils.Md5;
import utils.SPUtils;
@@ -114,6 +118,7 @@ public class MainFragment extends BaseFragment implements V
private BaseRecycleViewAdapter baseRecycleViewAdapterv;
private RegisterUser user;
+ private String miyuetime;
public MainFragment() {
// Required empty public constructor
@@ -173,8 +178,20 @@ public class MainFragment extends BaseFragment implements V
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
-
-
+ //String time = (String) SPUtils.getSp(getContext(), DoConfig.MY_HOUST_TIME, "智慧小区");
+ CommentDao commentDao = new CommentDao(getActivity());
+ ArrayList commentBeanData = commentDao.queryAll();
+ if(commentBeanData.size()>0){
+ miyuetime = commentBeanData.get(0).getMiyuetime();
+ try {
+ boolean b = DateUtilss.IsToday(miyuetime);
+ Log.e("时间",b+"");
+ if(!DateUtilss.IsToday(miyuetime))
+ commentDao.delete(commentBeanData);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
}
diff --git a/app/src/main/java/com/sl/house_property/db/CommentBeanData.java b/app/src/main/java/com/sl/house_property/db/CommentBeanData.java
index 22abdfa..f00587f 100644
--- a/app/src/main/java/com/sl/house_property/db/CommentBeanData.java
+++ b/app/src/main/java/com/sl/house_property/db/CommentBeanData.java
@@ -61,4 +61,25 @@ public class CommentBeanData extends DbBean implements Serializable {
@DatabaseField(columnName = "type")
private String type;//1.评论话术 2.私信话术 3.直播话术 4.回访话术 5.首关话术
+
+ public String getMiyuetime() {
+ return miyuetime;
+ }
+
+ public void setMiyuetime(String miyuetime) {
+ this.miyuetime = miyuetime;
+ }
+ @DatabaseField(columnName = "miyuetime")
+ private String miyuetime;
+
+ public String getIsdelete() {
+ return isdelete;
+ }
+
+ public void setIsdelete(String isdelete) {
+ this.isdelete = isdelete;
+ }
+
+ @DatabaseField(columnName = "isdelete")//0代表未删除，1代表删除
+ private String isdelete;
}
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 04e4b36..207c9b8 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
@@ -692,7 +692,7 @@ public class HistoryRecordFragment extends BaseFragment {
@@ -93,7 +95,7 @@ public class ShareCodeActivity extends BaseActivity commentBeanDatas1 = commentDao.queryAll();
+ List commentBeanDatas1 = commentDao.queryInByCustom("isdelete","0");
statuses = new ArrayList<>();
if (commentBeanDatas1.size() == 0) {
} else {
@@ -342,11 +344,11 @@ public class ShareCodeActivity extends BaseActivity commentBeanData1 = commentDao.queryAll();
+ // List commentBeanData1 =commentDao.queryInByCustom("isdelete","0");
Log.e("数据",commentBeanData1.size()+"");
- if(commentBeanData1.size()>=5){
- setToast("最多只能申请5条秘钥");
+ if(commentBeanData1.size()>=10){
+ setToast("每天最多只能申请10条秘钥");
return;
}else {
CommentBeanData commentBeanData = new CommentBeanData();
@@ -375,6 +377,9 @@ public class ShareCodeActivity extends BaseActivity 0) {
commentDao.updateData(commentBeanData);
} else {
@@ -436,7 +441,9 @@ public class ShareCodeActivity extends BaseActivity
+ android:paddingRight="0dip">
@@ -63,7 +63,7 @@
android:layout_margin="3dip"
android:background="@drawable/drawableforitemnormal"
android:button="@null"
- android:padding="20dip"
+ android:padding="18dip"
android:checked="true"
android:text="1天" />
@@ -74,7 +74,7 @@
android:layout_margin="3dip"
android:background="@drawable/drawableforitemnormal"
android:button="@null"
- android:padding="20dip"
+ android:padding="18dip"
android:text="7天" />
@@ -95,7 +95,7 @@
android:layout_margin="3dip"
android:background="@drawable/drawableforitemnormal"
android:button="@null"
- android:padding="20dip"
+ android:padding="18dip"
android:text="3月" />