Merge remote-tracking branch 'origin/master'

catchpig · Jan 26, 2018 · 8e9ed3e · 8e9ed3e
2 parents 7adb1f5 + 368ca74
commit 8e9ed3e
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 124 deletions.
diff --git a/app/src/androidTest/java/com/zhuazhu/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/zhuazhu/ExampleInstrumentedTest.java
@@ -7,7 +7,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import conm.zhuazhu.common.utils.EncryptUtils;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -23,4 +25,9 @@ public void useAppContext() throws Exception {
 
         assertEquals("com.zhuazhu", appContext.getPackageName());
     }
+    @Test
+    public void test(){
+        String m5 = EncryptUtils.encryptMD5ToString("123456");
+        System.out.println(m5);
+    }
 }
diff --git a/app/src/test/java/com/zhuazhu/ExampleUnitTest.java b/app/src/test/java/com/zhuazhu/ExampleUnitTest.java
@@ -2,7 +2,9 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import conm.zhuazhu.common.utils.EncryptUtils;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * Example local unit test, which will execute on the development machine (host).
@@ -14,4 +16,10 @@ public class ExampleUnitTest {
     public void addition_isCorrect() throws Exception {
         assertEquals(4, 2 + 2);
     }
+    @Test
+    public void test(){
+        String m5 = EncryptUtils.encryptMD5ToString("123456");
+
+        System.out.println(m5);
+    }
 }
diff --git a/common/src/main/java/conm/zhuazhu/common/utils/AppUtils.java b/common/src/main/java/conm/zhuazhu/common/utils/AppUtils.java
@@ -244,6 +244,19 @@ public static void exitApp() {
         System.exit(0);
     }
 
+    /**
+     * 获取meta-data的value
+     * @param key
+     * @return
+     * @throws PackageManager.NameNotFoundException
+     */
+    public static String metaData(String key) throws PackageManager.NameNotFoundException {
+        ApplicationInfo applicationInfo = Utils.getApp().getPackageManager()
+                .getApplicationInfo(getAppPackageName(), PackageManager
+                        .GET_META_DATA);
+        return applicationInfo.metaData.getString("key");
+    }
+
     /**
      * 获取 App 包名
      *

diff --git a/common/src/main/java/conm/zhuazhu/common/utils/MD5Utils.java b/common/src/main/java/conm/zhuazhu/common/utils/MD5Utils.java
diff --git a/common/src/main/java/conm/zhuazhu/common/utils/VibrateUtils.java b/common/src/main/java/conm/zhuazhu/common/utils/VibrateUtils.java
@@ -15,24 +15,22 @@ public class VibrateUtils {
     /**
      * {@link android.Manifest.permission#VIBRATE}.
      *
-     * @param context
      * @param milliseconds The number of milliseconds to vibrate.
      */
-    public static void vibrate(Context context, long milliseconds) {
-        Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+    public static void vibrate(long milliseconds) {
+        Vibrator vibrator = (Vibrator) Utils.getApp().getSystemService(Context.VIBRATOR_SERVICE);
         vibrator.vibrate(milliseconds);
     }
 
     /**
      * {@link android.Manifest.permission#VIBRATE}.
      *
-     * @param context
      * @param pattern an array of longs of times for which to turn the vibrator on or off.
      * @param repeat  the index into pattern at which to repeat, or -1 if
      *                you don't want to repeat.
      */
-    public static void vibrate(Context context, long[] pattern, int repeat) {
-        Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+    public static void vibrate(long[] pattern, int repeat) {
+        Vibrator vibrator = (Vibrator) Utils.getApp().getSystemService(Context.VIBRATOR_SERVICE);
         vibrator.vibrate(pattern, repeat);
     }
 }
diff --git a/common/src/main/java/conm/zhuazhu/common/utils/VoiceUtils.java b/common/src/main/java/conm/zhuazhu/common/utils/VoiceUtils.java
@@ -1,6 +1,5 @@
 package conm.zhuazhu.common.utils;
 
-import android.content.Context;
 import android.media.MediaPlayer;
 import android.support.annotation.RawRes;
 
@@ -13,13 +12,10 @@ public class VoiceUtils {
 
     /**
      * 播放语音
-     * @param context
      * @param raw
      */
-    public static void play(Context context,@RawRes int raw){
-
-        MediaPlayer player = MediaPlayer.create(context,raw);
-
+    public static void play(@RawRes int raw){
+        MediaPlayer player = MediaPlayer.create(Utils.getApp(),raw);
         player.start();
     }
 }
diff --git a/common/src/main/java/conm/zhuazhu/common/utils/WindowUtils.java b/common/src/main/java/conm/zhuazhu/common/utils/WindowUtils.java
@@ -2,8 +2,6 @@
 
 import android.Manifest;
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.support.v4.app.ActivityCompat;
 import android.telephony.TelephonyManager;
@@ -17,61 +15,6 @@
  */
 
 public class WindowUtils {
-    /**
-     * 获取meta-data的value
-     * @param context
-     * @param key
-     * @return
-     * @throws PackageManager.NameNotFoundException
-     */
-    public static String metaData(Context context, String key) throws
-            PackageManager.NameNotFoundException {
-        ApplicationInfo applicationInfo = context.getPackageManager()
-                .getApplicationInfo(context.getPackageName(), PackageManager
-                        .GET_META_DATA);
-        return applicationInfo.metaData.getString("key");
-    }
-
-    /**
-     * 获取版本code
-     *
-     * @param context
-     * @return
-     * @throws Exception
-     */
-    public static int versionCode(Context context) throws Exception {
-        // 获取packagemanager的实例
-        PackageManager packageManager = context.getPackageManager();
-        // getPackageName()是你当前类的包名，0代表是获取版本信息
-        PackageInfo packInfo = packageManager.getPackageInfo(context
-                .getPackageName(), 0);
-        int version = packInfo.versionCode;
-        return version;
-    }
-
-    /**
-     * 获取版本
-     *
-     * @param context
-     * @return
-     * @throws Exception
-     */
-    public static String versionName(Context context) {
-        // 获取packagemanager的实例
-        PackageManager packageManager = context.getPackageManager();
-        // getPackageName()是你当前类的包名，0代表是获取版本信息
-        PackageInfo packInfo = null;
-        try {
-            packInfo = packageManager.getPackageInfo(context.getPackageName()
-                    , 0);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (packInfo == null) {
-            return null;
-        }
-        return packInfo.versionName;
-    }
 
     /**
      * 获取设备id