GPL协议

matrixcloud · matrixcloud · commit ed66f0fd59b3 · 2014-04-24T09:17:12.000+08:00
diff --git a/LICENCE b/LICENCE
diff --git a/res/xml/preference.xml b/res/xml/preference.xml
@@ -23,6 +23,8 @@
         </Preference>
     </PreferenceCategory>
     <PreferenceCategory android:title="语音设置">
+<!--         <PreferenceScreen android:title="播报时间设置"  -->
+<!--             android:key="pref_alarm" /> -->
         <Preference android:title="发音人设置" 
             	android:summary="请到讯飞语音+中设置"/>
     </PreferenceCategory>
diff --git a/src/com/dreamteam/app/adapter/GridAdapter.java b/src/com/dreamteam/app/adapter/GridAdapter.java
@@ -4,7 +4,6 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.Parcelable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -169,8 +168,7 @@ private void addShortcut(String name, String sectionUrl)
 		Intent shortcutIntent = new Intent("com.android.launcher.action.INSTALL_SHORTCUT");
 		shortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name);
 		shortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, entryIntent);
-		Parcelable icon = Intent.ShortcutIconResource.fromContext(context, R.drawable.ic_launcher);
-		shortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon);
+		shortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, R.drawable.ic_launcher);
 		//只能创建一次
 		shortcutIntent.putExtra("duplicate", false);
 		context.sendBroadcast(shortcutIntent);
diff --git a/src/com/dreamteam/app/adapter/ItemListAdapter.java b/src/com/dreamteam/app/adapter/ItemListAdapter.java
@@ -60,7 +60,7 @@ public ItemListAdapter(Context context, ArrayList<FeedItem> items, boolean isNig
 		}
 		//是否加载图片
 		SharedPreferences prefs = AppContext.getPrefrences(context);
-		loadImg = prefs.getBoolean("pref_imageLoad", true);
+		loadImg = prefs.getBoolean("pref_imageLoad", false);
 	}
 	
 	@Override
diff --git a/src/com/dreamteam/app/ui/ItemDetail.java b/src/com/dreamteam/app/ui/ItemDetail.java
@@ -226,7 +226,7 @@ private void loadData()
 //		 mWebView.addJavascriptInterface(this, "mWebViewImageListener");
 		 //是否加载图片
 		SharedPreferences pref = AppContext.getPrefrences(this);
-		if(!pref.getBoolean("pref_imageLoad", true))
+		if(!pref.getBoolean("pref_imageLoad", false))
 		{
 			itemDetail = itemDetail.replaceAll("(<|;)\\s*(IMG|img)\\s+([^;^>]*)\\s*(;|>)", "");
 		}
diff --git a/src/com/dreamteam/app/ui/Setting.java b/src/com/dreamteam/app/ui/Setting.java
@@ -143,5 +143,16 @@ public boolean onPreferenceClick(Preference preference) {
 				return true;
 			}
 		});
+		
+//		//alarm tts
+//		findPreference("pref_alarm").setOnPreferenceClickListener(new OnPreferenceClickListener() {
+//			@Override
+//			public boolean onPreferenceClick(Preference preference) {
+//				Intent intent = new Intent();
+//				intent.setClass(Setting.this, AlarmTts.class);
+//				Setting.this.startActivity(intent);
+//				return true;
+//			}
+//		});
 	}
 }
diff --git a/src/com/dreamteam/app/ui/SplashActivity.java b/src/com/dreamteam/app/ui/SplashActivity.java
@@ -1,24 +1,14 @@
 package com.dreamteam.app.ui;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
-import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 
-import com.dreamteam.app.commons.AppConfig;
-import com.dreamteam.app.commons.AppContext;
-import com.dreamteam.app.db.FeedDBManager;
 import com.dreateam.app.ui.R;
 
 /**
@@ -126,5 +116,5 @@ private void goGuide()
 		SplashActivity.this.startActivity(intent);
 		SplashActivity.this.finish();
 	}
-
+	
 }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public ItemListAdapter(Context context, ArrayList<FeedItem> items, boolean isNig`
`60`	`60`	`}`
`61`	`61`	`//是否加载图片`
`62`	`62`	`SharedPreferences prefs = AppContext.getPrefrences(context);`
`63`		`- loadImg = prefs.getBoolean("pref_imageLoad", true);`
	`63`	`+ loadImg = prefs.getBoolean("pref_imageLoad", false);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ private void loadData()`
`226`	`226`	`// mWebView.addJavascriptInterface(this, "mWebViewImageListener");`
`227`	`227`	`//是否加载图片`
`228`	`228`	`SharedPreferences pref = AppContext.getPrefrences(this);`
`229`		`- if(!pref.getBoolean("pref_imageLoad", true))`
	`229`	`+ if(!pref.getBoolean("pref_imageLoad", false))`
`230`	`230`	`{`
`231`	`231`	`itemDetail = itemDetail.replaceAll("(<\|;)\\s(IMG\|img)\\s+([^;^>])\\s*(;\|>)", "");`
`232`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,5 +143,16 @@ public boolean onPreferenceClick(Preference preference) {`
`143`	`143`	`return true;`
`144`	`144`	`}`
`145`	`145`	`});`
	`146`	`+`
	`147`	`+// //alarm tts`
	`148`	`+// findPreference("pref_alarm").setOnPreferenceClickListener(new OnPreferenceClickListener() {`
	`149`	`+// @Override`
	`150`	`+// public boolean onPreferenceClick(Preference preference) {`
	`151`	`+// Intent intent = new Intent();`
	`152`	`+// intent.setClass(Setting.this, AlarmTts.class);`
	`153`	`+// Setting.this.startActivity(intent);`
	`154`	`+// return true;`
	`155`	`+// }`
	`156`	`+// });`
`146`	`157`	`}`
`147`	`158`	`}`