Ver Fonte

更改包名,优化代码

yanyi há 5 anos atrás
pai
commit
63fee8de6c

+ 6 - 3
app/build.gradle

@@ -9,15 +9,18 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+
+        multiDexEnabled true
     }
     buildTypes {
         debug {
-            buildConfigField "boolean", "LOG_DEBUG", "true"
+//            buildConfigField "boolean", "LOG_DEBUG", "true"
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
-            buildConfigField "boolean", "LOG_DEBUG", "false"
+//            buildConfigField "boolean", "LOG_DEBUG", "false"
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
@@ -31,7 +34,7 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation project(':okhttplib')
-    implementation 'com.yanyi.benyanyi:loglib:1.0.0'
+    implementation 'com.yanyi.benyanyi:loglib:1.0.1'
     implementation 'com.yanyi.benyanyi:permissionlib:1.0.2'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.4'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'

+ 3 - 3
app/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
-        android:name="com.benyanyi.okhttp.AppContext"
+        android:name=".AppContext"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -17,13 +17,13 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.benyanyi.okhttp.MainActivity">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
-        <activity android:name="com.benyanyi.okhttp.DownloadActivity">
+        <activity android:name=".DownloadActivity">
 
         </activity>
         <!-- 定义FileProvider -->

+ 1 - 1
app/src/main/java/com/benyanyi/okhttp/AppContext.java → app/src/main/java/com/mylove/okhttp/AppContext.java

@@ -1,4 +1,4 @@
-package com.benyanyi.okhttp;
+package com.mylove.okhttp;
 
 import android.app.Application;
 import android.content.Context;

+ 3 - 2
app/src/main/java/com/benyanyi/okhttp/DownloadActivity.java → app/src/main/java/com/mylove/okhttp/DownloadActivity.java

@@ -1,4 +1,4 @@
-package com.benyanyi.okhttp;
+package com.mylove.okhttp;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -12,7 +12,6 @@ import com.benyanyi.okhttp.download.BaseDownLoadObserver;
 import com.benyanyi.okhttp.download.DownloadInfo;
 import com.benyanyi.okhttp.download.DownloadManager;
 import com.mylove.loglib.JLog;
-import com.mylove.okhttp.R;
 
 /**
  * @author BenYanYi
@@ -120,6 +119,8 @@ public class DownloadActivity extends AppCompatActivity implements View.OnClickL
             case R.id.main_btn_cancel3:
                 DownloadManager.getInstance(mContext).cancel(url3);
                 break;
+            default:
+                break;
         }
     }
 

+ 6 - 3
app/src/main/java/com/benyanyi/okhttp/MainActivity.java → app/src/main/java/com/mylove/okhttp/MainActivity.java

@@ -1,4 +1,4 @@
-package com.benyanyi.okhttp;
+package com.mylove.okhttp;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -6,9 +6,10 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 
-import com.mylove.loglib.JLog;
-import com.mylove.okhttp.R;
+import com.benyanyi.okhttp.OkHttpInfo;
+import com.benyanyi.okhttp.OkHttpUtil;
 import com.benyanyi.okhttp.listener.OnOkHttpListener;
+import com.mylove.loglib.JLog;
 import com.yanyi.permissionlib.PermissionHelper;
 import com.yanyi.permissionlib.PermissionType;
 
@@ -16,6 +17,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 
+
 /**
  * @author myLove
  * @time 2017/11/16 19:18
@@ -29,6 +31,7 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+//        setContentView(R.layout.notification_contentview);
         setContentView(R.layout.activity_main);
         String[] strings = new String[]{PermissionType.STORAGE};
         permissionHelper = new PermissionHelper(this, strings);

+ 1 - 1
app/src/main/res/layout/act_download.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="@dimen/padding10">
+    android:padding="10dp">
 
     <LinearLayout
         android:layout_width="match_parent"

+ 7 - 0
app/src/main/res/layout/act_main.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+</LinearLayout>

+ 1 - 1
okhttplib/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mylove.okhttp" >
+    package="com.benyanyi.okhttp" >
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>

+ 1 - 1
okhttplib/src/main/java/com/benyanyi/okhttp/download/NotificationUtil.java

@@ -11,7 +11,7 @@ import android.graphics.Color;
 import android.os.Build;
 import android.widget.RemoteViews;
 
-import com.mylove.okhttp.R;
+import com.benyanyi.okhttp.R;
 
 import java.util.HashMap;
 import java.util.Map;