1 优化一下

XiaMuYao · Mar 20, 2018 · 32e286b · 32e286b
1 parent 293f5fe
commit 32e286b
Show file tree

Hide file tree

Showing 19 changed files with 242 additions and 94 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/src/main/java/com/xiamuyao/rapidmvc/MainActivity.java b/app/src/main/java/com/xiamuyao/rapidmvc/MainActivity.java
@@ -1,29 +1,19 @@
 package com.xiamuyao.rapidmvc;
 
-import android.renderscript.Short2;
-import android.support.constraint.ConstraintLayout;
-import android.support.v7.app.AppCompatActivity;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
 
-import com.lzy.okgo.model.Progress;
-import com.lzy.okgo.model.Response;
-import com.lzy.okgo.request.base.Request;
-import com.xiamuyao.repidmvclibrary.Net.NetHelp;
-import com.xiamuyao.repidmvclibrary.Net.NetInterface;
+import com.xiamuyao.repidmvclibrary.Util.LL;
+import com.xiamuyao.repidmvclibrary.Util.SpUtils;
 import com.xiamuyao.repidmvclibrary.base.BaseActivity;
-import com.xiamuyao.repidmvclibrary.base.NetBaseActivity;
 
 public class MainActivity extends BaseActivity {
 
-    private Button yincang, xianshi;
 
+    private Button mButton;
 
     @Override
     public int getLayout() {
@@ -37,27 +27,23 @@ public void initObject(Bundle savedInstanceState) {
 
     @Override
     public void initView() {
-        yincang = findViewById(R.id.yincang);
-        xianshi = findViewById(R.id.xianshi);
+        mButton = findViewById(R.id.mButton);
     }
 
     @Override
     public void initData() {
-
+        LL.d(this.toString(), "我打印的是什么");
     }
 
     @Override
     public void initListener() {
-        yincang.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dismissLoadDialog();
-            }
-        });
-        xianshi.setOnClickListener(new View.OnClickListener() {
+        mButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                loadDialog.show();
+                SpUtils.put(mContext, "int数据", "shuju");
+                Object mO = SpUtils.get(mContext, "int数据", "默认");
+                LL.e("nishish", String.valueOf(mO));
+                Log.e("nishish", "onClick: "+String.valueOf(mO));
             }
         });
     }

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -2,9 +2,9 @@
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/titlemessage"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/titlemessage"
     android:clipToPadding="true"
     android:fitsSystemWindows="true"
     tools:context="com.xiamuyao.rapidmvc.MainActivity">
@@ -14,23 +14,15 @@
         layout="@layout/layout_title" />
 
     <Button
-        android:id="@+id/xianshi"
+        android:id="@+id/mButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
+        android:text="123"
         app:layout_constraintStart_toStartOf="parent"
-        tools:layout_editor_absoluteY="118dp"
-        android:layout_marginLeft="8dp"
-        tools:ignore="MissingConstraints" />
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteY="118dp" />
 
-    <Button
-        android:id="@+id/yincang"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="68dp"
-        app:layout_constraintStart_toEndOf="@+id/xianshi"
-        app:layout_constraintTop_toBottomOf="@+id/include"
-        android:layout_marginLeft="24dp" />
 
 </android.support.constraint.ConstraintLayout>
diff --git a/repidmvclibrary/build.gradle b/repidmvclibrary/build.gradle
@@ -2,26 +2,19 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 26
-
-
-
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
-
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
-
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
 }
 
 dependencies {
@@ -30,15 +23,16 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    //Md风格控件
     implementation 'com.android.support:design:26.1.0'
     //recyclerview
     compile 'com.android.support:recyclerview-v7:26.1.0'
     //沉浸式状态栏管理
-    compile 'com.gyf.barlibrary:barlibrary:2.2.8'
+    compile 'com.gyf.barlibrary:barlibrary:2.3.0'
     //Eventbus
     compile 'org.greenrobot:eventbus:3.0.0'
     //网络请求
-    compile 'com.lzy.net:okgo:3.0.2'
+    compile 'com.lzy.net:okgo:3.0.4'
     //约束布局
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
diff --git a/repidmvclibrary/src/main/java/com/xiamuyao/repidmvclibrary/AppConfig.java b/repidmvclibrary/src/main/java/com/xiamuyao/repidmvclibrary/AppConfig.java
@@ -1,5 +1,7 @@
 package com.xiamuyao.repidmvclibrary;
 
+import java.lang.annotation.ElementType;
+
 /**
  * XiaMuYao
  * [email protected]
@@ -13,9 +15,8 @@ public enum RunType {
         QA, ONLINE
     }
 
-    public static final boolean DEBUG = true;   //log的开关
     public static final RunType URL_TYPE = RunType.QA;  //打正式包时须改成 ONLINE
-
+    public static final boolean DEBUG = true;   //log的开关
     public static String URL_Base = UrlConstants.getApi(); //接口域名
 
 }
@@ -33,6 +34,7 @@ class UrlConstants {
     public static String getApi() {
         if (AppConfig.URL_TYPE == AppConfig.RunType.QA)
             return Api_Qq;
-        return Api_Online;
+        else
+            return Api_Online;
     }
 }
diff --git a/repidmvclibrary/src/main/java/com/xiamuyao/repidmvclibrary/Net/NetHelp.java b/repidmvclibrary/src/main/java/com/xiamuyao/repidmvclibrary/Net/NetHelp.java
@@ -12,7 +12,7 @@
 import com.lzy.okgo.request.base.Request;
 import com.xiamuyao.repidmvclibrary.AppConfig;
 import com.xiamuyao.repidmvclibrary.AppContext;
-import com.xiamuyao.repidmvclibrary.UItil.LogUtil;
+import com.xiamuyao.repidmvclibrary.Util.LL;
 
 import java.io.File;
 import java.util.List;
@@ -97,7 +97,7 @@ public void GetNet(final int What, String url, String Cachekey) {
                     @Override
                     public void onSuccess(Response<String> response) {
                         netInterface.doSuccess(What, response.body(), response);
-                        LogUtil.d("走网络", "走网络");
+                        LL.d("走网络", "走网络");
                     }
 
                     /**
@@ -107,7 +107,7 @@ public void onSuccess(Response<String> response) {
                     @Override
                     public void onCacheSuccess(Response<String> response) {
                         super.onCacheSuccess(response);
-                        LogUtil.d("读取缓存", "读取缓存");
+                        LL.d("读取缓存", "读取缓存");
                         netInterface.doCacheSuccess(What, response.body(), response);
                     }
 

diff --git a/...idmvclibrary/UItil/AppApplicationMgr.java → ...pidmvclibrary/Util/AppApplicationMgr.java b/...idmvclibrary/UItil/AppApplicationMgr.java → ...pidmvclibrary/Util/AppApplicationMgr.java
@@ -1,4 +1,4 @@
-package com.xiamuyao.repidmvclibrary.UItil;
+package com.xiamuyao.repidmvclibrary.Util;
 
 import android.app.ActivityManager;
 import android.content.Context;

diff --git a/...ao/repidmvclibrary/UItil/DensityUtil.java → ...yao/repidmvclibrary/Util/DensityUtil.java b/...ao/repidmvclibrary/UItil/DensityUtil.java → ...yao/repidmvclibrary/Util/DensityUtil.java
@@ -1,4 +1,4 @@
-package com.xiamuyao.repidmvclibrary.UItil;
+package com.xiamuyao.repidmvclibrary.Util;
 
 
 import android.app.Activity;
@@ -69,7 +69,7 @@ public static int getScreenHeight(Activity activity) {
     public static int getScreenWidth(Activity activity) {
         DisplayMetrics dm = new DisplayMetrics();
         activity.getWindowManager().getDefaultDisplay().getMetrics(dm);
-        LogUtil.i("zzj", dm.widthPixels + "");
+        LL.i("zzj", dm.widthPixels + "");
         return dm.widthPixels;
     }
 

diff --git a/...yao/repidmvclibrary/UItil/DeviceUtil.java → ...uyao/repidmvclibrary/Util/DeviceUtil.java b/...yao/repidmvclibrary/UItil/DeviceUtil.java → ...uyao/repidmvclibrary/Util/DeviceUtil.java
@@ -1,21 +1,16 @@
-package com.xiamuyao.repidmvclibrary.UItil;
+package com.xiamuyao.repidmvclibrary.Util;
 
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Rect;
 import android.os.Build;
-import android.view.View;
-import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.RelativeLayout;
 
 
-import com.xiamuyao.repidmvclibrary.AppContext;
-import com.xiamuyao.repidmvclibrary.R;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 

diff --git a/...muyao/repidmvclibrary/UItil/FastBlur.java → ...amuyao/repidmvclibrary/Util/FastBlur.java b/...muyao/repidmvclibrary/UItil/FastBlur.java → ...amuyao/repidmvclibrary/Util/FastBlur.java
@@ -1,4 +1,4 @@
-package com.xiamuyao.repidmvclibrary.UItil;
+package com.xiamuyao.repidmvclibrary.Util;
 
 import android.graphics.Bitmap;
 

diff --git a/...o/repidmvclibrary/UItil/FileSizeUtil.java → ...ao/repidmvclibrary/Util/FileSizeUtil.java b/...o/repidmvclibrary/UItil/FileSizeUtil.java → ...ao/repidmvclibrary/Util/FileSizeUtil.java
@@ -1,4 +1,4 @@
-package com.xiamuyao.repidmvclibrary.UItil;
+package com.xiamuyao.repidmvclibrary.Util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -36,7 +36,7 @@ public static double getFileOrFilesSize(String filePath, int sizeType) {
         } catch (Exception e) {
             e.printStackTrace();
             file = null;
-            LogUtil.e("获取文件大小", "获取失败!");
+            LL.e("获取文件大小", "获取失败!");
         }
         file = null;
         return FormetFileSize(blockSize, sizeType);
@@ -59,7 +59,7 @@ public static String getAutoFileOrFilesSize(String filePath) {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            LogUtil.e("获取文件大小", "获取失败!");
+            LL.e("获取文件大小", "获取失败!");
         }
         return FormetFileSize(blockSize);
     }
@@ -79,7 +79,7 @@ private static long getFileSize(File file) throws Exception {
             size = fis.available();
         } else {
             file.createNewFile();
-            LogUtil.e("获取文件大小", "文件不存在!");
+            LL.e("获取文件大小", "文件不存在!");
         }
         return size;
     }
@@ -156,7 +156,7 @@ public static double FormetFileSize(long fileS, int sizeType) {
             default:
                 break;
         }
-        LogUtil.i("size", fileSizeLong + "");
+        LL.i("size", fileSizeLong + "");
         return fileSizeLong;
     }
 }
diff --git a/...amuyao/repidmvclibrary/UItil/LogUtil.java → ...com/xiamuyao/repidmvclibrary/Util/LL.java b/...amuyao/repidmvclibrary/UItil/LogUtil.java → ...com/xiamuyao/repidmvclibrary/Util/LL.java
@@ -1,4 +1,4 @@
-package com.xiamuyao.repidmvclibrary.UItil;
+package com.xiamuyao.repidmvclibrary.Util;
 
 import android.text.TextUtils;
 
@@ -11,7 +11,7 @@
  * =========================
  * 说明：Log工具
  */
-public class LogUtil {
+public class LL {
     private static final boolean DEBUG = AppConfig.DEBUG;
 
     /**

diff --git a/...iamuyao/repidmvclibrary/UItil/RSBlur.java → ...xiamuyao/repidmvclibrary/Util/RSBlur.java b/...iamuyao/repidmvclibrary/UItil/RSBlur.java → ...xiamuyao/repidmvclibrary/Util/RSBlur.java
@@ -1,4 +1,4 @@
-package com.xiamuyao.repidmvclibrary.UItil;
+package com.xiamuyao.repidmvclibrary.Util;
 
 import android.annotation.TargetApi;
 import android.content.Context;