Skip to content

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

bug修复

parent cabd7cff
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 8 deletions
RvClient/build.gradle
View file @ 9b256013
...@@ -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 124 versionCode 125
versionName "1.2.4" versionName "1.2.5"
multiDexEnabled true multiDexEnabled true
//新版Gradle 是 implementation 为了兼容compile,写上这句话 //新版Gradle 是 implementation 为了兼容compile,写上这句话
......
module_camp/build.gradle
View file @ 9b256013
...@@ -39,6 +39,7 @@ dependencies { ...@@ -39,6 +39,7 @@ dependencies {
annotationProcessor'com.alibaba:arouter-compiler:1.1.4' annotationProcessor'com.alibaba:arouter-compiler:1.1.4'
api project(':RvWrapper') api project(':RvWrapper')
api project(':component_control') api project(':component_control')
api project(':component_resource')
} }
module_camp/src/main/res/layout/activity_act_shop_show.xml 0 → 100644
View file @ 9b256013
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.baidu.mapapi.map.MapView
android:id="@+id/bmapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true" />
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/size_40"
android:layout_height="@dimen/size_40"
android:layout_marginLeft="@dimen/size_5"
android:layout_marginTop="@dimen/size_10"
android:padding="@dimen/size_8"
android:src="@drawable/rv_common_icon_back_dark" />
<ImageView
android:id="@+id/iv_location"
android:layout_alignParentRight="true"
android:layout_width="@dimen/size_50"
android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/size_5"
android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="@dimen/size_15"
android:padding="@dimen/size_8"
android:src="@drawable/rv_location" />
<!--<ImageView-->
<!--android:layout_width="wrap_content"-->
<!--android:id="@+id/iv_center"-->
<!--android:visibility="gone"-->
<!--android:layout_centerInParent="true"-->
<!--android:layout_height="wrap_content"-->
<!--android:src="@drawable/im_map_button_pres"-->
<!--/>-->
<LinearLayout
android:layout_marginLeft="@dimen/size_30"
android:layout_marginRight="@dimen/size_30"
android:layout_alignParentBottom="true"
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:orientation="horizontal"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_weight="1"
android:paddingRight="@dimen/size_10"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/textMain"
android:textSize="@dimen/text_18"
android:drawablePadding="@dimen/size_5"
android:drawableLeft="@drawable/rv_common_icon_logo"
android:id="@+id/tv_name"
android:text=""
/>
<TextView
android:layout_marginTop="@dimen/size_8"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14"
android:layout_below="@id/tv_name"
android:id="@+id/tv_address"
android:text=""
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14"
android:layout_below="@id/tv_address"
android:id="@+id/tv_phone"
android:text=""
/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_navigation"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_centerHorizontal="true"
android:src="@drawable/rv_rentingcar_icon_gps"
android:layout_width="@dimen/size_30"
android:layout_height="@dimen/size_30"
/>
<TextView
android:textColor="@color/textMain"
android:textSize="@dimen/text_12"
android:layout_centerHorizontal="true"
android:text="去这里"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_35"
/>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
module_discovery/src/main/java/com/xxfc/discovery/DiscoveryFragment.java
View file @ 9b256013
...@@ -128,7 +128,7 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> { ...@@ -128,7 +128,7 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
list.add(_mActivity.getString(R.string.discovery_recommend)); list.add(_mActivity.getString(R.string.discovery_recommend));
list.add(_mActivity.getString(R.string.discovery_pat)); list.add(_mActivity.getString(R.string.discovery_pat));
list.add(_mActivity.getString(R.string.discovery_short_video)); // list.add(_mActivity.getString(R.string.discovery_short_video));
list.add(_mActivity.getString(R.string.discovery_question_and_answer)); list.add(_mActivity.getString(R.string.discovery_question_and_answer));
menuAdapter.setNewData(list); menuAdapter.setNewData(list);
menuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { menuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
...@@ -173,7 +173,7 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> { ...@@ -173,7 +173,7 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
List<BaseFragment> list = new ArrayList<>(); List<BaseFragment> list = new ArrayList<>();
list.add(RecommendFragment.getInstance(TYPE_RECOMMEND)); list.add(RecommendFragment.getInstance(TYPE_RECOMMEND));
list.add(PatFragment.getInstance(TYPE_PAT)); list.add(PatFragment.getInstance(TYPE_PAT));
list.add(ShortVideoFragment.getInstance(TYPE_SHORT_VIDEO)); // list.add(ShortVideoFragment.getInstance(TYPE_SHORT_VIDEO));
list.add(QuestionAndAnswerFragment.getInstance(TYPE_QUESTION_AND_ANSWER)); list.add(QuestionAndAnswerFragment.getInstance(TYPE_QUESTION_AND_ANSWER));
return list; return list;
} }
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
View file @ 9b256013
...@@ -366,7 +366,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -366,7 +366,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
if (platform.name().equals("WEIXIN_FAVORITE")) { if (platform.name().equals("WEIXIN_FAVORITE")) {
showToast(platform + " 收藏成功啦"); showToast(" 收藏成功啦");
} else { } else {
if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
...@@ -381,7 +381,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -381,7 +381,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
&& platform != SHARE_MEDIA.GOOGLEPLUS && platform != SHARE_MEDIA.GOOGLEPLUS
&& platform != SHARE_MEDIA.YNOTE && platform != SHARE_MEDIA.YNOTE
&& platform != SHARE_MEDIA.EVERNOTE) { && platform != SHARE_MEDIA.EVERNOTE) {
showToast(platform + "分享成功啦"); showToast("分享成功啦");
} }
......
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ 9b256013
...@@ -360,7 +360,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter> ...@@ -360,7 +360,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
if (platform.name().equals("WEIXIN_FAVORITE")) { if (platform.name().equals("WEIXIN_FAVORITE")) {
showToast(platform + " 收藏成功啦"); showToast( " 收藏成功啦");
} else { } else {
if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
...@@ -375,7 +375,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter> ...@@ -375,7 +375,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
&& platform != SHARE_MEDIA.GOOGLEPLUS && platform != SHARE_MEDIA.GOOGLEPLUS
&& platform != SHARE_MEDIA.YNOTE && platform != SHARE_MEDIA.YNOTE
&& platform != SHARE_MEDIA.EVERNOTE) { && platform != SHARE_MEDIA.EVERNOTE) {
showToast(platform + "分享成功啦"); showToast("分享成功啦");
} }
......
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