Add web-client dir to android asset source sets

zhihu · Feb 8, 2018 · 43988dc · 43988dc
1 parent b9026c3
commit 43988dc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/android-godeye-monitor/build.gradle b/android-godeye-monitor/build.gradle
@@ -20,6 +20,9 @@ android {
         }
     }
 
+    sourceSets {
+        main.assets.srcDirs += '../web-client'
+    }
 }
 
 dependencies {

diff --git a/android-godeye-monitor/src/main/java/cn/hikyson/godeye/monitor/modules/AssetsModule.java b/android-godeye-monitor/src/main/java/cn/hikyson/godeye/monitor/modules/AssetsModule.java
@@ -23,7 +23,7 @@ public AssetsModule(Context context, String preffix) {
 
     @Override
     public byte[] process(String path, Uri uri) throws Throwable {
-        String fileName = mPreffix + "/" + uri.getPath();
+        String fileName = mPreffix == null ? uri.getPath() : mPreffix + "/" + uri.getPath();
         return loadContent(fileName, mAssets);
     }
 

diff --git a/android-godeye-monitor/src/main/java/cn/hikyson/godeye/monitor/server/Router.java b/android-godeye-monitor/src/main/java/cn/hikyson/godeye/monitor/server/Router.java
@@ -44,7 +44,7 @@ public static Router get() {
 
     public void init(Context context) {
         mRouteModules = new ArrayMap<>();
-        AssetsModule assetsModule = new AssetsModule(context, "androidgodeye");
+        AssetsModule assetsModule = new AssetsModule(context, null);
         mRouteModules.put("assets", assetsModule);
         AppInfoModule appInfoModule = new AppInfoModule();
         mRouteModules.put("appinfo", appInfoModule);
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,9 @@ android { @@
             }
         }
+        sourceSets {
+            main.assets.srcDirs += '../web-client'
+        }
     }
     dependencies {
@@ Expand Down @@