zhaoyi vor 8 Jahren
Ursprung
Commit
49215a9e23
24 geänderte Dateien mit 145 neuen und 41 gelöschten Zeilen
  1. 4 1
      .idea/misc.xml
  2. 2 1
      .idea/modules.xml
  3. 12 15
      app/build.gradle
  4. 64 3
      app/proguard-rules.pro
  5. 1 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java
  6. 2 2
      app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseActivity.java
  7. 3 2
      app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/ShotScreen.java
  8. 12 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java
  9. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/BindUserEntiey.java
  10. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/HaoWanMsg.java
  11. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/InviteUrl.java
  12. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/MoneyHistroy.java
  13. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/MoneyRecord.java
  14. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/NewUserTask.java
  15. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/Order.java
  16. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/RecyleObj.java
  17. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/RecyleType.java
  18. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/TaskCount.java
  19. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/UerInviteInfo.java
  20. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/WXAccount.java
  21. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/WXTask.java
  22. 3 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/WxDetailList.java
  23. 2 2
      build.gradle
  24. 1 0
      gradle.properties

+ 4 - 1
.idea/misc.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -24,7 +27,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

+ 2 - 1
.idea/modules.xml

@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://D:\Dlg\AndroidStudioProjects\small_sheep_android\SamllSheepPlugin.iml" filepath="D:\Dlg\AndroidStudioProjects\small_sheep_android\SamllSheepPlugin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/SamllSheepPlugin.iml" filepath="$PROJECT_DIR$/SamllSheepPlugin.iml" />
+      <module fileurl="file://D:/Dlg/AndroidStudioProjects/small_sheep_android/SamllSheepPlugin.iml" filepath="D:/Dlg/AndroidStudioProjects/small_sheep_android/SamllSheepPlugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/small_sheep_android.iml" filepath="$PROJECT_DIR$/small_sheep_android.iml" />
     </modules>

+ 12 - 15
app/build.gradle

@@ -2,20 +2,19 @@ apply plugin: 'com.android.application'
 
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 26
 //    buildToolsVersion '27.0.2'
     defaultConfig {
         applicationId "com.sheep.jiuyan.samllsheep"
         minSdkVersion 18
-        targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 26
+        versionCode 100000
+        versionName "1.0.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
     }
-
     signingConfigs {
         config {
             keyAlias 'sheep'
@@ -25,7 +24,6 @@ android {
         }
 
     }
-
     buildTypes {
         release {
             minifyEnabled false
@@ -36,8 +34,7 @@ android {
             signingConfig signingConfigs.config
         }
     }
-
-
+    buildToolsVersion '26.0.2'
 }
 
 repositories {
@@ -48,12 +45,13 @@ repositories {
 }
 
 dependencies {
-//    compile fileTree(include: ['*.jar'], dir: 'libs')
-//    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-//        exclude group: 'com.android.support', module: 'support-annotations'
-//    })
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support:design:27.0.2'
+    //    compile fileTree(include: ['*.jar'], dir: 'libs')
+    //    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    //        exclude group: 'com.android.support', module: 'support-annotations'
+    //    })
+    compile 'com.android.support:appcompat-v7:26.0.2'
+    compile 'com.android.support:support-v4:26.0.2'
+    compile 'com.android.support:design:26.0.2'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
     //    compile 'com.shark:screencapture:1.0.0'
@@ -73,5 +71,4 @@ dependencies {
     compile 'org.xutils:xutils:3.5.0'
     compile 'com.mylhyl:acp:1.1.7'
     compile 'cn.yipianfengye.android:zxing-library:2.2'
-
 }

+ 64 - 3
app/proguard-rules.pro

@@ -12,9 +12,9 @@
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+   public *;
+}
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
@@ -37,3 +37,64 @@
 -dontwarn com.tencent.bugly.**
 -keep public class com.tencent.bugly.**{*;}
 -keep class android.support.**{*;}
+
+#指定代码的压缩级别
+-optimizationpasses 5
+
+#不去忽略非公共的库类
+-dontskipnonpubliclibraryclasses
+-dontskipnonpubliclibraryclassmembers
+
+# 是否使用大小写混合
+-dontusemixedcaseclassnames
+
+#预校验
+-dontpreverify
+
+#混淆时是否记录日志
+-verbose
+
+#忽略警告,避免打包时某些警告出现
+-ignorewarning
+
+# 混淆时所采用的算法
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+#保护注解
+-keepattributes *Annotation*
+
+#记录生成的日志数据,gradle build时在本项目根目录输出
+#apk 包内所有 class 的内部结构
+-dump class_files.txt
+#未混淆的类和成员
+-printseeds seeds.txt
+#列出从 apk 中删除的代码
+-printusage unused.txt
+#混淆前后的映射
+-printmapping mapping.txt
+
+# 保持哪些类不被混淆
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Fragment
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keep public class * implements java.io.Serializable
+
+-keepattributes *Annotation*
+-keepclassmembers class ** {
+    @org.greenrobot.eventbus.Subscribe <methods>;
+}
+-keep enum org.greenrobot.eventbus.ThreadMode { *; }
+
+# Only required if you use AsyncExecutor
+-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
+    <init>(java.lang.Throwable);
+}
+
+

+ 1 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -35,7 +35,7 @@ public class SheepApp extends BaseApplication {
         regWx();
         registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
         initGoble();
-        Bugly.init(getApplicationContext(), Config.BUGLY_APPID, BuildConfig.DEBUG);
+        Bugly.init(getApplicationContext(), Config.BUGLY_APPID, false);
     }
 
     private void regWx() {

+ 2 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseActivity.java

@@ -30,12 +30,12 @@ public abstract class BaseActivity extends AppActivity {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (BuildConfig.DEBUG)
+        /*if (BuildConfig.DEBUG)
             if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
                 Intent intent = Chuck.getLaunchIntent(BaseActivity.this);
                 startActivity(intent);
                 return true;
-            }
+            }*/
         return super.onKeyDown(keyCode, event);
     }
 

+ 3 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/ShotScreen.java

@@ -16,6 +16,7 @@ import android.media.projection.MediaProjectionManager;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
+import android.support.v4.os.AsyncTaskCompat;
 import android.text.TextUtils;
 
 import java.io.File;
@@ -94,8 +95,8 @@ public class ShotScreen {
                                     public void run() {
 
                                         Image image = mImageReader.acquireLatestImage();
-//                                        AsyncTaskCompat.executeParallel(new SaveTask(), image);
-                                        new SaveTask().doInBackground(image);
+                                         AsyncTaskCompat.executeParallel(new SaveTask(), image);
+//                                        new SaveTask().doInBackground(image);
                                     }
                                 },
                     1000);

+ 12 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -409,4 +409,16 @@ public class MainActivity extends BaseActivity {
         mRedDialog.show();
     }
 
+    long last = 0;
+
+    @Override
+    public void onBackPressed() {
+        long now = System.currentTimeMillis();
+        if (now - last > 1500) {
+            Toast.makeText(this, "双击返回退出程序", Toast.LENGTH_SHORT).show();
+        } else {
+            super.onBackPressed();
+        }
+        last = System.currentTimeMillis();
+    }
 }

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/BindUserEntiey.java

@@ -1,10 +1,12 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * Created by Administrator on 2018/1/7.
  */
 
-public class BindUserEntiey {
+public class BindUserEntiey  implements Serializable{
     private  String  OpenId;
 
     public String getOpenId() {

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/HaoWanMsg.java

@@ -1,10 +1,12 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * Created by kemllor on 2018/1/22.
  */
 
-public class HaoWanMsg {
+public class HaoWanMsg implements Serializable {
 
 
     /**

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/InviteUrl.java

@@ -1,10 +1,12 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * Created by kemllor on 2018/1/25.
  */
 
-public class InviteUrl {
+public class InviteUrl implements Serializable {
     String Url;
 
     public String getUrl() {

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/MoneyHistroy.java

@@ -1,10 +1,12 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * Created by Administrator on 2018/1/6.
  */
 
-public class MoneyHistroy {
+public class MoneyHistroy  implements Serializable {
 
     private  int  Id;
     private  int Uid;

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/MoneyRecord.java

@@ -1,10 +1,12 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * Created by kemllor on 2018/1/17.
  */
 
-public class MoneyRecord {
+public class MoneyRecord implements Serializable {
 
 
     /**

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/NewUserTask.java

@@ -1,10 +1,12 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * Created by kemllor on 2018/1/25.
  */
 
-public class NewUserTask {
+public class NewUserTask implements Serializable {
     /**
      * Id : 1
      * Taskname : 认识小绵羊

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/Order.java

@@ -1,10 +1,12 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * Created by kemllor on 2017/12/29.
  */
 
-public class Order {
+public class Order  implements Serializable {
 
 
     /**

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/RecyleObj.java

@@ -1,5 +1,7 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * @ Created by Dlg
  * @ <p>TiTle:  RecyleObj</p>
@@ -8,7 +10,7 @@ package com.sheep.jiuyan.samllsheep.page.entry;
  * @ QQ:    315096953
  */
 
-public class RecyleObj {
+public class RecyleObj  implements Serializable {
 
     private RecyleType recyleType;
 

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/RecyleType.java

@@ -1,5 +1,7 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * @ Created by Dlg
  * @ <p>TiTle:  RecyleType</p>
@@ -8,7 +10,7 @@ package com.sheep.jiuyan.samllsheep.page.entry;
  * @ QQ:    315096953
  */
 
-public enum RecyleType {
+public enum RecyleType  implements Serializable {
 
 
     //首页的头

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/TaskCount.java

@@ -1,10 +1,12 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * Created by kemllor on 2018/1/17.
  */
 
-public class TaskCount {
+public class TaskCount implements Serializable {
 
     /**
      * TaskCount : 0

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/UerInviteInfo.java

@@ -1,10 +1,12 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * Created by kemllor on 2018/1/25.
  */
 
-public class UerInviteInfo {
+public class UerInviteInfo implements Serializable {
 
     /**
      * User : {"Id":"66","NickName":"howie","InvitationCode":"109432","InviteNum":"12","TodayNum":"0","LastNum":"0","Commission":"0.66","Proportion":"%"}

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/WXAccount.java

@@ -1,10 +1,12 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * Created by Administrator on 2018/1/6.
  */
 
-public class WXAccount {
+public class WXAccount implements Serializable {
 
     private Integer Id;
 

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/WXTask.java

@@ -1,10 +1,12 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * Created by Administrator on 2018/1/6.
  */
 
-public class WXTask {
+public class WXTask  implements Serializable {
     private int Id;
     private String TaskDesc;
     private String Title;

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/WxDetailList.java

@@ -1,5 +1,7 @@
 package com.sheep.jiuyan.samllsheep.page.entry;
 
+import java.io.Serializable;
+
 /**
  * @ Created by Dlg
  * @ <p>TiTle:  WxDetailList</p>
@@ -8,7 +10,7 @@ package com.sheep.jiuyan.samllsheep.page.entry;
  * @ QQ:    315096953
  */
 
-public class WxDetailList {
+public class WxDetailList implements Serializable {
 
     private Integer WxTd;
 

+ 2 - 2
build.gradle

@@ -6,8 +6,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
-        classpath 'com.didi.virtualapk:gradle:0.9.1'
+        classpath 'com.android.tools.build:gradle:2.3.3'
+//        classpath 'com.didi.virtualapk:gradle:0.9.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

+ 1 - 0
gradle.properties

@@ -15,3 +15,4 @@ org.gradle.jvmargs=-Xmx2048m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.injected.build.model.only.versioned = 3