refactor codes

Author: XndroidDev

.gitignore

@@ -0,0 +1,13 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+/.idea
+/.gradle
+/gradle
+*.iml

README.md

@@ -4,7 +4,7 @@ XX-Net的Android深度适配版本.
 ## 特性
  * 集成XX-Net 3.6.7(版本号会自动更新)
  * 集成LightningBrowser 4.5.1, 默认使用 localhost:8087 代理, 关闭证书警告, 无需任何配置即可直接使用
- * 将XX-Net目录放到应用数据目录(/data/data/net.xx.xndroid), 避免误删, 卸载自动删除
+ * 将XX-Net目录放到应用数据目录(/data/data/net.xndroid), 避免误删, 卸载自动删除
  * 使用前台服务, 避免意外退出(部分机型可能仍然强制结束进程,需要根据各机型的特点设置.如MIUI在最近应用列表中锁定)
  * 监听电量, 网络, 休眠状态, 自动调整最大扫描线程数
  * 将语言地区信息添加到环境变量, 避免XX-Net启动时显示为英文

android_start.py

@@ -181,7 +181,7 @@ def load_xxnet():
     launcher_main()
 
 def setup_logging():
-    logging.basicConfig(stream=sys.stdout, level=logging.DEBUG, format='%(asctime)s %(levelname)s %(message)s')
+    logging.basicConfig(stream=sys.stdout, level=logging.DEBUG if os.getenv('DEBUG') else logging.INFO, format='%(asctime)s %(levelname)s %(message)s')
     handler = logging.handlers.RotatingFileHandler(
         current_path + "/xxnet_start.log", maxBytes=1024 * 256, backupCount=0)
     handler.setFormatter(logging.Formatter('%(asctime)s [android_start]%(levelname)s %(message)s'))

app/build.gradle

@@ -4,7 +4,7 @@ android {
     compileSdkVersion 26
     buildToolsVersion '26.0.2'
     defaultConfig {
-        applicationId "net.xx.xndroid"
+        applicationId "net.xndroid"
         minSdkVersion 14
         targetSdkVersion 26
         versionCode 9
@@ -24,10 +24,10 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+    compile project(':lightning')
+//    compile project(':fqrouter')
     compile 'com.android.support:appcompat-v7:26.+'
     compile 'com.android.support:design:26.+'
     compile 'com.android.support:support-v4:26.+'
     androidTestCompile 'junit:junit:4.12'
-    compile project(':lightning')
-    compile project(':fqrouter')
 }

app/src/androidTest/java/net/xx/xndroid/ExampleInstrumentedTest.java

@@ -0,0 +1,3 @@
+/test
+/androidTest
+/obj

app/src/main/.gitignore

@@ -1,24 +1,30 @@
 <?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="net.xx.xndroid">
+    package="net.xndroid">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.WRITE_OWNER_DATA"/>
+    <uses-permission android:name="android.permission.READ_OWNER_DATA"/>
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="Xndroid"
         android:supportsRtl="true"
-        tools:replace="android:label"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:replace="android:label">
         <activity
             android:name=".MainActivity"
+            android:configChanges="orientation|keyboard|keyboardHidden"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:configChanges="orientation|keyboard|keyboardHidden"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -28,9 +34,23 @@
         </activity>
 
         <service
-            android:name=".XXnetService"
+            android:name=".xxnet.XXnetService"
+            android:enabled="true"
+            android:exported="true" />
+        <service
+            android:name=".fqrouter.SocksVpnService"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_VPN_SERVICE"
+            android:process="net.xndroid.fqrouter.sockvpnservice"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.net.VpnService"/>
+            </intent-filter>
+        </service>
+        <service
+            android:name=".LaunchService"
             android:enabled="true"
-            android:exported="true"></service>
+            android:exported="true" />
     </application>
 
 </manifest>

app/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-package net.xx.xndroid;
+package net.xndroid;
 
 import android.app.Fragment;
 import android.os.Bundle;
@@ -8,7 +8,7 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import net.xx.xndroid.xxnet.XXnetAttribute;
+import net.xndroid.xxnet.XXnetManager;
 
 public class AboutFragment extends Fragment {
 
@@ -20,25 +20,25 @@ public class AboutFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
-        mXXnetVersion.setText("XX-net " + XXnetAttribute.sXXversion);
+        mXXnetVersion.setText("XX-net " + XXnetManager.sXXversion);
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
         if(mRootView !=null )
             return mRootView;
-        mRootView = inflater.inflate(R.layout.fragment_about, container, false);
-        mVersionView = mRootView.findViewById(R.id.xndroid_version);
+        mRootView = inflater.inflate(net.xndroid.R.layout.fragment_about, container, false);
+        mVersionView = mRootView.findViewById(net.xndroid.R.id.xndroid_version);
         mVersionView.setText("Xndroid " + AppModel.sVersionName);
-        mXXnetVersion = mRootView.findViewById(R.id.xndroid_xxnet_version);
-        mUpdateView = mRootView.findViewById(R.id.xndroid_check_update);
+        mXXnetVersion = mRootView.findViewById(net.xndroid.R.id.xndroid_xxnet_version);
+        mUpdateView = mRootView.findViewById(net.xndroid.R.id.xndroid_check_update);
         mUpdateView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 new Thread(new Runnable() {
                     @Override
                     public void run() {
-                        AppModel.showToast(getString(R.string.getting_version));
+                        AppModel.showToast(getString(net.xndroid.R.string.getting_version));
                         UpdateManager.checkUpdate(true);
                     }
                 }).start();