From 6603a7ed75af83b75047f63d08f6694eb70048a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=99=A8=E6=88=90?= <HugoXie@xiechencheng.local>
Date: Tue, 2 May 2017 15:29:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5Watcher?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/app.iml                                   | 23 +++++++------------
 app/build.gradle                              |  1 +
 app/src/main/AndroidManifest.xml              | 13 ++++++-----
 .../seeWeather/base/BaseApplication.java      |  5 +++-
 build.gradle                                  |  1 +
 clean                                         |  1 +
 gradlew                                       |  0
 7 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100755 clean
 mode change 100644 => 100755 gradlew

diff --git a/app/app.iml b/app/app.iml
index e09d7a2..7cb3a60 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -62,13 +62,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -76,21 +69,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -105,6 +97,7 @@
     <orderEntry type="library" exported="" name="design-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="watcher-0.5" level="project" />
     <orderEntry type="library" exported="" name="rxlifecycle-components-0.7.0" level="project" />
     <orderEntry type="library" exported="" name="systembartint-1.0.3" level="project" />
     <orderEntry type="library" exported="" name="rxlifecycle-android-0.7.0" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index e256e0f..ca3dbea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,5 +83,6 @@ dependencies {
     releaseCompile 'com.github.moduth:blockcanary-no-op:1.2.1'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
+    compile 'com.github.xcc3641:watcher:0.5'
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 71c47c5..a53821e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_LOGS"/>
+    <!--悬浮窗-->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application
         android:name="com.xiecc.seeWeather.base.BaseApplication"
@@ -57,16 +59,15 @@
             android:theme="@style/AppTheme"/>
         <activity
             android:name=".modules.setting.ui.SettingActivity"
-            android:screenOrientation="portrait"
-            />
+            android:screenOrientation="portrait"/>
         <activity
             android:name=".modules.city.ui.ChoiceCityActivity"
-            android:screenOrientation="portrait"
-            />
+            android:screenOrientation="portrait"/>
         <activity
             android:name=".modules.about.ui.AboutActivity"
-            android:screenOrientation="portrait"
-            />
+            android:screenOrientation="portrait"/>
+
+        <service android:name="com.hugo.watcher.WatcherService"/>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/xiecc/seeWeather/base/BaseApplication.java b/app/src/main/java/com/xiecc/seeWeather/base/BaseApplication.java
index fe2220f..e1fb5e2 100644
--- a/app/src/main/java/com/xiecc/seeWeather/base/BaseApplication.java
+++ b/app/src/main/java/com/xiecc/seeWeather/base/BaseApplication.java
@@ -4,6 +4,7 @@ import android.app.Application;
 import android.content.Context;
 import android.support.v7.app.AppCompatDelegate;
 import com.github.moduth.blockcanary.BlockCanary;
+import com.hugo.watcher.Watcher;
 import com.squareup.leakcanary.LeakCanary;
 import com.xiecc.seeWeather.BuildConfig;
 import com.xiecc.seeWeather.common.CrashHandler;
@@ -27,10 +28,12 @@ public class BaseApplication extends Application {
         CrashHandler.init(new CrashHandler(getApplicationContext()));
         if (!BuildConfig.DEBUG) {
             FIR.init(this);
+        }else {
+            Watcher.getInstance().start(this);
         }
         BlockCanary.install(this, new AppBlockCanaryContext()).start();
         LeakCanary.install(this);
-        /**
+        /*
          * 如果存在SD卡则将缓存写入SD卡,否则写入手机内存
          */
         if (getApplicationContext().getExternalCacheDir() != null && ExistSDCard()) {
diff --git a/build.gradle b/build.gradle
index 58bd189..72f4e6b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven { url 'https://jitpack.io' }
     }
 }
 
diff --git a/clean b/clean
new file mode 100755
index 0000000..df89ee3
--- /dev/null
+++ b/clean
@@ -0,0 +1 @@
+./gradlew clean
\ No newline at end of file
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755