Skip to content

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

刷新动画

parent a97857f0
Hide whitespace changes
Inline Side-by-side
Showing with 829 additions and 389 deletions
MyFrame/src/main/java/com/frame/base/url/Constance.java
View file @ e3352767
...@@ -55,4 +55,6 @@ public final class Constance { ...@@ -55,4 +55,6 @@ public final class Constance {
public static final String ACTIVITY_URL_DETAILCARPURCHASE="/carpurchase/activity/DetailCarPurchaseActivity"; public static final String ACTIVITY_URL_DETAILCARPURCHASE="/carpurchase/activity/DetailCarPurchaseActivity";
public static final String ACTIVITY_URL_SHOPSHOW="/main/home/ShopShowActivity"; public static final String ACTIVITY_URL_SHOPSHOW="/main/home/ShopShowActivity";
public static final String ACTIVITY_URL_SELECTSHOP="/main/home/SelectShopActivity";
} }
RvClient/build.gradle
View file @ e3352767
...@@ -8,8 +8,8 @@ android { ...@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 120 versionCode 121
versionName "1.2.0" versionName "1.2.1"
multiDexEnabled true multiDexEnabled true
//新版Gradle 是 implementation 为了兼容compile,写上这句话 //新版Gradle 是 implementation 为了兼容compile,写上这句话
......
RvFrame/src/main/java/com/frame/rv/config/RvFrameConfig.java
View file @ e3352767
...@@ -10,9 +10,6 @@ package com.frame.rv.config; ...@@ -10,9 +10,6 @@ package com.frame.rv.config;
public interface RvFrameConfig extends RvFrameConstant { public interface RvFrameConfig extends RvFrameConstant {
// String HOST = "https://xxtest.upyuns.com"; // String HOST = "https://xxtest.upyuns.com";
// String HOST = "http://10.1.37.192:8765"; // String HOST = "http://10.1.37.192:8765";
// String HOST = "http://10.1.37.245:8765";
// String HOST = "http://10.1.37.246:8765";
// String HOST = "http://10.1.37.244:8765";
String HOST = "https://dev.dfangche.com"; String HOST = "https://dev.dfangche.com";
String ADMIN_POST = HOST + "/api/admin/"; String ADMIN_POST = HOST + "/api/admin/";
String AUTH_POST = HOST + "/api/auth/"; String AUTH_POST = HOST + "/api/auth/";
......
RvWrapper/src/main/res/drawable/progress_freshing_frame.xml
View file @ e3352767
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"> <animation-list xmlns:android="http://schemas.android.com/apk/res/android">
<item <item android:drawable="@mipmap/icon_freshing_1"
android:drawable="@mipmap/icon_loading1" android:duration="40"/>
android:duration="40" /> <item android:drawable="@mipmap/icon_freshing_2"
<item android:duration="40"/>
android:drawable="@mipmap/icon_loading2" <item android:drawable="@mipmap/icon_freshing_3"
android:duration="40" /> android:duration="40"/>
<item <item android:drawable="@mipmap/icon_freshing_4"
android:drawable="@mipmap/icon_loading3" android:duration="40"/>
android:duration="40" /> <item android:drawable="@mipmap/icon_freshing_5"
<item android:duration="40"/>
android:drawable="@mipmap/icon_loading4" <item android:drawable="@mipmap/icon_freshing_6"
android:duration="40" /> android:duration="40"/>
<item <item android:drawable="@mipmap/icon_freshing_7"
android:drawable="@mipmap/icon_loading5" android:duration="40"/>
android:duration="40" /> <item android:drawable="@mipmap/icon_freshing_8"
<item android:duration="40"/>
android:drawable="@mipmap/icon_loading6" <item android:drawable="@mipmap/icon_freshing_9"
android:duration="40" /> android:duration="40"/>
<item <item android:drawable="@mipmap/icon_freshing_10"
android:drawable="@mipmap/icon_loading7" android:duration="40"/>
android:duration="40" /> <item android:drawable="@mipmap/icon_freshing_11"
<item android:duration="40"/>
android:drawable="@mipmap/icon_loading8" <item android:drawable="@mipmap/icon_freshing_12"
android:duration="40" /> android:duration="40"/>
<item <item android:drawable="@mipmap/icon_freshing_13"
android:drawable="@mipmap/icon_loading9" android:duration="40"/>
android:duration="40" /> <item android:drawable="@mipmap/icon_freshing_14"
<item android:duration="40"/>
android:drawable="@mipmap/icon_loading10" <item android:drawable="@mipmap/icon_freshing_15"
android:duration="40" /> android:duration="40"/>
<item <item android:drawable="@mipmap/icon_freshing_16"
android:drawable="@mipmap/icon_loading11" android:duration="40"/>
android:duration="40" /> <item android:drawable="@mipmap/icon_freshing_17"
<item android:duration="40"/>
android:drawable="@mipmap/icon_loading12" <item android:drawable="@mipmap/icon_freshing_18"
android:duration="40" /> android:duration="40"/>
<item <item android:drawable="@mipmap/icon_freshing_19"
android:drawable="@mipmap/icon_loading13" android:duration="40"/>
android:duration="40" /> <item android:drawable="@mipmap/icon_freshing_20"
<item android:duration="40"/>
android:drawable="@mipmap/icon_loading14" <item android:drawable="@mipmap/icon_freshing_21"
android:duration="40" /> android:duration="40"/>
<item <item android:drawable="@mipmap/icon_freshing_22"
android:drawable="@mipmap/icon_loading15" android:duration="40"/>
android:duration="40" /> <item android:drawable="@mipmap/icon_freshing_23"
<item android:duration="40"/>
android:drawable="@mipmap/icon_loading16" <item android:drawable="@mipmap/icon_freshing_24"
android:duration="40" /> android:duration="40"/>
<item <item android:drawable="@mipmap/icon_freshing_25"
android:drawable="@mipmap/icon_loading17" android:duration="40"/>
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading18"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading19"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading20"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading21"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading22"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading23"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading24"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading25"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading26"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading27"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading28"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading29"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading30"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading31"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading32"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading33"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading34"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading35"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading36"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading37"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading38"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading39"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading40"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading41"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading42"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading43"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading44"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading45"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading46"
android:duration="40" />
</animation-list> </animation-list>
\ No newline at end of file
module_discovery/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java
View file @ e3352767
...@@ -37,6 +37,9 @@ public interface DiscoveryApi extends RvFrameConfig { ...@@ -37,6 +37,9 @@ public interface DiscoveryApi extends RvFrameConfig {
//点赞 //点赞
String DISCOVERY_PRAISE_ADD = IMA_BASEUSRL + "/b/circle/msg/praise/add"; String DISCOVERY_PRAISE_ADD = IMA_BASEUSRL + "/b/circle/msg/praise/add";
//取消点赞
String DISCOVERY_PRAISE_DELETE = IMA_BASEUSRL + "/b/circle/msg/praise/delete";
// 添加消息（拍拍、段视频） // 添加消息（拍拍、段视频）
String DISCOVERY_MSG_ADD = IMA_BASEUSRL +"/b/circle/msg/add"; String DISCOVERY_MSG_ADD = IMA_BASEUSRL +"/b/circle/msg/add";
......
module_discovery/src/main/java/com/xxfc/discovery/fragment/PatFragment.java
View file @ e3352767
...@@ -93,21 +93,24 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Si ...@@ -93,21 +93,24 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Si
mAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { mAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override public void onLoadMoreRequested() { @Override public void onLoadMoreRequested() {
rvContent.postDelayed(new Runnable() { if (rvContent != null) {
@Override rvContent.postDelayed(new Runnable() {
public void run() { @Override
if (mPage >= countPage) { public void run() {
mAdapter.loadMoreEnd(); if (mPage >= countPage) {
} else { mAdapter.loadMoreEnd();
mPage++; } else {
geDataList(mPage); mPage++;
geDataList(mPage);
}
} }
} }, 200);
}, 200); }
} }
}, rvContent); }, rvContent);
mAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() { mAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override @Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) { public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
...@@ -158,10 +161,14 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Si ...@@ -158,10 +161,14 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Si
* @param page * @param page
*/ */
private void geDataList(int page) { private void geDataList(int page) {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null) {
headMap.put("Authorization", OkGoUtil.getToken());
}
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("page", page); map.put("page", page);
map.put("type", 2); map.put("type", 2);
mPresenter.postData(0, DiscoveryApi.DISCOVERY_UNAUTH_LIST, DiscoveryRecommendBean.class, map, page == 1 ? false : false); mPresenter.postData(RvFrameConfig.HOST,0, DiscoveryApi.DISCOVERY_UNAUTH_LIST, DiscoveryRecommendBean.class, map, headMap,page == 1 ? false : false);
} }
@Override @Override
...@@ -179,14 +186,24 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Si ...@@ -179,14 +186,24 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Si
case 3: case 3:
onFresh(); onFresh();
break; break;
case 4:
onFresh();
break;
} }
} }
private void setIMData(DiscoveryIMTokenBean bean) { private void setIMData(DiscoveryIMTokenBean bean) {
Map<String, Object> map = new LinkedHashMap<>(); if ("0".equals(itemDatabean.getIsPraise())) {//0：未点赞 1：已点赞
map.put("access_token",bean.getData()); Map<String, Object> map = new LinkedHashMap<>();
map.put("messageId",itemDatabean.getMsgId()); map.put("access_token",bean.getData());
mPresenter.postData(3, DiscoveryApi.DISCOVERY_PRAISE_ADD, BaseBean.class, map,true); map.put("messageId",itemDatabean.getMsgId());
mPresenter.postData(3, DiscoveryApi.DISCOVERY_PRAISE_ADD, BaseBean.class, map,true);
} else {
Map<String, Object> map = new LinkedHashMap<>();
map.put("access_token",bean.getData());
map.put("messageId",itemDatabean.getMsgId());
mPresenter.postData(4, DiscoveryApi.DISCOVERY_PRAISE_DELETE, BaseBean.class, map,true);
}
} }
private void processData(DiscoveryRecommendBean bean) { private void processData(DiscoveryRecommendBean bean) {
......
module_discovery/src/main/java/com/xxfc/discovery/fragment/RecommendFragment.java
View file @ e3352767
...@@ -95,17 +95,19 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen ...@@ -95,17 +95,19 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
mRecommendAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { mRecommendAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override public void onLoadMoreRequested() { @Override public void onLoadMoreRequested() {
rvContent.postDelayed(new Runnable() { if (rvContent != null) {
@Override rvContent.postDelayed(new Runnable() {
public void run() { @Override
if (mPage >= countPage) { public void run() {
mRecommendAdapter.loadMoreEnd(); if (mPage >= countPage) {
} else { mRecommendAdapter.loadMoreEnd();
mPage++; } else {
geDataList(mPage); mPage++;
geDataList(mPage);
}
} }
} }, 200);
}, 200); }
} }
}, rvContent); }, rvContent);
......
module_discovery/src/main/java/com/xxfc/discovery/other/MapLocationActivity.java
View file @ e3352767
...@@ -14,12 +14,14 @@ import com.alibaba.android.arouter.facade.annotation.Autowired; ...@@ -14,12 +14,14 @@ import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.baidu.location.BDAbstractLocationListener; import com.baidu.location.BDAbstractLocationListener;
import com.baidu.location.BDLocation; import com.baidu.location.BDLocation;
import com.baidu.location.Poi;
import com.baidu.mapapi.map.BaiduMap; import com.baidu.mapapi.map.BaiduMap;
import com.baidu.mapapi.map.MapStatus; import com.baidu.mapapi.map.MapStatus;
import com.baidu.mapapi.map.MapStatusUpdateFactory; import com.baidu.mapapi.map.MapStatusUpdateFactory;
import com.baidu.mapapi.map.MapView; import com.baidu.mapapi.map.MapView;
import com.baidu.mapapi.map.MyLocationData; import com.baidu.mapapi.map.MyLocationData;
import com.baidu.mapapi.model.LatLng; import com.baidu.mapapi.model.LatLng;
import com.baidu.mapapi.search.core.PoiInfo;
import com.baidu.mapapi.search.core.SearchResult; import com.baidu.mapapi.search.core.SearchResult;
import com.baidu.mapapi.search.geocode.GeoCodeResult; import com.baidu.mapapi.search.geocode.GeoCodeResult;
import com.baidu.mapapi.search.geocode.GeoCoder; import com.baidu.mapapi.search.geocode.GeoCoder;
...@@ -35,6 +37,8 @@ import com.xxfc.discovery.R; ...@@ -35,6 +37,8 @@ import com.xxfc.discovery.R;
import com.xxfc.discovery.R2; import com.xxfc.discovery.R2;
import com.xxfc.discovery.presenter.DiscoveryPresenter; import com.xxfc.discovery.presenter.DiscoveryPresenter;
import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
...@@ -61,6 +65,12 @@ public class MapLocationActivity extends BaseStatusActivity<DiscoveryPresenter> ...@@ -61,6 +65,12 @@ public class MapLocationActivity extends BaseStatusActivity<DiscoveryPresenter>
@Autowired() @Autowired()
double lonLongitude; double lonLongitude;
@Autowired()
String name;
@Autowired()
String addrStr;
private String mAddress; private String mAddress;
@Override @Override
...@@ -72,6 +82,9 @@ public class MapLocationActivity extends BaseStatusActivity<DiscoveryPresenter> ...@@ -72,6 +82,9 @@ public class MapLocationActivity extends BaseStatusActivity<DiscoveryPresenter>
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) { protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("所在位置"); titleView.setTitle("所在位置");
initMap(); initMap();
tvPatName.setText(name);
tvPatAddress.setText(addrStr);
mAddress = addrStr;
} }
@Override @Override
...@@ -116,7 +129,12 @@ public class MapLocationActivity extends BaseStatusActivity<DiscoveryPresenter> ...@@ -116,7 +129,12 @@ public class MapLocationActivity extends BaseStatusActivity<DiscoveryPresenter>
// 没有检测到结果 // 没有检测到结果
} }
mAddress = result.getSematicDescription(); mAddress = result.getSematicDescription();
tvPatName.setText(result.getBusinessCircle()); List<PoiInfo> poiList = result.getPoiList();
if (poiList !=null && poiList.size() >0){
name = poiList.get(0).getName();
}
tvPatName.setText(name);
tvPatAddress.setText(result.getSematicDescription());//这里的addressText就是我们要的地址 tvPatAddress.setText(result.getSematicDescription());//这里的addressText就是我们要的地址
// Log.i("info===",""+result.getAddress()+"=="+result.getBusinessCircle()+"=="+result.getSematicDescription()+"=="+result.toString()); // Log.i("info===",""+result.getAddress()+"=="+result.getBusinessCircle()+"=="+result.getSematicDescription()+"=="+result.toString());
} }
...@@ -141,7 +159,7 @@ public class MapLocationActivity extends BaseStatusActivity<DiscoveryPresenter> ...@@ -141,7 +159,7 @@ public class MapLocationActivity extends BaseStatusActivity<DiscoveryPresenter>
@Override @Override
public void onMapStatusChangeStart(MapStatus mapStatus, int i) { public void onMapStatusChangeStart(MapStatus mapStatus, int i) {
// LatLng latLng=mapStatus.bound.getCenter(); LatLng latLng=mapStatus.bound.getCenter();
} }
@Override @Override
...@@ -249,13 +267,6 @@ public class MapLocationActivity extends BaseStatusActivity<DiscoveryPresenter> ...@@ -249,13 +267,6 @@ public class MapLocationActivity extends BaseStatusActivity<DiscoveryPresenter>
return new MapStatus.Builder().target(latLng).zoom(18.0f); return new MapStatus.Builder().target(latLng).zoom(18.0f);
} }
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
@OnClick({R2.id.tv_pat_ok}) @OnClick({R2.id.tv_pat_ok})
public void onViewClicked(View view) { public void onViewClicked(View view) {
int id = view.getId(); int id = view.getId();
......
module_discovery/src/main/java/com/xxfc/discovery/other/PostPatActivity.java
View file @ e3352767
...@@ -21,8 +21,10 @@ import android.widget.TextView; ...@@ -21,8 +21,10 @@ import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baidu.location.Address;
import com.baidu.location.BDAbstractLocationListener; import com.baidu.location.BDAbstractLocationListener;
import com.baidu.location.BDLocation; import com.baidu.location.BDLocation;
import com.baidu.location.Poi;
import com.baidu.mapapi.model.LatLng; import com.baidu.mapapi.model.LatLng;
import com.frame.base.bus.Observer; import com.frame.base.bus.Observer;
import com.frame.base.bus.RxBus; import com.frame.base.bus.RxBus;
...@@ -99,6 +101,8 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> { ...@@ -99,6 +101,8 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
private LocationManager locationManager; private LocationManager locationManager;
private ArrayList<ImageSources> sourcesList; private ArrayList<ImageSources> sourcesList;
private String name;
@Override @Override
protected int setLayout() { protected int setLayout() {
return R.layout.activity_post_pat; return R.layout.activity_post_pat;
...@@ -200,11 +204,20 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> { ...@@ -200,11 +204,20 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
.build(Constance.ACTIVITY_URL_MAPLOCATION) .build(Constance.ACTIVITY_URL_MAPLOCATION)
.withDouble("latLatitude",latLatitude) .withDouble("latLatitude",latLatitude)
.withDouble("lonLongitude",lonLongitude) .withDouble("lonLongitude",lonLongitude)
.withString("name",name)
.withString("addrStr",addrStr)
.navigation(this,210); .navigation(this,210);
} else if (id == R.id.tv_pat_ok) { } else if (id == R.id.tv_pat_ok) {
if (mPhotoList.size() <= 0 && TextUtils.isEmpty(etContent.getText().toString())) { if (TextUtils.isEmpty(etContent.getText().toString())){
showToast("亲，请说点什么吧！");
return;
}
if (mPhotoList.size() <= 0 ) {
showToast("请选择需要上传的图片！");
return; return;
} }
if (mPhotoList.size() <= 0) { if (mPhotoList.size() <= 0) {
// 发布文字 // 发布文字
// sendShuoshuo(); // sendShuoshuo();
...@@ -305,7 +318,6 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> { ...@@ -305,7 +318,6 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
lonLongitude = data.getDoubleExtra("longitude",0); lonLongitude = data.getDoubleExtra("longitude",0);
addrStr = data.getStringExtra("location"); addrStr = data.getStringExtra("location");
tvPatAddress.setText(data.getStringExtra("location")); tvPatAddress.setText(data.getStringExtra("location"));
} }
} }
...@@ -553,6 +565,10 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> { ...@@ -553,6 +565,10 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
addrStr = location.getAddrStr(); addrStr = location.getAddrStr();
latLatitude = location.getLatitude(); latLatitude = location.getLatitude();
lonLongitude = location.getLongitude(); lonLongitude = location.getLongitude();
List<Poi> poiList = location.getPoiList();
if (poiList !=null && poiList.size() >0){
name = poiList.get(0).getName();
}
mLatLng = new LatLng(location.getLatitude(), location.getLongitude()); mLatLng = new LatLng(location.getLatitude(), location.getLongitude());
locationManager.stopLocation(); locationManager.stopLocation();
} }
......
module_discovery/src/main/res/layout/activity_map_location.xml
View file @ e3352767
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
android:id="@+id/tv_pat_name" android:id="@+id/tv_pat_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="集胜五金机电（大塘朗店）"
android:textColor="@color/textGray" android:textColor="@color/textGray"
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
...@@ -50,7 +49,6 @@ ...@@ -50,7 +49,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8" android:layout_marginTop="@dimen/size_8"
android:text="大塘朗路与石大路交叉口北50米"
android:textColor="@color/textGray" android:textColor="@color/textGray"
android:textSize="@dimen/text_12" /> android:textSize="@dimen/text_12" />
</LinearLayout> </LinearLayout>
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/LoginRvActivity.java
View file @ e3352767
...@@ -355,6 +355,4 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> { ...@@ -355,6 +355,4 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
mName = data.get("name"); mName = data.get("name");
otherLogin(mOpenid, mLoginType); otherLogin(mOpenid, mLoginType);
} }
} }
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java
View file @ e3352767
...@@ -208,14 +208,31 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i ...@@ -208,14 +208,31 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
} else if (id == R.id.ll_item_get_address) { } else if (id == R.id.ll_item_get_address) {
startActivityForResult(SelectShopActivity.getIntent(mActivity, 1, "", dataBean.getStartCityName(), mLat, mLon), 110); ARouter.getInstance()
.build(Constance.ACTIVITY_URL_SELECTSHOP)
.withDouble("mLat",mLat)
.withDouble("mLon",mLon)
.withString("cityName",dataBean.getStartCityName())
.withInt("shopType",1)
.navigation(mActivity,110);
// startActivityForResult(SelectShopActivity.getIntent(mActivity, 1, "", dataBean.getStartCityName(), mLat, mLon), 110);
// //取车地址 // //取车地址
// startActivityForResult(SelectLocationActivity.getIntent(mActivity, 1, dataBean.getStartCityName(), dataBean.getStartCity(),mLat, mLon, "", 1), 110); // startActivityForResult(SelectLocationActivity.getIntent(mActivity, 1, dataBean.getStartCityName(), dataBean.getStartCity(),mLat, mLon, "", 1), 110);
} else if (id == R.id.ll_item_out_address) { } else if (id == R.id.ll_item_out_address) {
//还车地址 //还车地址
startActivityForResult(SelectShopActivity.getIntent(mActivity, 2, "", dataBean.getEndCityName(), outLatitude, outLongitude), 110);
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_SELECTSHOP)
.withDouble("mLat",outLatitude)
.withDouble("mLon",outLongitude)
.withString("cityName",dataBean.getEndCityName())
.withInt("shopType",2)
.navigation(mActivity,110);
// startActivityForResult(SelectShopActivity.getIntent(mActivity, 2, "", dataBean.getEndCityName(), outLatitude, outLongitude), 110);
// startActivityForResult(SelectLocationActivity.getIntent(mActivity, 2, dataBean.getStartCityName(),dataBean.getEndCity(), outLatitude, outLongitude, "", 1), 110); // startActivityForResult(SelectLocationActivity.getIntent(mActivity, 2, dataBean.getStartCityName(),dataBean.getEndCity(), outLatitude, outLongitude, "", 1), 110);
} else if (id == R.id.ll_item_filter) { } else if (id == R.id.ll_item_filter) {
if (attributeListBean == null) { if (attributeListBean == null) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ e3352767
...@@ -595,9 +595,23 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser ...@@ -595,9 +595,23 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
llLayoutRentingACar.setVisibility(View.GONE); llLayoutRentingACar.setVisibility(View.GONE);
llLayoutRvTour.setVisibility(View.VISIBLE); llLayoutRvTour.setVisibility(View.VISIBLE);
} else if (id == R.id.tv_get_city || id == R.id.tv_get_address || id == R.id.ll_rent) { } else if (id == R.id.tv_get_city || id == R.id.tv_get_address || id == R.id.ll_rent) {
startActivityForResult(SelectShopActivity.getIntent(getActivity(), 1, "", TextUtils.isEmpty(getCityName) ? nowCity : getCityName, latLatitude, lonLongitude), TYPE_REQUEST_CITY); ARouter.getInstance()
.build(Constance.ACTIVITY_URL_SELECTSHOP)
.withDouble("mLat",latLatitude)
.withDouble("mLon",lonLongitude)
.withString("cityName",TextUtils.isEmpty(getCityName) ? nowCity : getCityName)
.withInt("shopType",1)
.navigation(_mActivity,TYPE_REQUEST_CITY);
// startActivityForResult(SelectShopActivity.getIntent(getActivity(), 1, "", , latLatitude, lonLongitude), TYPE_REQUEST_CITY);
} else if (id == R.id.tv_out_city || id == R.id.ll_return || id == R.id.tv_out_address) { } else if (id == R.id.tv_out_city || id == R.id.ll_return || id == R.id.tv_out_address) {
startActivityForResult(SelectShopActivity.getIntent(getActivity(), 2, "", TextUtils.isEmpty(outCityName) ? nowCity : outCityName, latLatitude, lonLongitude), TYPE_REQUEST_CITY); ARouter.getInstance()
.build(Constance.ACTIVITY_URL_SELECTSHOP)
.withDouble("mLat",latLatitude)
.withDouble("mLon",lonLongitude)
.withString("cityName",TextUtils.isEmpty(outCityName) ? nowCity : outCityName)
.withInt("shopType",2)
.navigation(_mActivity,TYPE_REQUEST_CITY);
// startActivityForResult(SelectShopActivity.getIntent(getActivity(), 2, "", TextUtils.isEmpty(outCityName) ? nowCity : outCityName, latLatitude, lonLongitude), TYPE_REQUEST_CITY);
} else if (id == R.id.ll_item_select_data) { } else if (id == R.id.ll_item_select_data) {
//选择日期 //选择日期
ARouter.getInstance() ARouter.getInstance()
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/SelectShopActivity.java
View file @ e3352767
...@@ -11,6 +11,8 @@ import android.view.View; ...@@ -11,6 +11,8 @@ import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.baidu.mapapi.search.core.SearchResult; import com.baidu.mapapi.search.core.SearchResult;
import com.baidu.mapapi.search.geocode.GeoCodeOption; import com.baidu.mapapi.search.geocode.GeoCodeOption;
...@@ -49,6 +51,7 @@ import butterknife.BindView; ...@@ -49,6 +51,7 @@ import butterknife.BindView;
* Date: 2019/5/18. * Date: 2019/5/18.
* Desc:门店选择 * Desc:门店选择
*/ */
@Route(path = Constance.ACTIVITY_URL_SELECTSHOP)
public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener { public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
private final int TYPE_REQUEST_CITY = 10001; private final int TYPE_REQUEST_CITY = 10001;
...@@ -61,26 +64,24 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl ...@@ -61,26 +64,24 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
@BindView(R2.id.tv_current_city) @BindView(R2.id.tv_current_city)
TextView tvCurrentCity; TextView tvCurrentCity;
private SelectShopAdapter mAdapter; private SelectShopAdapter mAdapter;
private int shopType;
private int mCityId; private int mCityId;
private double mLat; @Autowired()
private double mLon; int shopType;
@Autowired()
double mLat;
@Autowired()
double mLon;
@Autowired()
String cityName;
private int mPage; private int mPage;
private int countPage; private int countPage;
private String cityName;
private GeoCoder geoCoder; private GeoCoder geoCoder;
private double latLatitude; private double latLatitude;
private double lonLongitude; private double lonLongitude;
public static Intent getIntent(Context context, int type, String id, String cityName, double lat, double lon) {
return new Intent(context, SelectShopActivity.class)
.putExtra("type", type)
.putExtra("city_id", id)
.putExtra("city_name", cityName)
.putExtra("lat", lat)
.putExtra("lon", lon);
}
@Override @Override
protected int setLayout() { protected int setLayout() {
...@@ -90,9 +91,7 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl ...@@ -90,9 +91,7 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
@Override @Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) { protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle(mActivity.getString(R.string.rv_select_shop)); titleView.setTitle(mActivity.getString(R.string.rv_select_shop));
mLat = intent.getDoubleExtra("lat", 0d);
mLon = intent.getDoubleExtra("lon", 0d);
cityName = intent.getStringExtra("city_name");
if (!TextUtils.isEmpty(cityName)) { if (!TextUtils.isEmpty(cityName)) {
tvCurrentCity.setText("当前选择城市: " + cityName); tvCurrentCity.setText("当前选择城市: " + cityName);
} }
...@@ -104,7 +103,6 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl ...@@ -104,7 +103,6 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
mSimpleRefreshLayout.setOnSimpleRefreshListener(this); mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
recyclerView.setLayoutManager(new LinearLayoutManager(mActivity)); recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
recyclerView.setAdapter(mAdapter); recyclerView.setAdapter(mAdapter);
shopType = intent.getIntExtra("type", 1);
mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
...@@ -115,6 +113,7 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl ...@@ -115,6 +113,7 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
intent.putExtra("id", mAdapter.getItem(position).getAddrCity()); intent.putExtra("id", mAdapter.getItem(position).getAddrCity());
intent.putExtra("company", mAdapter.getItem(position).getName()); intent.putExtra("company", mAdapter.getItem(position).getName());
intent.putExtra("company_id", mAdapter.getItem(position).getId()); intent.putExtra("company_id", mAdapter.getItem(position).getId());
intent.putExtra("address", mAdapter.getItem(position).getAddrDetail());
intent.putExtra("latitude", latLatitude); intent.putExtra("latitude", latLatitude);
intent.putExtra("longitude", lonLongitude); intent.putExtra("longitude", lonLongitude);
setResult(RESULT_OK, intent); setResult(RESULT_OK, intent);
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @ e3352767
...@@ -118,7 +118,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements ...@@ -118,7 +118,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
int id = view.getId(); int id = view.getId();
if (id == R.id.tv_process || id == R.id.tv_camp_process || id == R.id.tv_member_pay) { if (id == R.id.tv_process || id == R.id.tv_camp_process || id == R.id.tv_member_pay) {
payBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position); payBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
payShowSelect(payBean.getNo(), payBean.getOrderAmount()); payShowSelect(payBean.getNo(), payBean.getRealAmount());
} }
} }
}); });
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java
View file @ e3352767
...@@ -153,7 +153,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> { ...@@ -153,7 +153,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
if (dataBean != null) { if (dataBean != null) {
status = dataBean.getStatusX(); status = dataBean.getStatusX();
no = dataBean.getNo(); no = dataBean.getNo();
orderAmount = dataBean.getOrderAmount(); orderAmount = dataBean.getRealAmount();
} }
switch (status) { switch (status) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java
View file @ e3352767
...@@ -132,7 +132,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent ...@@ -132,7 +132,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
if (dataBean != null) { if (dataBean != null) {
status = dataBean.getStatusX(); status = dataBean.getStatusX();
no = dataBean.getNo(); no = dataBean.getNo();
orderAmount = dataBean.getOrderAmount(); orderAmount = dataBean.getRealAmount();
} }
/** /**
* *
...@@ -255,7 +255,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent ...@@ -255,7 +255,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
switch (status) { switch (status) {
case 3: case 3:
case 4: case 4:
startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no,"16"), 1); startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no,"3"), 1);
break; break;
case 5: case 5:
break; break;
......
module_tourism/src/main/java/com/rv/tourism/bean/BeanTourOrderResponse.java
View file @ e3352767
...@@ -30,8 +30,8 @@ public class BeanTourOrderResponse extends BaseBean { ...@@ -30,8 +30,8 @@ public class BeanTourOrderResponse extends BaseBean {
private String detailId;//14, private String detailId;//14,
private String status;//3, private String status;//3,
private String goodsAmount;//1380, private String goodsAmount;//1380,
private String orderAmount;//1380, private double orderAmount;//1380,
private String realAmount;//880, private double realAmount;//880,
private String userId;//27, private String userId;//27,
private String picture;//"https://xxtest.upyuns.com/image/app/ENRq748FQTq86R8R77J88YEWhnPeZ3.png", private String picture;//"https://xxtest.upyuns.com/image/app/ENRq748FQTq86R8R77J88YEWhnPeZ3.png",
private String name;//"04-05号 惠州长荣大观园2日游", private String name;//"04-05号 惠州长荣大观园2日游",
...@@ -92,19 +92,19 @@ public class BeanTourOrderResponse extends BaseBean { ...@@ -92,19 +92,19 @@ public class BeanTourOrderResponse extends BaseBean {
this.goodsAmount = goodsAmount; this.goodsAmount = goodsAmount;
} }
public String getOrderAmount() { public double getOrderAmount() {
return orderAmount; return orderAmount;
} }
public void setOrderAmount(String orderAmount) { public void setOrderAmount(double orderAmount) {
this.orderAmount = orderAmount; this.orderAmount = orderAmount;
} }
public String getRealAmount() { public double getRealAmount() {
return realAmount; return realAmount;
} }
public void setRealAmount(String realAmount) { public void setRealAmount(double realAmount) {
this.realAmount = realAmount; this.realAmount = realAmount;
} }
......
module_tourism/src/main/java/com/rv/tourism/other/TravelerConfirmOrderActivity.java
View file @ e3352767
...@@ -275,7 +275,15 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres ...@@ -275,7 +275,15 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
break; break;
case 1: case 1:
BeanTourOrderResponse orderBean = (BeanTourOrderResponse) result; BeanTourOrderResponse orderBean = (BeanTourOrderResponse) result;
orderPay(orderBean.getData().getNo(), 1, 1); if (orderBean.getData().getRealAmount() ==0){
ARouter.getInstance().build(Constance.ACTIVITY_URL_ORDERLIST)
.withInt("position", 1)
.navigation();
finish();
}else {
orderPay(orderBean.getData().getNo(), 1, 1);
}
break; break;
case 2: case 2:
pay((BeanTourOrderPay) result); pay((BeanTourOrderPay) result);
......
plugin_carpurchase/src/main/java/com/xxrv/carpurchase/activity/ReservationInformationActivity.java
View file @ e3352767
package com.xxrv.carpurchase.activity; package com.xxrv.carpurchase.activity;
import android.Manifest;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.nfc.tech.NfcA; import android.nfc.tech.NfcA;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
...@@ -13,16 +16,23 @@ import android.widget.LinearLayout; ...@@ -13,16 +16,23 @@ import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Autowired; import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.launcher.ARouter;
import com.baidu.location.BDAbstractLocationListener;
import com.baidu.location.BDLocation;
import com.baidu.mapapi.model.LatLng;
import com.base.utils.ui.datetime.picker.simple.SampleDateTimeActivity; import com.base.utils.ui.datetime.picker.simple.SampleDateTimeActivity;
import com.base.utils.ui.datetime.selector.util.DateUtil; import com.base.utils.ui.datetime.selector.util.DateUtil;
import com.base.utils.ui.datetime.selector.util.TextUtil; import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.bigkoo.pickerview.TimePickerView; import com.bigkoo.pickerview.TimePickerView;
import com.frame.base.url.Constance;
import com.frame.base.view.StarBar; import com.frame.base.view.StarBar;
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.util.LocationManager;
import com.ruiwenliu.wrapper.util.glide.GlideApp; import com.ruiwenliu.wrapper.util.glide.GlideApp;
import com.ruiwenliu.wrapper.util.glide.GlideManager; import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.ruiwenliu.wrapper.weight.TitleView; import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.DateUtils; import com.rv.component.utils.DateUtils;
import com.xxrv.carpurchase.R; import com.xxrv.carpurchase.R;
...@@ -40,6 +50,7 @@ import java.util.Map; ...@@ -40,6 +50,7 @@ import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import io.reactivex.functions.Consumer;
/** /**
* 预约信息 * 预约信息
...@@ -76,6 +87,12 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha ...@@ -76,6 +87,12 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
private String id; private String id;
private LocationManager locationManager;
private double latLatitude = 0;
private double lonLongitude;
private String nowCity = "";
private int company_id;
public static Intent getIntent(Context context, String id, String icon, String name, String keyword, int score, double buyPrice) { public static Intent getIntent(Context context, String id, String icon, String name, String keyword, int score, double buyPrice) {
return new Intent(context, ReservationInformationActivity.class) return new Intent(context, ReservationInformationActivity.class)
.putExtra("id", id) .putExtra("id", id)
...@@ -94,6 +111,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha ...@@ -94,6 +111,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
@Override @Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) { protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("预约信息"); titleView.setTitle("预约信息");
permissionProcess();
initData(intent); initData(intent);
} }
...@@ -132,7 +150,12 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha ...@@ -132,7 +150,12 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
initTimePicker1(); initTimePicker1();
} else if (id == R.id.ll_item_select_branch_office) { } else if (id == R.id.ll_item_select_branch_office) {
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_SELECTSHOP)
.withDouble("mLat",latLatitude)
.withDouble("mLon",lonLongitude)
.withString("cityName",nowCity)
.navigation(mActivity,122);
} else if (id == R.id.tv_item_submit) { } else if (id == R.id.tv_item_submit) {
upDate(); upDate();
} }
...@@ -177,7 +200,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha ...@@ -177,7 +200,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("bookTime", DateUtils.StringToTimeMillis2(date)); map.put("bookTime", DateUtils.StringToTimeMillis2(date));
map.put("companyId", 22); map.put("companyId", company_id);
map.put("contactName", name); map.put("contactName", name);
map.put("contactPhone", phone); map.put("contactPhone", phone);
map.put("modelId", id); map.put("modelId", id);
...@@ -243,4 +266,73 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha ...@@ -243,4 +266,73 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
.build(); .build();
build.show(); build.show();
} }
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 122 && resultCode == RESULT_OK) {
company_id = data.getIntExtra("company_id", 0);
String company = data.getStringExtra("company");
String address = data.getStringExtra("address");
tvBranchOfficeName.setText(company);
tvBranchOfficeAddress.setText(address);
}
}
/**
* 定位权限处理
*/
private void permissionProcess() {
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
new RxPermission(mActivity).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
).subscribe(new Consumer<Boolean>() {
@Override
public void accept(Boolean aBoolean) throws Exception {
if (aBoolean == true) {
initGps();
} else {
finish();
}
}
});
} else {
initGps();
}
}
/**
* 初始化定位
*/
public void initGps() {
locationManager = new LocationManager(mActivity);
locationManager.getLocationDetail(new BDAbstractLocationListener() {
@Override
public void onReceiveLocation(BDLocation location) {
//此处的BDLocation为定位结果信息类，通过它的各种get方法可获取定位相关的全部结果
//以下只列举部分获取经纬度相关（常用）的结果信息
//更多结果信息获取说明，请参照类参考中BDLocation类中的说明
//获取定位精度，默认值为0.0f
float radius = location.getRadius();
//获取经纬度坐标类型，以LocationClientOption中设置过的坐标类型为准
String coorType = location.getCoorType();
//获取定位类型、定位错误返回码，具体信息可参照类参考中BDLocation类中的说明
int errorCode = location.getLocType();
latLatitude = location.getLatitude();
lonLongitude = location.getLongitude();
nowCity = location.getCity();
locationManager.stopLocation();
}
});
}
} }
plugin_wallet/src/main/AndroidManifest.xml
View file @ e3352767
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<activity android:name=".activity.CommissionDetailActivity" /> <activity android:name=".activity.CommissionDetailActivity" />
<activity android:name=".activity.EnchashmentRecordActivity"></activity> <activity android:name=".activity.EnchashmentRecordActivity"></activity>
<activity android:name=".activity.SetPayPwdActivity" /> <activity android:name=".activity.SetPayPwdActivity" />
<activity android:name=".activity.SetPayPwdActivity2" />
</application> </application>
</manifest> </manifest>
\ No newline at end of file
plugin_wallet/src/main/java/com/xxrv/wallet/activity/SetPayPwdActivity.java
View file @ e3352767
package com.xxrv.wallet.activity; package com.xxrv.wallet.activity;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.Log; import android.util.Log;
import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView;
import com.frame.base.bus.RxBus;
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.presenter.MvpPresenter; import com.ruiwenliu.wrapper.util.RxJavaManager;
import com.ruiwenliu.wrapper.weight.TitleView; import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.Cooker;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.presenter.CommonPresenter; import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.bean.SendCodeBean;
import com.xxrv.wallet.R; import com.xxrv.wallet.R;
import com.xxrv.wallet.R2; import com.xxrv.wallet.R2;
import com.xxrv.wallet.dialog.PayPassDialog; import com.xxrv.wallet.api.WalletApi;
import com.xxrv.wallet.dialog.SetPasswordDialog; import com.xxrv.wallet.event.SetPasswordSuccessEvent;
import com.xxrv.wallet.view.PayPassView; import com.yuyife.okgo.OkGoUtil;
import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> { public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> {
@BindView(R2.id.ll_send_code) @BindView(R2.id.ll_send_code)
LinearLayout llSendCode; LinearLayout llSendCode;
@BindView(R2.id.ll_set_pay_pwd)
LinearLayout llSetPayPwd;
@BindView(R2.id.edt_phone) @BindView(R2.id.edt_phone)
EditText edtPhone; EditText edtPhone;
@BindView(R2.id.edt_identify_code) @BindView(R2.id.edt_identify_code)
EditText edtIdentifyCode; EditText edtIdentifyCode;
@BindView(R2.id.btn_send) @BindView(R2.id.btn_item_send)
Button btnSend; Button btnSend;
@BindView(R2.id.btn_next) @BindView(R2.id.btn_item_next)
Button btnNext; Button btnNext;
@BindView(R2.id.img_clear_phone) @BindView(R2.id.img_clear_phone)
ImageView imgClearPhone; ImageView imgClearPhone;
@BindView(R2.id.edt_pwd1)
EditText edtPwd1; private Disposable mDisposable;
@BindView(R2.id.edt_pwd2)
EditText edtPwd2;
@BindView(R2.id.edt_pwd3) public static Intent getIntent(Context context) {
EditText edtPwd3; return new Intent(context, SetPayPwdActivity.class);
@BindView(R2.id.edt_pwd4) }
EditText edtPwd4;
@BindView(R2.id.edt_pwd5)
EditText edtPwd5;
@BindView(R2.id.edt_pwd6)
EditText edtPwd6;
@BindView(R2.id.btn_confirm)
Button btnConfirm;
@Override @Override
public void onShowResult(int requestType, BaseBean result) { public void onShowResult(int requestType, BaseBean result) {
switch (requestType){
case 0:
showToast("验证码发送成功！");
break;
case 2:
startActivity(SetPayPwdActivity2.getIntent(mActivity,getPhone(),getCode()));
break;
}
} }
@Override @Override
...@@ -67,14 +83,18 @@ public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -67,14 +83,18 @@ public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> {
@Override @Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) { protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("设置支付密码"); titleView.setTitle("设置支付密码");
payDialog(); initRxbus();
edtPwd1.addTextChangedListener(watcher); }
edtPwd2.addTextChangedListener(watcher);
edtPwd3.addTextChangedListener(watcher);
edtPwd4.addTextChangedListener(watcher);
edtPwd5.addTextChangedListener(watcher);
edtPwd6.addTextChangedListener(watcher);
private void initRxbus() {
RxBus.tObservable(SetPasswordSuccessEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new com.frame.base.bus.Observer<SetPasswordSuccessEvent>(disposable) {
@Override
public void onNext(SetPasswordSuccessEvent event) {
finish();
}
});
} }
private TextWatcher watcher = new TextWatcher() { private TextWatcher watcher = new TextWatcher() {
...@@ -94,31 +114,133 @@ public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -94,31 +114,133 @@ public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> {
} }
}; };
@OnClick({R2.id.btn_item_send, R2.id.btn_item_next})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.btn_item_send){
if (TextUtils.isEmpty(getPhone())) {
showToast(mActivity.getString(com.rv.home.R.string.rv_phone_hint));
return;
}
sendCode(60);
}else if (id == R.id.btn_item_next){
setNext();
}
}
/**
* 下一步
*/
private void setNext() {
if (TextUtils.isEmpty(getPhone())) {
showToast(mActivity.getString(com.rv.home.R.string.rv_phone_hint));
return;
}
if (TextUtils.isEmpty(getCode())){
showToast("验证码不能为空！");
return;
}
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
Map<String, Object> map = new LinkedHashMap<>();
map.put("phone", getPhone());
map.put("mobilecode", getCode());
mPresenter.getData(RvFrameConfig.HOST,2, WalletApi.HTTP_URL_CHECK_CHECKCODE, BaseBean.class, map,headMap, true);
}
/**
* 获得手机号
*
* @return
*/
private String getPhone() {
return edtPhone.getText().toString().trim();
}
/** /**
* 支付密码 * 获得验证码
*
* @return
*/ */
private void payDialog() { private String getCode() {
final SetPasswordDialog dialog = new SetPasswordDialog(this); return edtIdentifyCode.getText().toString().trim();
dialog.setOutColse(false); }
dialog.getPayViewPass().setPayClickListener(new PayPassView.OnPayClickListener() {
/**
* 发送验证码
*/
private void sendCode() {
Map<String, Object> map = new LinkedHashMap<>();
map.put("username", getPhone());
map.put("type", 4);
map.put("code", Cooker.getStringValue(getApplicationContext(), "code"));
mPresenter.postData(0, ApiConfig.HTTP_URL_SEND_CODE, SendCodeBean.class, map, true);
}
/**
* 发送验证码
*
* @param timeLong 验证码时长
*/
private void sendCode(final int timeLong) {
RxJavaManager.getInstance().sendCode(timeLong, new Consumer<Disposable>() {
@Override
public void accept(Disposable disposable) throws Exception {
btnSend.setEnabled(false);
sendCode();
}
}, new Observer<Long>() {
@Override @Override
public void onPassFinish(String passContent) { public void onSubscribe(Disposable d) {
//输入完成 mDisposable = d;
showToast(passContent);
startActivity(CashWithdrawalDetailsActivity.getIntent(mActivity));
dialog.dismiss();
} }
@Override @Override
public void onPayClose() { public void onNext(Long aLong) {
dialog.dismiss(); btnSend.setText("" + aLong + "s");
} }
@Override @Override
public void onPayForget() { public void onError(Throwable e) {
//忘记密码
dialog.dismiss(); }
@Override
public void onComplete() {
btnSend.setEnabled(true);
btnSend.setText(mActivity.getString(com.rv.home.R.string.rv_login_rest));
} }
}); });
}
/**
* 停止计时
*/
public void stopCarousel() {
if (mDisposable != null && !mDisposable.isDisposed()) {
mDisposable.dispose();
}
}
@Override
public void onDestroy() {
super.onDestroy();
stopCarousel();
}
@Override
protected void onStop() {
super.onStop();
stopCarousel();
} }
} }
plugin_wallet/src/main/java/com/xxrv/wallet/activity/SetPayPwdActivity2.java 0 → 100644
View file @ e3352767
package com.xxrv.wallet.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.Log;
import android.widget.Button;
import android.widget.EditText;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.xxrv.wallet.R;
import com.xxrv.wallet.R2;
import com.xxrv.wallet.api.WalletApi;
import com.xxrv.wallet.event.SetPasswordSuccessEvent;
import com.yuyife.okgo.OkGoUtil;
import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
public class SetPayPwdActivity2 extends BaseStatusActivity<CommonPresenter> {
@BindView(R2.id.edt_pwd1)
EditText edtPwd1;
@BindView(R2.id.edt_pwd2)
EditText edtPwd2;
@BindView(R2.id.edt_pwd3)
EditText edtPwd3;
@BindView(R2.id.edt_pwd4)
EditText edtPwd4;
@BindView(R2.id.edt_pwd5)
EditText edtPwd5;
@BindView(R2.id.edt_pwd6)
EditText edtPwd6;
private String phone;
private String mobilecode;
public static Intent getIntent(Context context, String phone, String mobilecode) {
return new Intent(context, SetPayPwdActivity2.class)
.putExtra("phone", phone)
.putExtra("mobilecode", mobilecode);
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType){
case 0:
showToast("密码设置成功！");
RxBus.post(new SetPasswordSuccessEvent());
finish();
break;
}
}
@Override
protected int setLayout() {
return R.layout.activity_set_pay_pwd2;
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("设置支付密码");
phone = intent.getStringExtra("phone");
mobilecode = intent.getStringExtra("mobilecode");
edtPwd1.addTextChangedListener(watcher);
edtPwd2.addTextChangedListener(watcher);
edtPwd3.addTextChangedListener(watcher);
edtPwd4.addTextChangedListener(watcher);
edtPwd5.addTextChangedListener(watcher);
edtPwd6.addTextChangedListener(watcher);
}
private TextWatcher watcher = new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
Log.e("xxxxx", charSequence.toString());
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
Log.e("xxxxx", charSequence.toString());
}
@Override
public void afterTextChanged(Editable editable) {
if (editable.toString().length() == 1) {
if (edtPwd1.isFocused()) {
edtPwd1.clearFocus();
edtPwd2.requestFocus();
} else if (edtPwd2.isFocused()) {
edtPwd2.clearFocus();
edtPwd3.requestFocus();
} else if (edtPwd3.isFocused()) {
edtPwd3.clearFocus();
edtPwd4.requestFocus();
} else if (edtPwd4.isFocused()) {
edtPwd4.clearFocus();
edtPwd5.requestFocus();
} else if (edtPwd5.isFocused()) {
edtPwd5.clearFocus();
edtPwd6.requestFocus();
} else if (edtPwd6.isFocused()) {
edtPwd6.requestFocus();
}
}
}
};
@OnClick(R2.id.btn_item_confirm)
public void onViewClicked() {
String password = getEdittext(edtPwd1) + getEdittext(edtPwd2) + getEdittext(edtPwd3) + getEdittext(edtPwd4) + getEdittext(edtPwd5) + getEdittext(edtPwd6);
if (TextUtils.isEmpty(password)){
showToast("密码不能为空！");
return;
}
if (password.length() != 6){
showToast("请输入6位密码");
return;
}
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
Map<String, Object> map = new LinkedHashMap<>();
map.put("phone", phone);
map.put("mobilecode", mobilecode);
map.put("password", password);
map.put("type", 1);
mPresenter.postData(RvFrameConfig.HOST,0, WalletApi.HTTP_URL_WALLET_SETPWD, BaseBean.class, map,headMap, true);
}
private String getEdittext(EditText editText) {
return editText.getText().toString().trim();
}
}
plugin_wallet/src/main/java/com/xxrv/wallet/activity/WalletActivity.java
View file @ e3352767
...@@ -6,6 +6,7 @@ import android.view.View; ...@@ -6,6 +6,7 @@ import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.frame.base.bus.RxBus;
import com.frame.base.url.Constance; import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig; import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean; import com.ruiwenliu.wrapper.base.BaseBean;
...@@ -15,12 +16,17 @@ import com.xxrv.wallet.R; ...@@ -15,12 +16,17 @@ import com.xxrv.wallet.R;
import com.xxrv.wallet.R2; import com.xxrv.wallet.R2;
import com.xxrv.wallet.api.WalletApi; import com.xxrv.wallet.api.WalletApi;
import com.xxrv.wallet.bean.WalletBean; import com.xxrv.wallet.bean.WalletBean;
import com.xxrv.wallet.bean.WalletCheckPwdBean;
import com.xxrv.wallet.event.SetPasswordSuccessEvent;
import com.xxrv.wallet.presenter.WalletPresenter; import com.xxrv.wallet.presenter.WalletPresenter;
import com.yuyife.okgo.OkGoUtil; import com.yuyife.okgo.OkGoUtil;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
import io.reactivex.schedulers.Schedulers;
/** /**
* 钱包 * 钱包
...@@ -45,19 +51,36 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -45,19 +51,36 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
@Override @Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) { protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false); showTitle(false);
initRxbus();
}
private void initRxbus() {
RxBus.tObservable(SetPasswordSuccessEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new com.frame.base.bus.Observer<SetPasswordSuccessEvent>(disposable) {
@Override
public void onNext(SetPasswordSuccessEvent event) {
startActivity(WithdrawActivity.getIntent(mActivity));
}
});
} }
@Override @Override
public void onShowResult(int requestType, BaseBean result) { public void onShowResult(int requestType, BaseBean result) {
switch (requestType){ switch (requestType) {
case 0: case 0:
setWalletData((WalletBean)result); setWalletData((WalletBean) result);
break; break;
} case 1:
setCheckPwd((WalletCheckPwdBean)result);
break;
}
} }
private void setWalletData(WalletBean bean) { private void setWalletData(WalletBean bean) {
if (bean !=null && bean.getData() != null){ if (bean != null && bean.getData() != null) {
tvWalletBalance.setText("¥" + bean.getData().getBalance()); tvWalletBalance.setText("¥" + bean.getData().getBalance());
tvTodayAmount.setText(bean.getData().getTodayAmount()); tvTodayAmount.setText(bean.getData().getTodayAmount());
tvTotalAmount.setText(bean.getData().getTotalAmount()); tvTotalAmount.setText(bean.getData().getTotalAmount());
...@@ -79,11 +102,10 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -79,11 +102,10 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
Map<String, Object> headMap = new LinkedHashMap<>(); Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null) if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken()); headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 0, WalletApi.HTTP_URL_ADMIN_WALLET, WalletBean.class, headMap,true); mPresenter.getDataHead(RvFrameConfig.HOST, 0, WalletApi.HTTP_URL_ADMIN_WALLET, WalletBean.class, headMap, true);
} }
@OnClick({R2.id.iv_back, R2.id.tv_item_withdraw, R2.id.rl_item_consumer_details, R2.id.rl_item_commission_record, R2.id.rl_item_withdrawals_record}) @OnClick({R2.id.iv_back, R2.id.tv_item_withdraw, R2.id.rl_item_consumer_details, R2.id.rl_item_commission_record, R2.id.rl_item_withdrawals_record})
public void onViewClicked(View view) { public void onViewClicked(View view) {
int id = view.getId(); int id = view.getId();
...@@ -91,7 +113,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -91,7 +113,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
finish(); finish();
} else if (id == R.id.tv_item_withdraw) { } else if (id == R.id.tv_item_withdraw) {
//提现 //提现
startActivity(WithdrawActivity.getIntent(mActivity)); getCheckSetPwd();
} else if (id == R.id.rl_item_consumer_details) { } else if (id == R.id.rl_item_consumer_details) {
startActivity(new Intent(getApplicationContext(), ConsumeDetailActivity.class)); startActivity(new Intent(getApplicationContext(), ConsumeDetailActivity.class));
...@@ -104,4 +126,26 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -104,4 +126,26 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
startActivity(new Intent(getApplicationContext(), SetPayPwdActivity.class)); startActivity(new Intent(getApplicationContext(), SetPayPwdActivity.class));
} }
} }
/**
* 检查用户是否设置过支付密码
*/
private void getCheckSetPwd() {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 1, WalletApi.HTTP_URL_CHECK_SETPWD, WalletCheckPwdBean.class, headMap, false);
}
private void setCheckPwd(WalletCheckPwdBean bean) {
if (bean !=null){
if (bean.isData()){ //true-设置过；false-没有
startActivity(WithdrawActivity.getIntent(mActivity));
}else {
startActivity(SetPayPwdActivity.getIntent(mActivity));
}
}
}
} }
plugin_wallet/src/main/java/com/xxrv/wallet/activity/WithdrawActivity.java
View file @ e3352767
...@@ -6,10 +6,14 @@ import android.os.Bundle; ...@@ -6,10 +6,14 @@ import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import com.alibaba.android.arouter.launcher.ARouter;
import com.frame.base.url.Constance;
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.util.ViewHolder; import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.weight.TitleView; import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.ApiConfig;
import com.xxrv.wallet.R; import com.xxrv.wallet.R;
import com.xxrv.wallet.R2; import com.xxrv.wallet.R2;
import com.xxrv.wallet.dialog.PayPassDialog; import com.xxrv.wallet.dialog.PayPassDialog;
...@@ -57,6 +61,11 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -57,6 +61,11 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
}else if (id == R.id.tv_item_withdrawal_rules){ }else if (id == R.id.tv_item_withdrawal_rules){
//提现规则 //提现规则
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title", "提现规则")
.withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type", 20)
.navigation();
} }
} }
......
plugin_wallet/src/main/java/com/xxrv/wallet/api/WalletApi.java
View file @ e3352767
...@@ -6,4 +6,13 @@ public class WalletApi { ...@@ -6,4 +6,13 @@ public class WalletApi {
//钱包 //钱包
public static String HTTP_URL_ADMIN_WALLET = RvFrameConfig.HOST + "/api/admin/wallet"; public static String HTTP_URL_ADMIN_WALLET = RvFrameConfig.HOST + "/api/admin/wallet";
//检查用户是否设置过支付密码
public static String HTTP_URL_CHECK_SETPWD = RvFrameConfig.HOST + "/api/admin/wallet/checkSetPwd";
//检查验证码
public static String HTTP_URL_CHECK_CHECKCODE = RvFrameConfig.HOST + "/api/admin/wallet/checkCode";
// 设置密码
public static String HTTP_URL_WALLET_SETPWD = RvFrameConfig.HOST + "/api/admin/wallet/setPwd";
} }
plugin_wallet/src/main/java/com/xxrv/wallet/bean/WalletCheckPwdBean.java 0 → 100644
View file @ e3352767
package com.xxrv.wallet.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
public class WalletCheckPwdBean extends BaseBean {
private boolean data;
private boolean rel;
public boolean isData() {
return data;
}
public void setData(boolean data) {
this.data = data;
}
public boolean isRel() {
return rel;
}
public void setRel(boolean rel) {
this.rel = rel;
}
}
plugin_wallet/src/main/java/com/xxrv/wallet/event/SetPasswordSuccessEvent.java 0 → 100644
View file @ e3352767
package com.xxrv.wallet.event;
public class SetPasswordSuccessEvent {
}
plugin_wallet/src/main/res/layout/activity_set_pay_pwd.xml
View file @ e3352767
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ll_send_code"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/common_line" /> <LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/size_20"
android:layout_marginRight="@dimen/dp_10"
android:orientation="horizontal">
<EditText
android:id="@+id/edt_phone"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:maxLength="11"
android:background="@color/white"
android:gravity="left|center_vertical"
android:hint="请输入该账号注册的手机号"
android:imeOptions="actionSend"
android:inputType="phone"
android:textColorHint="@color/colorGray"
android:textSize="@dimen/sp_14" />
<ImageView
android:id="@+id/img_clear_phone"
android:layout_width="@dimen/size_30"
android:layout_height="@dimen/size_30"
android:layout_gravity="center_vertical"
android:padding="@dimen/dp_10" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10">
<include layout="@layout/common_line" />
</RelativeLayout>
<FrameLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:orientation="horizontal">
<include layout="@layout/view_pwd_send_code" /> <EditText
android:id="@+id/edt_identify_code"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/white"
android:gravity="left|center_vertical"
android:hint="请输入验证码"
android:imeOptions="actionDone"
android:inputType="number"
android:maxLength="6"
android:textColorHint="@color/colorGray"
android:textSize="@dimen/sp_14" />
<View
android:layout_width="0.1px"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:background="@color/colorLine" />
<Button
android:id="@+id/btn_item_send"
android:layout_width="@dimen/size_100"
android:layout_height="match_parent"
android:background="@color/white"
android:gravity="center"
android:text="发送验证码" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10">
<include layout="@layout/common_line" />
</RelativeLayout>
<Button
android:id="@+id/btn_item_next"
android:layout_width="match_parent"
android:layout_height="@dimen/size_40"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_20"
android:layout_marginRight="@dimen/size_15"
android:background="@drawable/bg_next_btn_unable"
android:gravity="center"
android:text="下一步"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<include layout="@layout/view_pwd_set_pay_pwd" />
</FrameLayout>
</LinearLayout> </LinearLayout>
plugin_wallet/src/main/res/layout/view_pwd_set_pay_pwd.xml → plugin_wallet/src/main/res/layout/activity_set_pay_pwd2.xml
View file @ e3352767
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/size_50" android:layout_height="@dimen/size_50"
android:layout_weight="1" android:layout_weight="1"
android:maxLength="1"
android:background="@drawable/bg_password_item" android:background="@drawable/bg_password_item"
android:gravity="center" android:gravity="center"
android:inputType="numberPassword|textPassword" android:inputType="numberPassword|textPassword" />
android:text="1" />
<EditText <EditText
android:id="@+id/edt_pwd2" android:id="@+id/edt_pwd2"
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
android:layout_height="@dimen/size_50" android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/size_8" android:layout_marginLeft="@dimen/size_8"
android:layout_weight="1" android:layout_weight="1"
android:maxLength="1"
android:background="@drawable/bg_password_item" android:background="@drawable/bg_password_item"
android:gravity="center" android:gravity="center"
android:inputType="numberPassword|textPassword" /> android:inputType="numberPassword|textPassword" />
...@@ -41,6 +42,7 @@ ...@@ -41,6 +42,7 @@
android:layout_height="@dimen/size_50" android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/size_8" android:layout_marginLeft="@dimen/size_8"
android:layout_weight="1" android:layout_weight="1"
android:maxLength="1"
android:background="@drawable/bg_password_item" android:background="@drawable/bg_password_item"
android:gravity="center" android:gravity="center"
android:inputType="numberPassword|textPassword" /> android:inputType="numberPassword|textPassword" />
...@@ -51,6 +53,7 @@ ...@@ -51,6 +53,7 @@
android:layout_height="@dimen/size_50" android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/size_8" android:layout_marginLeft="@dimen/size_8"
android:layout_weight="1" android:layout_weight="1"
android:maxLength="1"
android:background="@drawable/bg_password_item" android:background="@drawable/bg_password_item"
android:gravity="center" android:gravity="center"
android:inputType="numberPassword|textPassword" /> android:inputType="numberPassword|textPassword" />
...@@ -61,6 +64,7 @@ ...@@ -61,6 +64,7 @@
android:layout_height="@dimen/size_50" android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/size_8" android:layout_marginLeft="@dimen/size_8"
android:layout_weight="1" android:layout_weight="1"
android:maxLength="1"
android:background="@drawable/bg_password_item" android:background="@drawable/bg_password_item"
android:gravity="center" android:gravity="center"
android:inputType="numberPassword|textPassword" /> android:inputType="numberPassword|textPassword" />
...@@ -71,6 +75,7 @@ ...@@ -71,6 +75,7 @@
android:layout_height="@dimen/size_50" android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/size_8" android:layout_marginLeft="@dimen/size_8"
android:layout_weight="1" android:layout_weight="1"
android:maxLength="1"
android:background="@drawable/bg_password_item" android:background="@drawable/bg_password_item"
android:gravity="center" android:gravity="center"
android:inputType="numberPassword|textPassword" /> android:inputType="numberPassword|textPassword" />
...@@ -78,7 +83,7 @@ ...@@ -78,7 +83,7 @@
<Button <Button
android:id="@+id/btn_confirm" android:id="@+id/btn_item_confirm"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_40" android:layout_height="@dimen/size_40"
android:layout_marginLeft="@dimen/size_15" android:layout_marginLeft="@dimen/size_15"
......
plugin_wallet/src/main/res/layout/view_pwd_send_code.xml deleted 100644 → 0
View file @ a97857f0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ll_send_code"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/size_20"
android:layout_marginRight="@dimen/dp_10"
android:orientation="horizontal">
<EditText
android:id="@+id/edt_phone"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/white"
android:gravity="left|center_vertical"
android:hint="请输入该账号注册的手机号"
android:imeOptions="actionSend"
android:inputType="phone"
android:textColorHint="@color/colorGray"
android:textSize="@dimen/sp_14" />
<ImageView
android:id="@+id/img_clear_phone"
android:layout_width="@dimen/size_30"
android:layout_height="@dimen/size_30"
android:layout_gravity="center_vertical"
android:padding="@dimen/dp_10" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10">
<include layout="@layout/common_line" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:orientation="horizontal">
<EditText
android:id="@+id/edt_identify_code"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/white"
android:gravity="left|center_vertical"
android:hint="请输入验证码"
android:imeOptions="actionDone"
android:inputType="number"
android:maxLength="6"
android:textColorHint="@color/colorGray"
android:textSize="@dimen/sp_14" />
<View
android:layout_width="0.1px"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:background="@color/colorLine" />
<Button
android:id="@+id/btn_send"
android:layout_width="@dimen/size_100"
android:layout_height="match_parent"
android:background="@color/white"
android:gravity="center"
android:text="发送验证码" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10">
<include layout="@layout/common_line" />
</RelativeLayout>
<Button
android:id="@+id/btn_next"
android:layout_width="match_parent"
android:layout_height="@dimen/size_40"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_20"
android:layout_marginRight="@dimen/size_15"
android:background="@drawable/bg_next_btn_unable"
android:gravity="center"
android:text="下一步"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
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