Merge pull request YiuChoi#15 from DevFactory/release/naming-conventions-should-be-followed-fix-1

General code quality fix-1

Author: YiuChoi

app/src/main/java/name/caiyao/microreader/utils/CacheUtil.java

@@ -58,15 +58,15 @@ public static CacheUtil get(File cacheDir) {
         return get(cacheDir, MAX_SIZE, MAX_COUNT);
     }
 
-    public static CacheUtil get(Context ctx, long max_zise, int max_count) {
+    public static CacheUtil get(Context ctx, long maxSise, int maxCount) {
         File f = new File(ctx.getCacheDir(), "ACache");
-        return get(f, max_zise, max_count);
+        return get(f, maxSise, maxCount);
     }
 
-    public static CacheUtil get(File cacheDir, long max_zise, int max_count) {
+    public static CacheUtil get(File cacheDir, long maxZise, int maxCount) {
         CacheUtil manager = mInstanceMap.get(cacheDir.getAbsoluteFile() + myPid());
         if (manager == null) {
-            manager = new CacheUtil(cacheDir, max_zise, max_count);
+            manager = new CacheUtil(cacheDir, maxZise, maxCount);
             mInstanceMap.put(cacheDir.getAbsolutePath() + myPid(), manager);
         }
         return manager;
@@ -144,11 +144,11 @@ private static String myPid() {
         return "_" + android.os.Process.myPid();
     }
 
-    private CacheUtil(File cacheDir, long max_size, int max_count) {
+    private CacheUtil(File cacheDir, long maxSize, int maxCount) {
         if (!cacheDir.exists() && !cacheDir.mkdirs()) {
             throw new RuntimeException("can't make dirs in " + cacheDir.getAbsolutePath());
         }
-        mCache = new ACacheManager(cacheDir, max_size, max_count);
+        mCache = new ACacheManager(cacheDir, maxSize, maxCount);
     }
 
     /**
@@ -290,9 +290,9 @@ public void put(String key, JSONObject value, int saveTime) {
      * @return JSONObject数据
      */
     public JSONObject getAsJSONObject(String key) {
-        String JSONString = getAsString(key);
+        String jsonString = getAsString(key);
         try {
-            JSONObject obj = new JSONObject(JSONString);
+            JSONObject obj = new JSONObject(jsonString);
             return obj;
         } catch (Exception e) {
             return null;
@@ -331,9 +331,9 @@ public void put(String key, JSONArray value, int saveTime) {
      * @return JSONArray数据
      */
     public JSONArray getAsJSONArray(String key) {
-        String JSONString = getAsString(key);
+        String jsonstring = getAsString(key);
         try {
-            JSONArray obj = new JSONArray(JSONString);
+            JSONArray obj = new JSONArray(jsonstring);
             return obj;
         } catch (Exception e) {
             //e.printStackTrace();
@@ -413,15 +413,15 @@ public void put(String key, byte[] value, int saveTime) {
      * @return byte 数据
      */
     public byte[] getAsBinary(String key) {
-        RandomAccessFile RAFile = null;
+        RandomAccessFile raFile = null;
         boolean removeFile = false;
         try {
             File file = mCache.get(key);
             if (!file.exists())
                 return null;
-            RAFile = new RandomAccessFile(file, "r");
-            byte[] byteArray = new byte[(int) RAFile.length()];
-            RAFile.read(byteArray);
+            raFile = new RandomAccessFile(file, "r");
+            byte[] byteArray = new byte[(int) raFile.length()];
+            raFile.read(byteArray);
             if (!Utils.isDue(byteArray)) {
                 return Utils.clearDateInfo(byteArray);
             } else {
@@ -432,9 +432,9 @@ public byte[] getAsBinary(String key) {
             e.printStackTrace();
             return null;
         } finally {
-            if (RAFile != null) {
+            if (raFile != null) {
                 try {
-                    RAFile.close();
+                    raFile.close();
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
@@ -539,7 +539,7 @@ public Object getAsObject(String key) {
      * @param value 保存的bitmap数据
      */
     public void put(String key, Bitmap value) {
-        put(key, Utils.Bitmap2Bytes(value));
+        put(key, Utils.bitmap2Bytes(value));
     }
 
     /**
@@ -550,7 +550,7 @@ public void put(String key, Bitmap value) {
      * @param saveTime 保存的时间，单位：秒
      */
     public void put(String key, Bitmap value, int saveTime) {
-        put(key, Utils.Bitmap2Bytes(value), saveTime);
+        put(key, Utils.bitmap2Bytes(value), saveTime);
     }
 
     /**
@@ -563,7 +563,7 @@ public Bitmap getAsBitmap(String key) {
         if (getAsBinary(key) == null) {
             return null;
         }
-        return Utils.Bytes2Bimap(getAsBinary(key));
+        return Utils.bytes2Bimap(getAsBinary(key));
     }
 
     // =======================================
@@ -601,7 +601,7 @@ public Drawable getAsDrawable(String key) {
         if (getAsBinary(key) == null) {
             return null;
         }
-        return Utils.bitmap2Drawable(Utils.Bytes2Bimap(getAsBinary(key)));
+        return Utils.bitmap2Drawable(Utils.bytes2Bimap(getAsBinary(key)));
     }
 
     /**
@@ -881,7 +881,7 @@ private static String createDateInfo(int second) {
         /*
          * Bitmap → byte[]
          */
-        private static byte[] Bitmap2Bytes(Bitmap bm) {
+        private static byte[] bitmap2Bytes(Bitmap bm) {
             if (bm == null) {
                 return null;
             }
@@ -893,7 +893,7 @@ private static byte[] Bitmap2Bytes(Bitmap bm) {
         /*
          * byte[] → Bitmap
          */
-        private static Bitmap Bytes2Bimap(byte[] b) {
+        private static Bitmap bytes2Bimap(byte[] b) {
             if (b.length == 0) {
                 return null;
             }

app/src/main/java/name/caiyao/microreader/utils/WebUtil.java

@@ -16,7 +16,7 @@ public class WebUtil {
     private static final String DIV_IMAGE_PLACE_HOLDER = "class=\"img-place-holder\"";
     private static final String DIV_IMAGE_PLACE_HOLDER_IGNORED = "class=\"img-place-holder-ignored\"";
 
-    public static String BuildHtmlWithCss(String html, String[] cssUrls, boolean isNightMode) {
+    public static String buildHtmlWithCss(String html, String[] cssUrls, boolean isNightMode) {
         StringBuilder result = new StringBuilder();
         for (String cssUrl : cssUrls) {
             result.append(String.format(CSS_LINK_PATTERN, cssUrl));