提交: ef4db618691d8521279ad98fd5d829e9c63d81c7 - mmw_app (git)

Commit MetaInfo

• 修訂: ef4db618691d8521279ad98fd5d829e9c63d81c7 (tree)
• 時間: 2017-08-21 01:36:34
• 作者: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Fix delayed image loading with MikuWeater icons.

Change Summary

• modified: app/src/main/java/cloud/hmml/mmw/MainApplication.java
• modified: app/src/main/java/cloud/hmml/mmw/Theme.java
• modified: app/src/main/java/cloud/hmml/mmw/ThemePickerActivity.java

差異

--- a/app/src/main/java/cloud/hmml/mmw/MainApplication.java
+++ b/app/src/main/java/cloud/hmml/mmw/MainApplication.java
@@ -1,19 +1,60 @@
 package cloud.hmml.mmw;
 
 import android.app.Application;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
 
 import com.nostra13.universalimageloader.cache.memory.impl.LruMemoryCache;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+import com.nostra13.universalimageloader.core.decode.ImageDecoder;
+import com.nostra13.universalimageloader.core.decode.ImageDecodingInfo;
+import com.nostra13.universalimageloader.core.download.BaseImageDownloader;
+
+import java.io.IOException;
+import java.io.InputStream;
 
 
 public class MainApplication extends Application {
+    class MmwImageDownloader extends BaseImageDownloader {
+        public MmwImageDownloader(Context context) {
+            super(context);
+        }
+
+        @Override
+        public InputStream getStream(String imageUri, Object extra) throws IOException {
+            if (Uri.parse(imageUri).getScheme().equals("mikuweather-icon"))
+                return getStreamFromMikuWeather(imageUri, extra);
+            return super.getStream(imageUri, extra);
+        }
+
+        public InputStream getStreamFromMikuWeather(String imageUri, Object extra) throws IOException {
+            Context mx_context = null;
+            Uri uri = Uri.parse(imageUri);
+            try {
+                mx_context = context.createPackageContext("com.mikuxperia.mikuweatherwidget", Context.CONTEXT_RESTRICTED);
+            } catch (PackageManager.NameNotFoundException e) {
+                throw new IOException("Faeild to resolv miku weather package");
+            }
+            Resources resources = mx_context.getResources();
+            int resourceId = resources.getIdentifier(uri.getSchemeSpecificPart(), "drawable", "com.mikuxperia.mikuweatherwidget");
+            return resources.openRawResource(resourceId);
+        }
+
+    }
+
+
     @Override
     public void onCreate() {
         super.onCreate();
         ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(getApplicationContext())
                 .memoryCache(new LruMemoryCache(5 * 1024 * 1024))
                 .memoryCacheSize(5 * 1024 * 1024)
+                .imageDownloader(new MmwImageDownloader(getApplicationContext()))
                 .build();
         ImageLoader.getInstance().init(config);
 

--- a/app/src/main/java/cloud/hmml/mmw/Theme.java
+++ b/app/src/main/java/cloud/hmml/mmw/Theme.java
@@ -232,6 +232,7 @@ public class Theme {
         try {
             theme = JSON.decode(istream, Theme.class);
         } catch (IOException e) {
+            Log.e("theme", "Failed to decode theme definition json: " + e.getMessage());
             e.printStackTrace();
             return null;
         }
@@ -246,7 +247,10 @@ public class Theme {
 
     public String getIconURL(String iconIdent) {
         if (type == TYPE_MIKU_WEATHER) {
-            return null;
+            String icon_name = MW_RES_MAP.get(iconIdent);
+            if (icon_name == null)
+                return null;
+            return "mikuweather-icon:tenki_"+icon_name;
         } else if (type == TYPE_BUILTIN) {
             return "assets://themes/" + id + "/" + W_FNAME_MAP.get(iconIdent);
         } else if (type == TYPE_IN_STORAGE) {
@@ -318,5 +322,4 @@ public class Theme {
             return null;
         }
     }
-
 }

--- a/app/src/main/java/cloud/hmml/mmw/ThemePickerActivity.java
+++ b/app/src/main/java/cloud/hmml/mmw/ThemePickerActivity.java
@@ -3,14 +3,17 @@ package cloud.hmml.mmw;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
+import android.support.v4.content.AsyncTaskLoader;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -26,6 +29,8 @@ import android.widget.TextView;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+import com.nostra13.universalimageloader.core.assist.FailReason;
+import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 
 import java.util.List;
 
@@ -37,7 +42,7 @@ public class ThemePickerActivity extends AppCompatActivity {
         }
 
         @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
+        public View getView(final int position, View convertView, ViewGroup parent) {
             final Theme theme = (Theme) getItem(position);
 
             // Check if an existing view is being reused, otherwise inflate the view
@@ -52,19 +57,14 @@ public class ThemePickerActivity extends AppCompatActivity {
             ImageView image2 = (ImageView) convertView.findViewById(R.id.theme_image2);
             ImageView image3 = (ImageView) convertView.findViewById(R.id.theme_image3);
 
+
             // Populate the data into the template view using the data object
             name.setText(theme.name);
             author.setText(theme.author);
-            if (theme.getType() == Theme.TYPE_MIKU_WEATHER) {
-                image1.setImageBitmap(theme.getIcon(Theme.W_CLEAR_D + Theme.W_RAIN));
-                image2.setImageBitmap(theme.getIcon(Theme.W_SNOW + Theme.W_CLEAR_N));
-                image3.setImageBitmap(theme.getIcon(Theme.W_CLOUD + Theme.W_THUNDER));
-            } else {
-                ImageLoader imageLoader = ImageLoader.getInstance();
-                imageLoader.displayImage(theme.getIconURL(Theme.W_CLEAR_D + Theme.W_RAIN), image1);
-                imageLoader.displayImage(theme.getIconURL(Theme.W_SNOW + Theme.W_CLEAR_N), image2);
-                imageLoader.displayImage(theme.getIconURL(Theme.W_CLOUD + Theme.W_THUNDER), image3);
-            }
+            ImageLoader imageLoader = ImageLoader.getInstance();
+            imageLoader.displayImage(theme.getIconURL(Theme.W_CLEAR_D + Theme.W_RAIN), image1);
+            imageLoader.displayImage(theme.getIconURL(Theme.W_SNOW + Theme.W_CLEAR_N), image2);
+            imageLoader.displayImage(theme.getIconURL(Theme.W_CLOUD + Theme.W_THUNDER), image3);
             image2.setVisibility(View.VISIBLE);
             image3.setVisibility(View.VISIBLE);
 
@@ -78,7 +78,6 @@ public class ThemePickerActivity extends AppCompatActivity {
             image2.setBackground(bg);
             image3.setBackground(bg);
 
-
             if (theme.getUri() != null) {
                 author.setTextColor(Color.BLUE);
                 author.setOnClickListener(new View.OnClickListener() {