[commit] updateNetUtils ViewUtils

h4de5ing · h4de5ing · commit e629b0c148f3 · 2016-05-09T18:59:52.000+08:00
diff --git a/README.md b/README.md
@@ -44,8 +44,9 @@
 - NetUtils.java 网络工具
     * getNetworkType 获取网络类型
     * getNetworkTypeName 获取网络名称
-    * checkNet 检查网络状态
+    * isConnected 检查网络状态
     * isWiFi 是否wifi
+    * openNetSetting 打开网络设置界面
     * isNetworkAvailable 网络可用性
     
 - SPUtils.java SharedPreferences工具
@@ -73,11 +74,18 @@
     * getDeviceUsableMemory 获取设备可用空间
     * gc 清理后台进程和服务
     * createDeskShortCut 创建桌面快捷方式
-    * captureView 控件截图
     
 - ViewUtils.java View工具
+    * captureView 截图
+    * createViewBitmap 截图
+    * convertViewToBitmap 截图
+    * getStatusBarHeight 获取状态栏高度
+    * getToolbarHeight 获取工具栏高度
+    * getNavigationBarHeight 获取导航栏高度
+    * getScreenSize 获取屏幕尺寸
     
-## License
+License
+----
   Copyright (C)  2016 android@19code.com
   
   Licensed under the Apache License, Version 2.0 (the "License");  
diff --git a/library/src/main/java/com/code19/library/NetUtils.java b/library/src/main/java/com/code19/library/NetUtils.java
@@ -16,7 +16,10 @@
 
 package com.code19.library;
 
+import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.telephony.TelephonyManager;
@@ -71,8 +74,7 @@ public static String getNetworkTypeName(Context context) {
                 type = NETWORK_TYPE_WIFI;
             } else if ("MOBILE".equalsIgnoreCase(typeName)) {
                 String proxyHost = android.net.Proxy.getDefaultHost();
-                type = TextUtils.isEmpty(proxyHost) ? (isFastMobileNetwork(context) ? NETWORK_TYPE_3G : NETWORK_TYPE_2G)
-                        : NETWORK_TYPE_WAP;
+                type = TextUtils.isEmpty(proxyHost) ? (isFastMobileNetwork(context) ? NETWORK_TYPE_3G : NETWORK_TYPE_2G) : NETWORK_TYPE_WAP;
             } else {
                 type = NETWORK_TYPE_UNKNOWN;
             }
@@ -83,10 +85,15 @@ public static String getNetworkTypeName(Context context) {
     /**
      * 判断网络是否连接
      */
-    public static boolean checkNet(Context context) {
+    public static boolean isConnected(Context context) {
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo info = cm.getActiveNetworkInfo();
-        return info != null;
+        if (info != null && info.isConnected()) {
+            if (info.getState() == NetworkInfo.State.CONNECTED) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -96,8 +103,20 @@ public static boolean isWiFi(Context cxt) {
         ConnectivityManager cm = (ConnectivityManager) cxt.getSystemService(Context.CONNECTIVITY_SERVICE);
         // wifi的状态：ConnectivityManager.TYPE_WIFI
         // 3G的状态：ConnectivityManager.TYPE_MOBILE
-        NetworkInfo.State state = cm.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState();
-        return NetworkInfo.State.CONNECTED == state;
+        return cm.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_WIFI;
+    }
+
+    /**
+     * 打开网络设置界面
+     *
+     * @param act 启动设置的activity
+     */
+    public static void openNetSetting(Activity act) {
+        Intent intent = new Intent();
+        ComponentName cm = new ComponentName("com.android.settings", "com.android.settings.WirelessSettings");
+        intent.setComponent(cm);
+        intent.setAction("android.intent.action.VIEW");
+        act.startActivityForResult(intent, 0);
     }
 
     /**
diff --git a/library/src/main/java/com/code19/library/SystemUtils.java b/library/src/main/java/com/code19/library/SystemUtils.java
@@ -27,11 +27,9 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Parcelable;
 import android.telephony.TelephonyManager;
-import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
 import java.io.File;
@@ -40,7 +38,7 @@
 
 /**
  * 系统信息工具包<br>
- * <p/>
+ * <p>
  * <b>创建时间</b> 2014-8-14
  *
  * @author kymjs (https://github.com/kymjs)
@@ -88,7 +86,7 @@ public static void sendSMS(Context cxt, String smsBody) {
 
     /**
      * 隐藏系统键盘
-     * <p/>
+     * <p>
      * <br>
      * <b>警告</b> 必须是确定键盘显示时才能调用
      */
@@ -306,15 +304,5 @@ public void createDeskShortCut(Context cxt, int icon, String title, Class<?> cls
         cxt.sendBroadcast(shortcutIntent);
     }
 
-    /**
-     * 截图
-     *
-     * @param v 需要进行截图的控件
-     * @return 该控件截图的Bitmap对象。
-     */
-    public static Bitmap captureView(View v) {
-        v.setDrawingCacheEnabled(true);
-        v.buildDrawingCache();
-        return v.getDrawingCache();
-    }
+
 }
diff --git a/library/src/main/java/com/code19/library/ViewUtils.java b/library/src/main/java/com/code19/library/ViewUtils.java
@@ -16,16 +16,22 @@
 
 package com.code19.library;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Paint;
+import android.graphics.Point;
 import android.graphics.drawable.BitmapDrawable;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
+import android.view.WindowManager;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
@@ -160,4 +166,83 @@ public static void dismissPopup() {
             popupWindow = null;
         }
     }
+
+    /**
+     * 截图
+     */
+    public static Bitmap captureView(View v) {
+        v.setDrawingCacheEnabled(true);
+        v.buildDrawingCache();
+        return v.getDrawingCache();
+    }
+
+    /**
+     * 截图
+     */
+    public static Bitmap createViewBitmap(View v) {
+        Bitmap bitmap = Bitmap.createBitmap(v.getWidth(), v.getHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        v.draw(canvas);
+        return bitmap;
+    }
+
+    /**
+     * 截图
+     */
+    public static Bitmap convertViewToBitmap(View view) {
+        view.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
+        view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
+        view.buildDrawingCache();
+        return view.getDrawingCache();
+    }
+
+    /**
+     * 获取状态栏的高度
+     *
+     * @param context 上下文
+     * @return 状态栏高度
+     */
+    public static int getStatusBarHeight(Context context) {
+        int result = 0;
+        int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            result = context.getResources().getDimensionPixelSize(resourceId);
+        }
+        return result;
+    }
+
+    /**
+     * 获取ToolBar的高度
+     *
+     * @param context
+     * @return
+     */
+    public static int getToolbarHeight(Context context) {
+        final TypedArray styledAttributes = context.getTheme().obtainStyledAttributes(new int[]{R.attr.actionBarSize});
+        int toolbarHeight = (int) styledAttributes.getDimension(0, 0);
+        styledAttributes.recycle();
+        return toolbarHeight;
+    }
+
+    public static int getNavigationBarHeight(Activity activity) {
+        Resources resources = activity.getResources();
+        int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            return resources.getDimensionPixelSize(resourceId);
+        }
+        return 0;
+    }
+
+    /**
+     * 获取屏幕尺寸
+     *
+     * @param context 上下文
+     * @return 屏幕尺寸像素值，下标为0的值为宽，下标为1的值为高
+     */
+    public static Point getScreenSize(Context context) {
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        Point screenSize = new Point();
+        wm.getDefaultDisplay().getSize(screenSize);
+        return screenSize;
+    }
 }
