Skip to content

R
RvApp
Commit 87dcd26f authored by jianglx's avatar jianglx
Browse files
Options

修改了debug模式下签名问题，修改成debug模式下也使用正式签名，方便支付这边的调试

parent 1c92b49d
Hide whitespace changes
Inline Side-by-side
Showing with 328 additions and 322 deletions
RvClient/build.gradle
View file @ 87dcd26f
...@@ -8,7 +8,7 @@ android { ...@@ -8,7 +8,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 30 versionCode 30
versionName "3.2" versionName "3.0"
multiDexEnabled true multiDexEnabled true
//新版Gradle 是 implementation 为了兼容compile,写上这句话 //新版Gradle 是 implementation 为了兼容compile,写上这句话
...@@ -26,10 +26,10 @@ android { ...@@ -26,10 +26,10 @@ android {
storePassword rootProject.ext.sign_xinxin.storePassword storePassword rootProject.ext.sign_xinxin.storePassword
} }
debug { debug {
keyAlias rootProject.ext.sign_xinxin_debug.keyAlias keyAlias 'xinxin'
keyPassword rootProject.ext.sign_xinxin_debug.keyPassword keyPassword '123456'
storeFile file(rootProject.ext.sign_xinxin_debug.storeDebugFile) storeFile file('E:/git/rvapp/keystore/xinxin.jks')
storePassword rootProject.ext.sign_xinxin_debug.storePassword storePassword '123456'
} }
} }
buildTypes { buildTypes {
...@@ -37,18 +37,21 @@ android { ...@@ -37,18 +37,21 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
debug {
debuggable true
signingConfig signingConfigs.debug
}
} }
} }
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(include: ['*.jar'], dir: 'libs')
api 'com.jakewharton:butterknife:9.0.0-rc1' api 'com.jakewharton:butterknife:9.0.0-rc1'
annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1' annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support.constraint:constraint-layout:1.1.3'
// api project(path: ':RvTravel') // api project(path: ':RvTravel')
api project(path: ':module_home') api project(path: ':module_home')
api project(path: ':module_mine') api project(path: ':module_mine')
api project(path: ':module_camp') api project(path: ':module_camp')
api project(path: ':module_tourism') api project(path: ':module_tourism')
} }
RvClient/src/main/AndroidManifest.xml
View file @ 87dcd26f
...@@ -174,10 +174,6 @@ ...@@ -174,10 +174,6 @@
<activity <activity
android:name="com.rv.home.rv.module.ui.login.PwdLoginActivity" android:name="com.rv.home.rv.module.ui.login.PwdLoginActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity
android:name="com.rv.home.rv.module.ui.main.HomeActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity <activity
android:name="com.rv.home.rv.module.ui.main.home.CarRentalListActivity" android:name="com.rv.home.rv.module.ui.main.home.CarRentalListActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
......
module_mine/src/main/res/layout/activity_mine.xml
View file @ 87dcd26f
...@@ -155,352 +155,359 @@ ...@@ -155,352 +155,359 @@
</RelativeLayout> </RelativeLayout>
<!--我的订单--> <ScrollView
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:background="@color/colorWrite"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingTop="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tv_my_order"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_30" android:orientation="vertical">
android:layout_marginBottom="@dimen/size_15"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/rl_item_to_be_paid"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_unpaid" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_to_be_paid"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_staying"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_toravel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_staying"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_traveling"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_inthe_travel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_traveling"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_completed"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView <!--我的订单-->
android:layout_width="wrap_content" <LinearLayout
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_centerHorizontal="true" android:layout_height="wrap_content"
android:src="@drawable/mycenter_icon_completed" /> android:background="@color/colorWrite"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingTop="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:text="@string/tv_my_order"
android:layout_centerHorizontal="true"
android:text="@string/tv_completed"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" /> android:textSize="@dimen/text_16" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_all"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_whole" />
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_marginTop="@dimen/size_30"
android:layout_centerHorizontal="true" android:layout_marginBottom="@dimen/size_15"
android:text="@string/tv_all" android:orientation="horizontal">
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" /> <RelativeLayout
</RelativeLayout> android:id="@+id/rl_item_to_be_paid"
</LinearLayout> android:layout_width="0dp"
</LinearLayout> android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent" <ImageView
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="@dimen/size_15" android:layout_height="wrap_content"
android:background="@color/colorWrite" android:layout_centerHorizontal="true"
android:orientation="horizontal" android:src="@drawable/mycenter_icon_unpaid" />
android:paddingTop="@dimen/size_25"
android:paddingBottom="@dimen/size_15"> <TextView
android:layout_width="wrap_content"
<RelativeLayout android:layout_height="wrap_content"
android:id="@+id/rl_item_my_release" android:layout_alignParentBottom="true"
android:layout_width="0dp" android:layout_centerHorizontal="true"
android:layout_height="@dimen/size_60" android:layout_marginTop="@dimen/size_18"
android:layout_weight="1" android:text="@string/tv_to_be_paid"
android:orientation="vertical"> android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_staying"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_toravel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_staying"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_traveling"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_inthe_travel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_traveling"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_completed"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_completed" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_completed"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_all"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_whole" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_all"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_issue" />
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_marginTop="@dimen/size_15"
android:layout_centerHorizontal="true" android:background="@color/colorWrite"
android:layout_marginTop="@dimen/size_18" android:orientation="horizontal"
android:text="@string/tv_my_release" android:paddingTop="@dimen/size_25"
android:textColor="@color/colorMain" android:paddingBottom="@dimen/size_15">
android:textSize="@dimen/size_12" />
</RelativeLayout> <RelativeLayout
android:id="@+id/rl_item_my_release"
<RelativeLayout android:layout_width="0dp"
android:id="@+id/rl_item_collection" android:layout_height="@dimen/size_60"
android:layout_width="0dp" android:layout_weight="1"
android:layout_height="@dimen/size_60" android:orientation="vertical">
android:layout_weight="1"
android:orientation="vertical">
<ImageView <ImageView
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_centerHorizontal="true"
android:src="@drawable/mycenter_icon_collect" /> android:src="@drawable/mycenter_icon_issue" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18" android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_collection" android:text="@string/tv_my_release"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" /> android:textSize="@dimen/size_12" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_item_personal_information" android:id="@+id/rl_item_collection"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/size_60" android:layout_height="@dimen/size_60"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
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_centerHorizontal="true"
android:src="@drawable/mycenter_icon_personal_data" /> android:src="@drawable/mycenter_icon_collect" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18" android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_personal_information" android:text="@string/tv_collection"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" /> android:textSize="@dimen/size_12" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_item_setting" android:id="@+id/rl_item_personal_information"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/size_60" android:layout_height="@dimen/size_60"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
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_centerHorizontal="true"
android:src="@drawable/mycenter_icon_notes" /> android:src="@drawable/mycenter_icon_personal_data" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18" android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_setting" android:text="@string/tv_personal_information"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" /> android:textSize="@dimen/size_12" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_item_driver" android:id="@+id/rl_item_setting"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/size_60" android:layout_height="@dimen/size_60"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
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_centerHorizontal="true"
android:src="@drawable/mycenter_icon_driver" /> android:src="@drawable/mycenter_icon_notes" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18" android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_driver" android:text="@string/tv_setting"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" /> android:textSize="@dimen/size_12" />
</RelativeLayout> </RelativeLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/rl_item_driver"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout <ImageView
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorWrite" android:layout_centerHorizontal="true"
android:orientation="horizontal" android:src="@drawable/mycenter_icon_driver" />
android:paddingTop="@dimen/size_3"
android:paddingBottom="@dimen/size_15">
<RelativeLayout
android:id="@+id/rl_item_traveler"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView <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_alignParentBottom="true"
android:src="@drawable/mycenter_icon_visitors" /> android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_driver"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
</LinearLayout>
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:background="@color/colorWrite"
android:layout_centerHorizontal="true" android:orientation="horizontal"
android:layout_marginTop="@dimen/size_18" android:paddingTop="@dimen/size_3"
android:text="@string/tv_traveler" android:paddingBottom="@dimen/size_15">
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_my_pat"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
</RelativeLayout> <RelativeLayout
android:id="@+id/rl_item_traveler"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<RelativeLayout <ImageView
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="@dimen/size_60" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_centerHorizontal="true"
android:orientation="vertical"></RelativeLayout> android:src="@drawable/mycenter_icon_visitors" />
<RelativeLayout <TextView
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="@dimen/size_60" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_alignParentBottom="true"
android:orientation="vertical"></RelativeLayout> android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_traveler"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_my_pat"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<RelativeLayout </RelativeLayout>
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical"></RelativeLayout>
</LinearLayout> <RelativeLayout
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical"></RelativeLayout>
<com.yuyife.banner.Banner <RelativeLayout
android:id="@+id/mine_banner" android:layout_width="0dp"
android:layout_width="match_parent" android:layout_height="@dimen/size_60"
android:layout_height="@dimen/size_100" android:layout_weight="1"
android:layout_marginTop="@dimen/size_15" /> android:orientation="vertical"></RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical"></RelativeLayout>
</LinearLayout>
<com.yuyife.banner.Banner
android:id="@+id/mine_banner"
android:layout_width="match_parent"
android:layout_height="@dimen/size_100"
android:layout_marginTop="@dimen/size_15" />
</LinearLayout>
</ScrollView>
</LinearLayout> </LinearLayout>
</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