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

1

Browse Source
This commit is contained in:
jinyuer
2020-09-22 16:41:50 +08:00
parent a5b53ad5e9
commit 6618c5653e
8 changed files with 115 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@@ -299,6 +299,7 @@
<activity android:name=".order.PayActivity" />
<activity android:name=".discovery.HistoryRecordActivity" />
<activity android:name=".discovery.ShareCodeActivity" />
<activity android:name=".discovery.PropertyActivity" android:theme="@style/TAppTheme" />
</application>
</manifest>

1
app/src/main/java/com/sl/house_property/Main2Fragment.java
View File

@@ -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;

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

@@ -176,15 +176,15 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> {
}
});
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) {

20
app/src/main/java/com/sl/house_property/MainFragment.java
View File

@@ -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<FragmentMainBinding> implements V
private String mParam2;
private ArrayList<DiscoveryListEntity> discoveryListEntities = new ArrayList<>();
private OnFragmentInteractionListener mListener;
private ProgressDialog progressDialog ;
private ProgressDialog progressDialog;
private Loader mGankLoader;
private ArrayList<String> mBannerImages;
@@ -354,7 +353,13 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> 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<FragmentMainBinding> implements V
//结束轮播
mDataBinding.banner.stopAutoPlay();
}
private int page = 1;
private OnRefreshLoadMoreListener onrefalshlister = new OnRefreshLoadMoreListener() {
@@ -1049,8 +1055,8 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
}
};
private void getGankList2(String myurl, Map<String, String> map, String msg, final int requstecode) {
progressDialog.setMessage(msg);
progressDialog.setCancelable(false);
@@ -1134,7 +1140,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
@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<FragmentMainBinding> implements V
}, new Action1<Throwable>() {
@Override
public void call(Throwable throwable) {
// mDataBinding.taobaoRefreshLayout.finishRefresh();
// mDataBinding.taobaoRefreshLayout.finishRefresh();
baseActivity.setToast(2, getString(R.string.getdatafailure));
throwable.printStackTrace();
}

29
app/src/main/java/com/sl/house_property/discovery/PropertyActivity.java Normal file
View File

@@ -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();
}
});
}
}

45
app/src/main/res/layout/activity_propery.xml Normal file
View File

@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:fitsSystemWindows="true">
<LinearLayout
android:id="@+id/ll"
android:background="@color/colorPrimary"
android:layout_width="match_parent"
android:layout_height="45dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingLeft="16dp"
android:paddingTop="5dp"
android:paddingRight="5dp"
android:paddingBottom="5dp"
android:src="@mipmap/fanhui" />
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="16dp"
android:layout_weight="1"
android:gravity="center"
android:text="缴费"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
<fragment
android:id="@+id/ft"
android:name="com.sl.house_property.Main2Fragment"
android:layout_width="match_parent"
android:layout_height="match_parent">
</fragment>
</LinearLayout>

24
app/src/main/res/layout/fragment_main2.xml
View File

@@ -5,31 +5,11 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".Main2Fragment">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/mystatusbar"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/l1"
android:layout_width="match_parent"
android:layout_height="50dip"
android:theme="@style/AppTheme.AppBarOverlay">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/news2"
android:textColor="@color/background_color_white"
android:textSize="17sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -321,6 +301,6 @@
</LinearLayout>
</LinearLayout>-->
</LinearLayout>
</LinearLayout>
</FrameLayout>
</layout>

46
app/src/main/res/layout/fragment_main4.xml
View File

@@ -166,7 +166,7 @@
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_fangchan"
android:id="@+id/ll_fangchan"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
@@ -231,36 +231,6 @@
android:layout_marginTop="1dp"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_geren"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="16dp"
android:layout_weight="1"
android:text="个人信息" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:src="@mipmap/genren" />
</LinearLayout>
<View
android:layout_width="0.5dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:background="@color/divider_line_color" />
<LinearLayout
android:id="@+id/ll_shouhuo"
android:layout_width="0dp"
@@ -284,6 +254,19 @@
android:layout_weight="1"
android:src="@mipmap/fangchan" />
</LinearLayout>
<View
android:layout_width="0.5dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:background="@color/divider_line_color" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
@@ -433,6 +416,7 @@
android:drawablePadding="8dp"
android:gravity="center_horizontal"
android:text="待收货" />
<TextView
android:id="@+id/tv_order8"
android:layout_width="0dp"