删除无效资源文件

wustor · Jan 23, 2018 · c9944c5 · c9944c5
1 parent 9657418
commit c9944c5
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 287 deletions.
diff --git a/basemodule/src/main/AndroidManifest.xml b/basemodule/src/main/AndroidManifest.xml
@@ -2,11 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.wustor.basemodule">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
 
     </application>
 

diff --git a/basemodule/src/main/res/values/styles.xml b/basemodule/src/main/res/values/styles.xml
@@ -139,6 +139,8 @@
 
     </style>
 
+    <style name="activityTheme" parent="AppTheme"/>
+
     <style name="Theme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/blue</item>
         <item name="colorPrimaryDark">@color/blue</item>

diff --git a/cartmodule/build.gradle b/cartmodule/build.gradle
@@ -68,20 +68,7 @@ android {
     }
 }
 
-//编译期组件隔离，运行期组件按需依赖
-//cartModule需要跟orderModule,goodsModule进行交互，所以在运行期添加了依赖
-def tasks = project.gradle.startParameter.taskNames
-for (String task : tasks) {
-    def upperName = task.toUpperCase()
-    if (isModuleRun.toBoolean()) {
-        if (upperName.contains("ASSEMBLE") || upperName.contains("INSTALL")) {
-            dependencies.add("compile", project.project(':' + 'usermodule'))
-            dependencies.add("compile", project.project(':' + 'goodsmodule'))
-        }
-    }
 
-
-}
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile project(':routermodule')

diff --git a/cartmodule/src/main/AndroidManifest.xml b/cartmodule/src/main/AndroidManifest.xml
@@ -2,14 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.wustor.cartmodule">
 
-    <!-- To access Google+ APIs: -->
-    <uses-permission android:name="android.permission.INTERNET" />
-
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true">
-        <activity android:name=".CartActivity"></activity>
+        <activity android:name=".CartActivity">
+
+        </activity>
     </application>
 
 </manifest>
diff --git a/cartmodule/src/main/debug/AndroidManifest.xml b/cartmodule/src/main/debug/AndroidManifest.xml
@@ -1,28 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.wustor.cartmoudle">
+    package="com.wustor.cartmodule">
+
 
     <application
-        android:name=""
         android:allowBackup="true"
-        android:label="@string/cart_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        tools:replace="android:label">
+        android:name=".debug.CartApplication"
+        android:label="@string/app_name"
+        android:supportsRtl="true">
         <activity android:name=".CartActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
         </activity>
     </application>
-</manifest>
-
-
-
-
-
-
 
+</manifest>
diff --git a/goodsmodule/build.gradle b/goodsmodule/build.gradle
@@ -72,20 +72,8 @@ android {
     }
 }
 
-//编译期组件隔离，运行期组件按需依赖
-//goodsModule需要跟cartModule进行交互，所以在运行期添加了依赖
-def tasks = project.gradle.startParameter.taskNames
-for (String task : tasks) {
-    def upperName = task.toUpperCase()
-    if (isModuleRun.toBoolean()) {
-        if (upperName.contains("ASSEMBLE") || upperName.contains("INSTALL")) {
-            dependencies.add("compile", project.project(':' + 'cartmodule'))
-        }
-    }
 
 
-}
-
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile project(':routermodule')

diff --git a/goodsmodule/src/main/AndroidManifest.xml b/goodsmodule/src/main/AndroidManifest.xml
@@ -6,7 +6,8 @@
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true">
-        <activity android:name=".GoodsDetailActivity"></activity>
+        <activity android:name=".GoodsDetailActivity">
+        </activity>
     </application>
 
 </manifest>
diff --git a/goodsmodule/src/main/debug/AndroidManifest.xml b/goodsmodule/src/main/debug/AndroidManifest.xml
@@ -1,97 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.wustor.goodsmoudle">
-
+    package="com.wustor.goodsmodule">
 
     <application
         android:name=".debug.GoodsApplication"
         android:allowBackup="true"
-        android:label="@string/goods_name"
-        android:supportsRtl="true"
-        tools:replace="android:label"
-        android:theme="@style/AppTheme">
-        <activity android:name=".GoodsActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name="com.wustor.goodsmoudle.goods.detail.GoodsDetailActivity"
-            android:launchMode="standard"
-            android:windowSoftInputMode="adjustPan" />
-        <activity android:name="com.wustor.goodsmoudle.goods.detail.GoodsDetailPActivity" />
-
-        <activity
-            android:name="com.wustor.goodsmoudle.goods.filter.GoodsFilterActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.wustor.goodsmoudle.goods.filter.GoodsFilterPActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.wustor.goodsmoudle.goods.filter.SearchActivity"
-            android:label="搜索"
-            android:windowSoftInputMode="stateAlwaysVisible" />
-
-        <activity
-            android:name="com.wustor.goodsmoudle.goods.list.GoodsListActivity"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustPan" />
-        <activity
-            android:name="com.wustor.goodsmoudle.goods.list.ListPActivity"
-            android:theme="@style/activityTheme"
-            android:windowSoftInputMode="adjustPan" />
-
-        <activity
-            android:name="com.wustor.goodsmoudle.goods.list.PrivilegeActivity"
-            android:label="特价优惠" />
-
-        <activity
-            android:name="com.wustor.goodsmoudle.home.scan.ScanActivity"
-            android:label="二维码"
-            android:screenOrientation="portrait"
-            android:theme="@style/activityTheme" />
-
-        <activity
-            android:name="com.wustor.goodsmoudle.home.scan.ScanEnterBarcordActivity"
-            android:label="二维码条形码"
-            android:theme="@style/activityTheme" />
-        <activity
-            android:name="com.wustor.goodsmoudle.home.scan.ScanRecordActivity"
-            android:label="二维码扫描记录"
-            android:theme="@style/activityTheme" />
-        <activity android:name="com.wustor.goodsmoudle.home.CertificateActivity" />
-        <activity android:name="com.wustor.goodsmoudle.home.CertificateListActivity" />
-        <activity android:name="com.wustor.goodsmoudle.home.NotifyDetailActivity" />
-
-        <activity
-            android:name="com.wustor.goodsmoudle.home.NotifyListActivity"
-            android:label="消息" />
-        <activity
-            android:name="com.wustor.goodsmoudle.home.SelectCityActivity"
-            android:label="选择地址"
-            android:theme="@style/activityTheme"
-            android:windowSoftInputMode="adjustPan" />
-
-        <activity android:name="com.wustor.goodsmoudle.com.cmyy.chuangmei.SplashActivity">
+        android:label="@string/app_name"
+        android:supportsRtl="true">
+        <activity android:name=".GoodsDetailActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.wustor.goodsmoudle.DemoActivity"
-            android:label="测试"></activity>
-        <activity android:name="com.wustor.goodsmoudle.MessageSettingActivity" />
     </application>
 
-
 </manifest>
diff --git a/gradle.properties b/gradle.properties
@@ -17,4 +17,4 @@ android.enableAapt2=false
 # http://www.gradle.org/docs/current/uueserguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 isDebug=false
-isModuleRun=false
+isModuleRun=true
diff --git a/ordermodule/build.gradle b/ordermodule/build.gradle
@@ -68,7 +68,6 @@ android {
             }
         }
     }
-    buildToolsVersion '26.0.2'
 }
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')

diff --git a/ordermodule/src/main/AndroidManifest.xml b/ordermodule/src/main/AndroidManifest.xml
@@ -4,9 +4,10 @@
 
     <application
         android:allowBackup="true"
-        android:label="@string/app_name"
         android:supportsRtl="true">
-        <activity android:name=".OrderActivity"></activity>
+        <activity android:name=".OrderActivity">
+
+        </activity>
     </application>
 
 </manifest>
diff --git a/ordermodule/src/main/debug/AndroidManifest.xml b/ordermodule/src/main/debug/AndroidManifest.xml
@@ -1,63 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.wustor.ordermoudle">
-
+    package="com.wustor.ordermodule">
 
     <application
         android:name=".debug.OrderApplication"
         android:allowBackup="true"
-        android:label="@string/order_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        tools:replace="android:label">
-        <activity android:name=".order.OrderActivity">
+        android:supportsRtl="true">
+        <activity android:name=".OrderActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.wustor.ordermoudle.order.OrderListActivity"
-            android:label="我的订单"
-            android:theme="@style/activityTheme" />
-        <activity
-            android:name="com.wustor.ordermoudle.order.OrderDetailActivity"
-            android:label="查看订单"
-            android:theme="@style/activityTheme" />
-        <activity
-            android:name="com.wustor.ordermoudle.OrderConfirmActivity"
-            android:label="提交订单"
-            android:theme="@style/activityTheme" />
-        <activity
-            android:name="com.wustor.ordermoudle.OrderSuccessActivity"
-            android:label="成功下单"
-            android:theme="@style/activityTheme" />
-        <activity
-            android:name="com.wustor.ordermoudle.OrderPayActivity"
-            android:label="订单生成"
-            android:theme="@style/activityTheme" />
-        <activity
-            android:name="com.wustor.ordermoudle.OrderInsufficientActivity"
-            android:label="订单欠款"
-            android:theme="@style/activityTheme" />
-        <activity
-            android:name="com.wustor.ordermoudle.OrderErrorActivity"
-            android:label="订单失败"
-            android:theme="@style/activityTheme" />
-        <activity
-            android:name="com.wustor.ordermoudle.order.ReturnActivity"
-            android:label="查看退货订单"
-            android:theme="@style/activityTheme" />
-        <activity
-            android:name="com.wustor.ordermoudle.order.PackageDetailActivity"
-            android:label="包裹详情"
-            android:theme="@style/activityTheme" />
-        <activity
-            android:name="com.wustor.ordermoudle.order.LogisticsActivity"
-            android:label="查看物流"
-            android:theme="@style/activityTheme" />
     </application>
 
 </manifest>
diff --git a/routermodule/build.gradle b/routermodule/build.gradle
@@ -10,7 +10,7 @@ android {
         targetSdkVersion cfg.targetSdkVersion
         versionCode cfg.versionCode//更新次数
         versionName cfg.versionName//版本号
-        resourcePrefix "modulerouter_"
+        //resourcePrefix "modulerouter_"
 
     }
 

diff --git a/usermodule/src/main/AndroidManifest.xml b/usermodule/src/main/AndroidManifest.xml
@@ -6,7 +6,9 @@
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true">
-        <activity android:name=".UserActivity"></activity>
+        <activity android:name=".UserActivity">
+
+        </activity>
     </application>
 
 </manifest>