From 8582fc6e411768236547efae2ebf1392fca8044d Mon Sep 17 00:00:00 2001
From: Sunyata <1064713395@qq.com>
Date: Wed, 3 Apr 2019 21:51:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                   |  2 +-
 app/src/main/AndroidManifest.xml                   | 13 +++----------
 .../sample}/BaseApplication.java                   |  4 ++--
 .../sample}/MainActivity.java                      | 14 +++++++-------
 {networkobserver => netbuslib}/.gitignore          |  0
 {networkobserver => netbuslib}/build.gradle        |  0
 {networkobserver => netbuslib}/proguard-rules.pro  |  0
 .../src/main/AndroidManifest.xml                   |  2 +-
 .../java/com/sunyata/netbus}/MethodManager.java    |  4 ++--
 .../java/com/sunyata/netbus}/NetStateReceiver.java | 12 +++++-------
 .../java/com/sunyata/netbus}/NetworkManager.java   |  5 ++---
 .../com/sunyata/netbus}/annotation/Network.java    |  4 ++--
 .../netbus}/listenter/NetChangeObserver.java       |  4 ++--
 .../java/com/sunyata/netbus}/type/NetType.java     |  2 +-
 .../java/com/sunyata/netbus}/utils/Constrants.java |  2 +-
 .../com/sunyata/netbus}/utils/NetworkUtils.java    |  8 +++-----
 .../src/main/res/values/strings.xml                |  0
 settings.gradle                                    |  2 +-
 18 files changed, 33 insertions(+), 45 deletions(-)
 rename app/src/main/java/com/{sunchen/netobserver => sunyata/sample}/BaseApplication.java (79%)
 rename app/src/main/java/com/{sunchen/netobserver => sunyata/sample}/MainActivity.java (82%)
 rename {networkobserver => netbuslib}/.gitignore (100%)
 rename {networkobserver => netbuslib}/build.gradle (100%)
 rename {networkobserver => netbuslib}/proguard-rules.pro (100%)
 rename {networkobserver => netbuslib}/src/main/AndroidManifest.xml (60%)
 rename {networkobserver/src/main/java/com/sunchen/networkobserver => netbuslib/src/main/java/com/sunyata/netbus}/MethodManager.java (92%)
 rename {networkobserver/src/main/java/com/sunchen/networkobserver => netbuslib/src/main/java/com/sunyata/netbus}/NetStateReceiver.java (93%)
 rename {networkobserver/src/main/java/com/sunchen/networkobserver => netbuslib/src/main/java/com/sunyata/netbus}/NetworkManager.java (92%)
 rename {networkobserver/src/main/java/com/sunchen/networkobserver => netbuslib/src/main/java/com/sunyata/netbus}/annotation/Network.java (80%)
 rename {networkobserver/src/main/java/com/sunchen/networkobserver => netbuslib/src/main/java/com/sunyata/netbus}/listenter/NetChangeObserver.java (70%)
 rename {networkobserver/src/main/java/com/sunchen/networkobserver => netbuslib/src/main/java/com/sunyata/netbus}/type/NetType.java (88%)
 rename {networkobserver/src/main/java/com/sunchen/networkobserver => netbuslib/src/main/java/com/sunyata/netbus}/utils/Constrants.java (92%)
 rename {networkobserver/src/main/java/com/sunchen/networkobserver => netbuslib/src/main/java/com/sunyata/netbus}/utils/NetworkUtils.java (92%)
 rename {networkobserver => netbuslib}/src/main/res/values/strings.xml (100%)

diff --git a/app/build.gradle b/app/build.gradle
index 8cb98d7..972e49f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,5 +25,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation project(':networkobserver')
+    implementation project(':netbuslib')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d577b2f..b7af072 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.sunchen.netobserver">
+    package="com.sunyata.sample">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -9,14 +9,14 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
 
     <application
-        android:name=".BaseApplication"
+        android:name="com.sunyata.sample.BaseApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name="com.sunyata.sample.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -24,13 +24,6 @@
             </intent-filter>
         </activity>
 
-        <!--<receiver android:name="com.sunchen.networkobserver.NetStateReceiver">-->
-
-            <!--<intent-filter>-->
-                <!--<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />-->
-            <!--</intent-filter>-->
-
-        <!--</receiver>-->
     </application>
 
 
diff --git a/app/src/main/java/com/sunchen/netobserver/BaseApplication.java b/app/src/main/java/com/sunyata/sample/BaseApplication.java
similarity index 79%
rename from app/src/main/java/com/sunchen/netobserver/BaseApplication.java
rename to app/src/main/java/com/sunyata/sample/BaseApplication.java
index 741ef50..92bc869 100644
--- a/app/src/main/java/com/sunchen/netobserver/BaseApplication.java
+++ b/app/src/main/java/com/sunyata/sample/BaseApplication.java
@@ -1,8 +1,8 @@
-package com.sunchen.netobserver;
+package com.sunyata.sample;
 
 import android.app.Application;
 
-import com.sunchen.networkobserver.NetworkManager;
+import com.sunyata.netbus.NetworkManager;
 
 /**
  * Created by 「孙晨」 on 2019/4/2   22:19.
diff --git a/app/src/main/java/com/sunchen/netobserver/MainActivity.java b/app/src/main/java/com/sunyata/sample/MainActivity.java
similarity index 82%
rename from app/src/main/java/com/sunchen/netobserver/MainActivity.java
rename to app/src/main/java/com/sunyata/sample/MainActivity.java
index 04fd712..d6c59c3 100644
--- a/app/src/main/java/com/sunchen/netobserver/MainActivity.java
+++ b/app/src/main/java/com/sunyata/sample/MainActivity.java
@@ -1,16 +1,16 @@
-package com.sunchen.netobserver;
+package com.sunyata.sample;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 
-import com.sunchen.networkobserver.NetworkManager;
-import com.sunchen.networkobserver.annotation.Network;
-import com.sunchen.networkobserver.listenter.NetChangeObserver;
-import com.sunchen.networkobserver.type.NetType;
-import com.sunchen.networkobserver.utils.Constrants;
-import com.sunchen.networkobserver.utils.NetworkUtils;
+import com.sunyata.netbus.NetworkManager;
+import com.sunyata.netbus.annotation.Network;
+import com.sunyata.netbus.listenter.NetChangeObserver;
+import com.sunyata.netbus.type.NetType;
+import com.sunyata.netbus.utils.Constrants;
+import com.sunyata.netbus.utils.NetworkUtils;
 
 public class MainActivity extends AppCompatActivity implements NetChangeObserver, View.OnClickListener {
     @Override
diff --git a/networkobserver/.gitignore b/netbuslib/.gitignore
similarity index 100%
rename from networkobserver/.gitignore
rename to netbuslib/.gitignore
diff --git a/networkobserver/build.gradle b/netbuslib/build.gradle
similarity index 100%
rename from networkobserver/build.gradle
rename to netbuslib/build.gradle
diff --git a/networkobserver/proguard-rules.pro b/netbuslib/proguard-rules.pro
similarity index 100%
rename from networkobserver/proguard-rules.pro
rename to netbuslib/proguard-rules.pro
diff --git a/networkobserver/src/main/AndroidManifest.xml b/netbuslib/src/main/AndroidManifest.xml
similarity index 60%
rename from networkobserver/src/main/AndroidManifest.xml
rename to netbuslib/src/main/AndroidManifest.xml
index 990cdaf..a09b1c8 100644
--- a/networkobserver/src/main/AndroidManifest.xml
+++ b/netbuslib/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.sunchen.networkobserver" />
+    package="com.sunyata.netbus" />
diff --git a/networkobserver/src/main/java/com/sunchen/networkobserver/MethodManager.java b/netbuslib/src/main/java/com/sunyata/netbus/MethodManager.java
similarity index 92%
rename from networkobserver/src/main/java/com/sunchen/networkobserver/MethodManager.java
rename to netbuslib/src/main/java/com/sunyata/netbus/MethodManager.java
index 23d247d..e8e07e3 100644
--- a/networkobserver/src/main/java/com/sunchen/networkobserver/MethodManager.java
+++ b/netbuslib/src/main/java/com/sunyata/netbus/MethodManager.java
@@ -1,4 +1,4 @@
-package com.sunchen.networkobserver;
+package com.sunyata.netbus;
 
 /**
  * Created by 「孙晨」 on 2019/4/2   22:28.
@@ -8,7 +8,7 @@
  * MethodManager
  */
 
-import com.sunchen.networkobserver.type.NetType;
+import com.sunyata.netbus.type.NetType;
 
 import java.lang.reflect.Method;
 
diff --git a/networkobserver/src/main/java/com/sunchen/networkobserver/NetStateReceiver.java b/netbuslib/src/main/java/com/sunyata/netbus/NetStateReceiver.java
similarity index 93%
rename from networkobserver/src/main/java/com/sunchen/networkobserver/NetStateReceiver.java
rename to netbuslib/src/main/java/com/sunyata/netbus/NetStateReceiver.java
index 764eb7e..684959a 100644
--- a/networkobserver/src/main/java/com/sunchen/networkobserver/NetStateReceiver.java
+++ b/netbuslib/src/main/java/com/sunyata/netbus/NetStateReceiver.java
@@ -1,17 +1,15 @@
-package com.sunchen.networkobserver;
+package com.sunyata.netbus;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-import com.sunchen.networkobserver.annotation.Network;
-import com.sunchen.networkobserver.listenter.NetChangeObserver;
-import com.sunchen.networkobserver.type.NetType;
-import com.sunchen.networkobserver.utils.Constrants;
-import com.sunchen.networkobserver.utils.NetworkUtils;
+import com.sunyata.netbus.annotation.Network;
+import com.sunyata.netbus.type.NetType;
+import com.sunyata.netbus.utils.Constrants;
+import com.sunyata.netbus.utils.NetworkUtils;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
diff --git a/networkobserver/src/main/java/com/sunchen/networkobserver/NetworkManager.java b/netbuslib/src/main/java/com/sunyata/netbus/NetworkManager.java
similarity index 92%
rename from networkobserver/src/main/java/com/sunchen/networkobserver/NetworkManager.java
rename to netbuslib/src/main/java/com/sunyata/netbus/NetworkManager.java
index 9ea43fe..674c8bb 100644
--- a/networkobserver/src/main/java/com/sunchen/networkobserver/NetworkManager.java
+++ b/netbuslib/src/main/java/com/sunyata/netbus/NetworkManager.java
@@ -1,10 +1,9 @@
-package com.sunchen.networkobserver;
+package com.sunyata.netbus;
 
 import android.app.Application;
 import android.content.IntentFilter;
 
-import com.sunchen.networkobserver.listenter.NetChangeObserver;
-import com.sunchen.networkobserver.utils.Constrants;
+import com.sunyata.netbus.utils.Constrants;
 
 /**
  * Created by 「孙晨」 on 2019/3/31 0031   19:07.
diff --git a/networkobserver/src/main/java/com/sunchen/networkobserver/annotation/Network.java b/netbuslib/src/main/java/com/sunyata/netbus/annotation/Network.java
similarity index 80%
rename from networkobserver/src/main/java/com/sunchen/networkobserver/annotation/Network.java
rename to netbuslib/src/main/java/com/sunyata/netbus/annotation/Network.java
index 4d888ac..40f2c6a 100644
--- a/networkobserver/src/main/java/com/sunchen/networkobserver/annotation/Network.java
+++ b/netbuslib/src/main/java/com/sunyata/netbus/annotation/Network.java
@@ -1,6 +1,6 @@
-package com.sunchen.networkobserver.annotation;
+package com.sunyata.netbus.annotation;
 
-import com.sunchen.networkobserver.type.NetType;
+import com.sunyata.netbus.type.NetType;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/networkobserver/src/main/java/com/sunchen/networkobserver/listenter/NetChangeObserver.java b/netbuslib/src/main/java/com/sunyata/netbus/listenter/NetChangeObserver.java
similarity index 70%
rename from networkobserver/src/main/java/com/sunchen/networkobserver/listenter/NetChangeObserver.java
rename to netbuslib/src/main/java/com/sunyata/netbus/listenter/NetChangeObserver.java
index 403ba7b..7c899b4 100644
--- a/networkobserver/src/main/java/com/sunchen/networkobserver/listenter/NetChangeObserver.java
+++ b/netbuslib/src/main/java/com/sunyata/netbus/listenter/NetChangeObserver.java
@@ -1,6 +1,6 @@
-package com.sunchen.networkobserver.listenter;
+package com.sunyata.netbus.listenter;
 
-import com.sunchen.networkobserver.type.NetType;
+import com.sunyata.netbus.type.NetType;
 
 /**
  * Created by 「孙晨」 on 2019/3/31 0031   18:48.
diff --git a/networkobserver/src/main/java/com/sunchen/networkobserver/type/NetType.java b/netbuslib/src/main/java/com/sunyata/netbus/type/NetType.java
similarity index 88%
rename from networkobserver/src/main/java/com/sunchen/networkobserver/type/NetType.java
rename to netbuslib/src/main/java/com/sunyata/netbus/type/NetType.java
index 265af89..876da33 100644
--- a/networkobserver/src/main/java/com/sunchen/networkobserver/type/NetType.java
+++ b/netbuslib/src/main/java/com/sunyata/netbus/type/NetType.java
@@ -1,4 +1,4 @@
-package com.sunchen.networkobserver.type;
+package com.sunyata.netbus.type;
 
 /**
  * Created by 「孙晨」 on 2019/3/31 0031   18:53.
diff --git a/networkobserver/src/main/java/com/sunchen/networkobserver/utils/Constrants.java b/netbuslib/src/main/java/com/sunyata/netbus/utils/Constrants.java
similarity index 92%
rename from networkobserver/src/main/java/com/sunchen/networkobserver/utils/Constrants.java
rename to netbuslib/src/main/java/com/sunyata/netbus/utils/Constrants.java
index 7163971..d3caafe 100644
--- a/networkobserver/src/main/java/com/sunchen/networkobserver/utils/Constrants.java
+++ b/netbuslib/src/main/java/com/sunyata/netbus/utils/Constrants.java
@@ -1,4 +1,4 @@
-package com.sunchen.networkobserver.utils;
+package com.sunyata.netbus.utils;
 
 /**
  * Created by 「孙晨」 on 2019/3/31 0031   19:01.
diff --git a/networkobserver/src/main/java/com/sunchen/networkobserver/utils/NetworkUtils.java b/netbuslib/src/main/java/com/sunyata/netbus/utils/NetworkUtils.java
similarity index 92%
rename from networkobserver/src/main/java/com/sunchen/networkobserver/utils/NetworkUtils.java
rename to netbuslib/src/main/java/com/sunyata/netbus/utils/NetworkUtils.java
index b5a1503..60e9770 100644
--- a/networkobserver/src/main/java/com/sunchen/networkobserver/utils/NetworkUtils.java
+++ b/netbuslib/src/main/java/com/sunyata/netbus/utils/NetworkUtils.java
@@ -1,16 +1,14 @@
-package com.sunchen.networkobserver.utils;
+package com.sunyata.netbus.utils;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.provider.Settings;
 
-import com.sunchen.networkobserver.NetworkManager;
-import com.sunchen.networkobserver.type.NetType;
+import com.sunyata.netbus.NetworkManager;
+import com.sunyata.netbus.type.NetType;
 
 /**
  * Created by 「孙晨」 on 2019/3/31 0031   19:04.
diff --git a/networkobserver/src/main/res/values/strings.xml b/netbuslib/src/main/res/values/strings.xml
similarity index 100%
rename from networkobserver/src/main/res/values/strings.xml
rename to netbuslib/src/main/res/values/strings.xml
diff --git a/settings.gradle b/settings.gradle
index 524ce3b..a391b50 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':networkobserver'
+include ':app', ':netbuslib'