diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 91ac3d3..28db2a2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -299,6 +299,7 @@
+
\ No newline at end of file
diff --git a/app/src/main/java/com/sl/house_property/Main2Fragment.java b/app/src/main/java/com/sl/house_property/Main2Fragment.java
index 180fe3e..4c2a8e3 100644
--- a/app/src/main/java/com/sl/house_property/Main2Fragment.java
+++ b/app/src/main/java/com/sl/house_property/Main2Fragment.java
@@ -8,6 +8,7 @@ import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
+import com.gyf.immersionbar.ImmersionBar;
import com.sl.house_property.f2.ElectricChargeActivity;
import com.sl.house_property.f2.FeeActivity;
import com.sl.house_property.databinding.FragmentMain2Binding;
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 efb6b09..fe0f824 100644
--- a/app/src/main/java/com/sl/house_property/Main4Fragment.java
+++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java
@@ -176,15 +176,15 @@ public class Main4Fragment extends BaseFragment {
}
});
- mDataBinding.llGeren.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(getActivity(), MyUserMessage.class);
- intent.putExtra("usertitile", "个人信息");
- startActivityForResult(intent, 0);
-
- }
- });
+// mDataBinding.llGeren.setOnClickListener(new View.OnClickListener() {
+// @Override
+// public void onClick(View v) {
+// Intent intent = new Intent(getActivity(), MyUserMessage.class);
+// intent.putExtra("usertitile", "个人信息");
+// startActivityForResult(intent, 0);
+//
+// }
+// });
mDataBinding.llShouhuo.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
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 3a4046a..6ae0d5e 100644
--- a/app/src/main/java/com/sl/house_property/MainFragment.java
+++ b/app/src/main/java/com/sl/house_property/MainFragment.java
@@ -31,7 +31,6 @@ import com.lxj.xpopup.XPopup;
import com.lzy.ninegrid.ImageInfo;
import com.lzy.ninegrid.preview.NineGridViewClickAdapter;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.selectpicker.OptionsPopupWindow;
import com.sl.house_property.databinding.FragmentMainBinding;
@@ -39,6 +38,7 @@ import com.sl.house_property.databinding.ItemCommentBinding;
import com.sl.house_property.databinding.ItemDiscoveryBinding;
import com.sl.house_property.discovery.GoodsInfoDialog;
import com.sl.house_property.discovery.HistoryRecordActivity;
+import com.sl.house_property.discovery.PropertyActivity;
import com.sl.house_property.discovery.ShareCodeActivity;
import com.sl.house_property.order.SettleActivity;
import com.sl.house_property.user.MyMarketShopActivity;
@@ -73,7 +73,6 @@ import my_view.tao_bao_refresh.FullyGridLayoutManager;
import rx.Subscription;
import rx.functions.Action1;
import tools.Config;
-import tools.PicassoRoundTransform;
import utils.CommonUtils;
import utils.DateUtils;
import utils.KeyboardUtil;
@@ -100,7 +99,7 @@ public class MainFragment extends BaseFragment implements V
private String mParam2;
private ArrayList discoveryListEntities = new ArrayList<>();
private OnFragmentInteractionListener mListener;
- private ProgressDialog progressDialog ;
+ private ProgressDialog progressDialog;
private Loader mGankLoader;
private ArrayList mBannerImages;
@@ -354,7 +353,13 @@ public class MainFragment extends BaseFragment implements V
map.put("sign", Md5.md5("Advert" + "Advertr_an_AdvertHomeList" + Md5.secret));
getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0, false);
-
+ mDataBinding.service.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(getContext(), PropertyActivity.class);
+ startActivity(intent);
+ }
+ });
}
// TODO: Rename method, update argument and hook method into UI event
@@ -1033,6 +1038,7 @@ public class MainFragment extends BaseFragment implements V
//结束轮播
mDataBinding.banner.stopAutoPlay();
}
+
private int page = 1;
private OnRefreshLoadMoreListener onrefalshlister = new OnRefreshLoadMoreListener() {
@@ -1049,8 +1055,8 @@ public class MainFragment extends BaseFragment implements V
}
-
};
+
private void getGankList2(String myurl, Map map, String msg, final int requstecode) {
progressDialog.setMessage(msg);
progressDialog.setCancelable(false);
@@ -1134,7 +1140,7 @@ public class MainFragment extends BaseFragment implements V
Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1() {
@Override
public void call(Resultcode resultcode) {
- // mDataBinding.taobaoRefreshLayout.finishRefresh();
+ // mDataBinding.taobaoRefreshLayout.finishRefresh();
if (!(resultcode.status == 0)) {
baseActivity.setToast(1, resultcode.msg);
}
@@ -1158,7 +1164,7 @@ public class MainFragment extends BaseFragment implements V
}, new Action1() {
@Override
public void call(Throwable throwable) {
- // mDataBinding.taobaoRefreshLayout.finishRefresh();
+ // mDataBinding.taobaoRefreshLayout.finishRefresh();
baseActivity.setToast(2, getString(R.string.getdatafailure));
throwable.printStackTrace();
}
diff --git a/app/src/main/java/com/sl/house_property/discovery/PropertyActivity.java b/app/src/main/java/com/sl/house_property/discovery/PropertyActivity.java
new file mode 100644
index 0000000..3322dcc
--- /dev/null
+++ b/app/src/main/java/com/sl/house_property/discovery/PropertyActivity.java
@@ -0,0 +1,29 @@
+package com.sl.house_property.discovery;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+import android.view.View;
+
+import com.gyf.immersionbar.ImmersionBar;
+import com.sl.house_property.R;
+
+public class PropertyActivity extends FragmentActivity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.activity_propery);
+ ImmersionBar.with(this)
+ .keyboardEnable(false) //解决软键盘与底部输入框冲突问题
+ // .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
+ // | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出
+ .barColor(R.color.colorPrimary).init();
+ findViewById(R.id.left).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+ }
+}
diff --git a/app/src/main/res/layout/activity_propery.xml b/app/src/main/res/layout/activity_propery.xml
new file mode 100644
index 0000000..e06f7f3
--- /dev/null
+++ b/app/src/main/res/layout/activity_propery.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main2.xml b/app/src/main/res/layout/fragment_main2.xml
index 8203af7..1e767b6 100644
--- a/app/src/main/res/layout/fragment_main2.xml
+++ b/app/src/main/res/layout/fragment_main2.xml
@@ -5,31 +5,11 @@
-
-
-
-
-
-
+
-->
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main4.xml b/app/src/main/res/layout/fragment_main4.xml
index eb9dd6c..e97c4d8 100644
--- a/app/src/main/res/layout/fragment_main4.xml
+++ b/app/src/main/res/layout/fragment_main4.xml
@@ -166,7 +166,7 @@
android:orientation="horizontal">
@@ -231,36 +231,6 @@
android:layout_marginTop="1dp"
android:orientation="horizontal">
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -433,6 +416,7 @@
android:drawablePadding="8dp"
android:gravity="center_horizontal"
android:text="待收货" />
+