为防止证书路径不一致报错，移除自定义证书，采用Android系统自带的证书

wustor · Jan 24, 2018 · bb7d2dc · bb7d2dc
1 parent 6034172
commit bb7d2dc
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 110 deletions.
diff --git a/cartmodule/build.gradle b/cartmodule/build.gradle
@@ -5,22 +5,7 @@ if (isModuleRun.toBoolean()) {
 }
 def cfg = rootProject.ext.android
 def appId = rootProject.ext.appId
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file("keystore.properties")
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 android {
-    signingConfigs {
-        config {
-            v1SigningEnabled true
-            v2SigningEnabled true
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
-
-
-    }
     packagingOptions {
         exclude 'META-INF/rxjava.properties'
     }

diff --git a/goodsmodule/build.gradle b/goodsmodule/build.gradle
@@ -4,26 +4,11 @@ if (isModuleRun.toBoolean()) {
     apply plugin: 'com.android.library'
 }
 
-//apply from: "package.gradle"
 
 def cfg = rootProject.ext.android
-def url = rootProject.ext.url
 def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file("keystore.properties")
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 android {
-    signingConfigs {
-        config {
-            v1SigningEnabled true
-            v2SigningEnabled true
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
-
 
-    }
     packagingOptions {
         exclude 'META-INF/rxjava.properties'
     }

diff --git a/gradle.properties b/gradle.properties
@@ -7,14 +7,6 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
 android.enableAapt2=false
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/uueserguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
 isDebug=false
 isModuleRun=true
diff --git a/keystore.properties b/keystore.properties
diff --git a/local.properties b/local.properties
@@ -7,5 +7,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Jan 23 20:53:16 CST 2018
-sdk.dir=D\:\\l\\Android\\sdk
+#Wed Jan 24 12:47:44 CST 2018
+sdk.dir=/Users/chmyy/Library/Android/sdk
diff --git a/mainModule/build.gradle b/mainModule/build.gradle
@@ -2,23 +2,8 @@ apply plugin: 'com.android.application'
 
 def cfg = rootProject.ext.android
 def appId = rootProject.ext.appId
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file("keystore.properties")
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    signingConfigs {
-        config {
-            v1SigningEnabled true
-            v2SigningEnabled true
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
-
-
-    }
     packagingOptions {
         exclude 'META-INF/rxjava.properties'
     }
@@ -51,19 +36,6 @@ android {
     configurations.all {
         resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
     }
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.config
-        }
-        debug {
-            minifyEnabled false
-            debuggable true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.config
-        }
-    }
     sourceSets {
         main {
             if (isModuleRun.toBoolean()) {

diff --git a/mainModule/src/main/java/com/wustor/androidcomponent/debug/MainDebugActivity.java b/mainModule/src/main/java/com/wustor/androidcomponent/debug/MainDebugActivity.java
@@ -1,15 +1,18 @@
 package com.wustor.androidcomponent.debug;
 
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-
 import com.wustor.androidcomponent.R;
+import com.wustor.basemodule.BaseActivity;
+
+public class MainDebugActivity extends BaseActivity {
+
 
-public class MainDebugActivity extends AppCompatActivity {
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_main_debug;
+    }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main_debug);
+    protected void initView() {
+        setTitle("主页面");
     }
 }
diff --git a/mainModule/src/main/res/layout/activity_main_debug.xml b/mainModule/src/main/res/layout/activity_main_debug.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    >
+    android:orientation="vertical">
+
+    <include layout="@layout/widget_toolbar" />
 
     <TextView
         android:id="@+id/tv_module"
@@ -14,5 +15,5 @@
         android:padding="@dimen/dp_10"
         android:text="MainModule"
         android:textColor="@color/blue"
-        android:textSize="@dimen/sp_30"/>
-</RelativeLayout>
+        android:textSize="@dimen/sp_30" />
+</LinearLayout>
diff --git a/ordermodule/build.gradle b/ordermodule/build.gradle
@@ -7,22 +7,7 @@ if (isModuleRun.toBoolean()) {
 
 def cfg = rootProject.ext.android
 def appId = rootProject.ext.appId
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file("keystore.properties")
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 android {
-    signingConfigs {
-        config {
-            v1SigningEnabled true
-            v2SigningEnabled true
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
-
-
-    }
     packagingOptions {
         exclude 'META-INF/rxjava.properties'
     }

diff --git a/usermodule/build.gradle b/usermodule/build.gradle
@@ -6,22 +6,8 @@ if (isModuleRun.toBoolean()) {
 
 def cfg = rootProject.ext.android
 def appId = rootProject.ext.appId
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file("keystore.properties")
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 android {
-    signingConfigs {
-        config {
-            v1SigningEnabled true
-            v2SigningEnabled true
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
-
 
-    }
     packagingOptions {
         exclude 'META-INF/rxjava.properties'
     }