Skip to content

R
RvApp
Commit 626ea2d7 authored by linfeng's avatar linfeng
Browse files
Options

代码提交

parent 43642804
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 62 deletions
MyFrame/src/main/java/com/frame/base/url/ImageUrl.java
View file @ 626ea2d7
...@@ -6,4 +6,6 @@ public final class ImageUrl { ...@@ -6,4 +6,6 @@ public final class ImageUrl {
public static final String IMG_BG_BILL = "https://mgmt.dfangche.com/image/app/bg_bill.png"; public static final String IMG_BG_BILL = "https://mgmt.dfangche.com/image/app/bg_bill.png";
public static final String IMG_BG_BANNER_SIGN = "https://mgmt.dfangche.com/image/app/banner_sign.png"; public static final String IMG_BG_BANNER_SIGN = "https://mgmt.dfangche.com/image/app/banner_sign.png";
public static final String IMG_BG_LOGO = "https://mgmt.dfangche.com/image/admin/2019-11-27/66.png";
} }
component_resource/src/main/res/drawable/selector_rv_positive_check.xml 0 → 100644
View file @ 626ea2d7
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/common_icon_bg_positive_check" android:state_checked="true" />
<item android:drawable="@drawable/common_icon_bg_positive_uncheck" android:state_checked="false" />
</selector>
\ No newline at end of file
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ShopShowActivity.java
View file @ 626ea2d7
...@@ -24,20 +24,21 @@ import com.baidu.mapapi.map.MyLocationData; ...@@ -24,20 +24,21 @@ import com.baidu.mapapi.map.MyLocationData;
import com.baidu.mapapi.map.OverlayOptions; import com.baidu.mapapi.map.OverlayOptions;
import com.baidu.mapapi.model.LatLng; import com.baidu.mapapi.model.LatLng;
import com.frame.base.url.Constance; import com.frame.base.url.Constance;
import com.frame.base.url.ImageUrl;
import com.frame.rv.config.RvFrameConfig; import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean; import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity; import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.ruiwenliu.wrapper.util.LocationManager; import com.ruiwenliu.wrapper.util.LocationManager;
import com.ruiwenliu.wrapper.util.MapUtil; import com.ruiwenliu.wrapper.util.MapUtil;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.dialog.PickerDialog;
import com.rv.component.utils.LocationRecord; import com.rv.component.utils.LocationRecord;
import com.rv.home.R; import com.rv.home.R;
import com.rv.home.R2; import com.rv.home.R2;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.ApiConfig; import com.rv.home.rv.module.ApiConfig;
import com.rv.component.dialog.PickerDialog;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.bean.ShopListBean; import com.rv.home.rv.module.ui.main.home.bean.ShopListBean;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -46,6 +47,7 @@ import java.util.List; ...@@ -46,6 +47,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.observers.DisposableObserver; import io.reactivex.observers.DisposableObserver;
...@@ -67,6 +69,8 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -67,6 +69,8 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> {
LinearLayout rlVisible; LinearLayout rlVisible;
@BindView(R2.id.tv_phone) @BindView(R2.id.tv_phone)
TextView tvPhone; TextView tvPhone;
@BindView(R2.id.iv_icon)
ImageView ivIcon;
private LocationManager locationManager; private LocationManager locationManager;
BaiduMap mBaiduMap; BaiduMap mBaiduMap;
...@@ -95,6 +99,8 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -95,6 +99,8 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> {
showTitle(false); showTitle(false);
mLat = intent.getDoubleExtra("lat", 0); mLat = intent.getDoubleExtra("lat", 0);
mLon = intent.getDoubleExtra("lon", 0); mLon = intent.getDoubleExtra("lon", 0);
GlideManager.getInstance(mActivity).loadImage(ImageUrl.IMG_BG_LOGO, ivIcon);
initMap(); initMap();
} }
...@@ -173,7 +179,7 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -173,7 +179,7 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> {
private void getShopList(int page) { private void getShopList(int page) {
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("page", page); map.put("page", page);
map.put("limit", 1000); map.put("limit", 1500);
if (mLat > 0) { if (mLat > 0) {
map.put("lat", mLat); map.put("lat", mLat);
map.put("lon", mLon); map.put("lon", mLon);
...@@ -389,6 +395,12 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -389,6 +395,12 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> {
} }
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
} }
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/dialog/CheckPriceDialog.java
View file @ 626ea2d7
...@@ -7,6 +7,8 @@ import android.support.v7.widget.RecyclerView; ...@@ -7,6 +7,8 @@ import android.support.v7.widget.RecyclerView;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.TextView; import android.widget.TextView;
import com.ruiwenliu.wrapper.dialog.BaseDialog; import com.ruiwenliu.wrapper.dialog.BaseDialog;
...@@ -37,6 +39,7 @@ public class CheckPriceDialog extends BaseDialog { ...@@ -37,6 +39,7 @@ public class CheckPriceDialog extends BaseDialog {
final TextView tvCash = (TextView) helper.getView(R.id.tv_item_use_cash); final TextView tvCash = (TextView) helper.getView(R.id.tv_item_use_cash);
final TextView tvMember = (TextView) helper.getView(R.id.tv_item_use_member); final TextView tvMember = (TextView) helper.getView(R.id.tv_item_use_member);
final RecyclerView rvContent = (RecyclerView) helper.getView(R.id.rv_content); final RecyclerView rvContent = (RecyclerView) helper.getView(R.id.rv_content);
CheckBox isUseMember = (CheckBox) helper.getView(R.id.cb_use_member);
tvCash.setSelected(true); tvCash.setSelected(true);
tvCash.setTextColor(getContext().getResources().getColor(R.color.colorWrite)); tvCash.setTextColor(getContext().getResources().getColor(R.color.colorWrite));
...@@ -44,6 +47,20 @@ public class CheckPriceDialog extends BaseDialog { ...@@ -44,6 +47,20 @@ public class CheckPriceDialog extends BaseDialog {
rvContent.setLayoutManager(new GridLayoutManager(getContext(), 7)); rvContent.setLayoutManager(new GridLayoutManager(getContext(), 7));
rvContent.setNestedScrollingEnabled(false); rvContent.setNestedScrollingEnabled(false);
rvContent.setAdapter(adapter); rvContent.setAdapter(adapter);
isUseMember.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
adapter.setType(true);
adapter.notifyDataSetChanged();
} else {
adapter.setType(false);
adapter.notifyDataSetChanged();
}
}
});
helper.setOnClickListener(new View.OnClickListener() { helper.setOnClickListener(new View.OnClickListener() {
@Override @Override
...@@ -54,15 +71,13 @@ public class CheckPriceDialog extends BaseDialog { ...@@ -54,15 +71,13 @@ public class CheckPriceDialog extends BaseDialog {
tvCash.setTextColor(getContext().getResources().getColor(R.color.colorWrite)); tvCash.setTextColor(getContext().getResources().getColor(R.color.colorWrite));
tvMember.setSelected(false); tvMember.setSelected(false);
tvMember.setTextColor(getContext().getResources().getColor(R.color.gray_FFB74B)); tvMember.setTextColor(getContext().getResources().getColor(R.color.gray_FFB74B));
adapter.setType(false);
adapter.notifyDataSetChanged();
} else if (id == R.id.tv_item_use_member) { } else if (id == R.id.tv_item_use_member) {
tvCash.setSelected(false); tvCash.setSelected(false);
tvCash.setTextColor(getContext().getResources().getColor(R.color.gray_FFB74B)); tvCash.setTextColor(getContext().getResources().getColor(R.color.gray_FFB74B));
tvMember.setSelected(true); tvMember.setSelected(true);
tvMember.setTextColor(getContext().getResources().getColor(R.color.colorWrite)); tvMember.setTextColor(getContext().getResources().getColor(R.color.colorWrite));
adapter.setType(true);
adapter.notifyDataSetChanged();
} }
} }
}, R.id.tv_item_use_cash, R.id.tv_item_use_member); }, R.id.tv_item_use_cash, R.id.tv_item_use_member);
......
module_home/src/main/res/layout/rv_act_shop_show.xml
View file @ 626ea2d7
...@@ -4,11 +4,13 @@ ...@@ -4,11 +4,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".rv.module.ui.main.home.ShopShowActivity"> tools:context=".rv.module.ui.main.home.ShopShowActivity">
<com.baidu.mapapi.map.MapView <com.baidu.mapapi.map.MapView
android:id="@+id/bmapView" android:id="@+id/bmapView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clickable="true" /> android:clickable="true" />
<ImageView <ImageView
android:id="@+id/iv_back" android:id="@+id/iv_back"
android:layout_width="@dimen/size_40" android:layout_width="@dimen/size_40"
...@@ -21,9 +23,9 @@ ...@@ -21,9 +23,9 @@
<ImageView <ImageView
android:id="@+id/iv_location" android:id="@+id/iv_location"
android:layout_alignParentRight="true"
android:layout_width="@dimen/size_50" android:layout_width="@dimen/size_50"
android:layout_height="@dimen/size_50" android:layout_height="@dimen/size_50"
android:layout_alignParentRight="true"
android:layout_marginLeft="@dimen/size_5" android:layout_marginLeft="@dimen/size_5"
android:layout_marginTop="@dimen/size_10" android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="@dimen/size_15" android:layout_marginRight="@dimen/size_15"
...@@ -31,82 +33,94 @@ ...@@ -31,82 +33,94 @@
android:src="@drawable/rv_location" /> android:src="@drawable/rv_location" />
<!--<ImageView--> <!--<ImageView-->
<!--android:layout_width="wrap_content"--> <!--android:layout_width="wrap_content"-->
<!--android:id="@+id/iv_center"--> <!--android:id="@+id/iv_center"-->
<!--android:visibility="gone"--> <!--android:visibility="gone"-->
<!--android:layout_centerInParent="true"--> <!--android:layout_centerInParent="true"-->
<!--android:layout_height="wrap_content"--> <!--android:layout_height="wrap_content"-->
<!--android:src="@drawable/im_map_button_pres"--> <!--android:src="@drawable/im_map_button_pres"-->
<!--/>--> <!--/>-->
<LinearLayout <LinearLayout
android:id="@+id/ll_visible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/size_30" android:layout_marginLeft="@dimen/size_30"
android:layout_marginRight="@dimen/size_30" android:layout_marginRight="@dimen/size_30"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/size_30" android:layout_marginBottom="@dimen/size_30"
android:layout_width="match_parent"
android:padding="@dimen/size_15"
android:visibility="gone"
android:id="@+id/ll_visible"
android:background="@color/colorWrite" android:background="@color/colorWrite"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_height="wrap_content"> android:padding="@dimen/size_15"
<RelativeLayout android:visibility="gone">
android:layout_weight="1" <LinearLayout
android:paddingRight="@dimen/size_10"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
<TextView android:layout_weight="1"
android:layout_width="match_parent" android:orientation="vertical"
android:layout_height="wrap_content" android:paddingRight="@dimen/size_10">
android:textColor="@color/textMain"
android:textSize="@dimen/text_18" <LinearLayout
android:drawablePadding="@dimen/size_5" android:layout_width="match_parent"
android:drawableLeft="@drawable/rv_common_icon_logo" android:layout_height="wrap_content"
android:id="@+id/tv_name" android:orientation="horizontal">
android:text=""
/> <ImageView
android:id="@+id/iv_icon"
android:layout_width="@dimen/size_25"
android:layout_height="@dimen/size_25" />
<TextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:layout_toRightOf="@+id/iv_icon"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_18" />
</LinearLayout>
<TextView <TextView
android:layout_marginTop="@dimen/size_8" android:id="@+id/tv_address"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14"
android:layout_below="@id/tv_name" android:layout_below="@id/tv_name"
android:id="@+id/tv_address" android:layout_marginTop="@dimen/size_8"
android:text="" android:text=""
/> android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
<TextView <TextView
android:id="@+id/tv_phone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14"
android:layout_below="@id/tv_address" android:layout_below="@id/tv_address"
android:id="@+id/tv_phone"
android:text="" android:text=""
/> android:textColor="@color/textGray"
</RelativeLayout> android:textSize="@dimen/text_14" />
</LinearLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_navigation" android:id="@+id/rl_navigation"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <ImageView
android:layout_centerHorizontal="true"
android:src="@drawable/rv_rentingcar_icon_gps"
android:layout_width="@dimen/size_30" android:layout_width="@dimen/size_30"
android:layout_height="@dimen/size_30" android:layout_height="@dimen/size_30"
/>
<TextView
android:textColor="@color/textMain"
android:textSize="@dimen/text_12"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:text="去这里" android:src="@drawable/rv_rentingcar_icon_gps" />
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_35" android:layout_marginTop="@dimen/size_35"
/> android:text="去这里"
android:textColor="@color/textMain"
android:textSize="@dimen/text_12" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
......
module_home/src/main/res/layout/rv_dialog_check_price.xml
View file @ 626ea2d7
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorWrite" android:background="@color/colorWrite"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/size_10"
android:paddingLeft="@dimen/size_15" android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"> android:paddingRight="@dimen/size_15"
android:paddingBottom="@dimen/size_10">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -20,14 +20,25 @@ ...@@ -20,14 +20,25 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="价格明细表" android:text="每日价格"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
<CheckBox
android:id="@+id/cb_use_member"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@drawable/selector_rv_positive_check"
android:paddingLeft="@dimen/size_10"
android:text="会员天数抵扣"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal"
android:visibility="gone">
<TextView <TextView
android:id="@+id/tv_item_use_cash" android:id="@+id/tv_item_use_cash"
...@@ -131,7 +142,6 @@ ...@@ -131,7 +142,6 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/rv_content" android:id="@+id/rv_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
</android.support.v7.widget.RecyclerView>
</LinearLayout> </LinearLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment