Commit 87dcd26f authored by jianglx's avatar jianglx

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

parent 1c92b49d
...@@ -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')
} }
...@@ -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" />
......
...@@ -155,6 +155,15 @@ ...@@ -155,6 +155,15 @@
</RelativeLayout> </RelativeLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!--我的订单--> <!--我的订单-->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -491,7 +500,6 @@ ...@@ -491,7 +500,6 @@
android:layout_height="@dimen/size_60" android:layout_height="@dimen/size_60"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"></RelativeLayout> android:orientation="vertical"></RelativeLayout>
</LinearLayout> </LinearLayout>
<com.yuyife.banner.Banner <com.yuyife.banner.Banner
...@@ -499,8 +507,7 @@ ...@@ -499,8 +507,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_100" android:layout_height="@dimen/size_100"
android:layout_marginTop="@dimen/size_15" /> android:layout_marginTop="@dimen/size_15" />
</LinearLayout> </LinearLayout>
</ScrollView>
</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