diff --git a/.gitignore b/.gitignore index d0d0c0df5..800b8bd42 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ proguard-project.txt build.xml project.properties weiciyuan.iml +gen/ +out/ diff --git a/.idea/libraries/libs.xml b/.idea/libraries/libs.xml index 232b89b08..86c28c454 100644 --- a/.idea/libraries/libs.xml +++ b/.idea/libraries/libs.xml @@ -1,21 +1,11 @@ - - + + - - - - - - - - - - - + \ No newline at end of file diff --git a/libs/google-play-services_lib/gen/com/google/android/gms/BuildConfig.java b/libs/google-play-services_lib/gen/com/google/android/gms/BuildConfig.java index 6b505a2fc..0146c6091 100644 --- a/libs/google-play-services_lib/gen/com/google/android/gms/BuildConfig.java +++ b/libs/google-play-services_lib/gen/com/google/android/gms/BuildConfig.java @@ -1,8 +1,8 @@ /*___Generated_by_IDEA___*/ -/** Automatically generated file. DO NOT MODIFY */ package com.google.android.gms; +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ public final class BuildConfig { - public final static boolean DEBUG = true; + public final static boolean DEBUG = Boolean.parseBoolean(null); } \ No newline at end of file diff --git a/libs/google-play-services_lib/google-play-services_lib.iml b/libs/google-play-services_lib/google-play-services_lib.iml index 5aa21b30f..a4ee97a71 100644 --- a/libs/google-play-services_lib/google-play-services_lib.iml +++ b/libs/google-play-services_lib/google-play-services_lib.iml @@ -4,16 +4,17 @@ - + - + diff --git a/libs/showcaseviewlibrary/AndroidManifest.xml b/libs/showcaseviewlibrary/AndroidManifest.xml index df4f84542..de678c661 100644 --- a/libs/showcaseviewlibrary/AndroidManifest.xml +++ b/libs/showcaseviewlibrary/AndroidManifest.xml @@ -4,6 +4,6 @@ android:versionCode="1" android:versionName="1.0"> - + diff --git a/libs/showcaseviewlibrary/showcaseviewlibrary.iml b/libs/showcaseviewlibrary/showcaseviewlibrary.iml index 85a8fdfd2..780019fea 100644 --- a/libs/showcaseviewlibrary/showcaseviewlibrary.iml +++ b/libs/showcaseviewlibrary/showcaseviewlibrary.iml @@ -10,22 +10,11 @@ - - + - + - - - - - - - - - - diff --git a/libs/slidingmenulibrary/gen/com/slidingmenu/lib/BuildConfig.java b/libs/slidingmenulibrary/gen/com/slidingmenu/lib/BuildConfig.java index d5313b235..ab192c4db 100644 --- a/libs/slidingmenulibrary/gen/com/slidingmenu/lib/BuildConfig.java +++ b/libs/slidingmenulibrary/gen/com/slidingmenu/lib/BuildConfig.java @@ -1,8 +1,8 @@ /*___Generated_by_IDEA___*/ -/** Automatically generated file. DO NOT MODIFY */ package com.slidingmenu.lib; +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ public final class BuildConfig { - public final static boolean DEBUG = true; + public final static boolean DEBUG = Boolean.parseBoolean(null); } \ No newline at end of file diff --git a/libs/slidingmenulibrary/slidingmenulibrary.iml b/libs/slidingmenulibrary/slidingmenulibrary.iml index 7be42b146..c79d8c240 100644 --- a/libs/slidingmenulibrary/slidingmenulibrary.iml +++ b/libs/slidingmenulibrary/slidingmenulibrary.iml @@ -3,50 +3,20 @@ - + - - + - - - - - - - - - + diff --git a/res/drawable-xxxhdpi/bg_tacos.9.png b/res/drawable-xxxhdpi/bg_tacos.9.png deleted file mode 100644 index 89bc47156..000000000 Binary files a/res/drawable-xxxhdpi/bg_tacos.9.png and /dev/null differ diff --git a/src/org/qii/weiciyuan/bean/UserBean.java b/src/org/qii/weiciyuan/bean/UserBean.java index 299739bbe..20c469be9 100644 --- a/src/org/qii/weiciyuan/bean/UserBean.java +++ b/src/org/qii/weiciyuan/bean/UserBean.java @@ -17,6 +17,81 @@ public class UserBean implements Parcelable { public static final int V_TYPE_ENTERPRISE = 1; + private String id; + + private String screen_name; + + private String name; + + private String province; + + private String city; + + private String location; + + private String description; + + private String url; + + private String profile_image_url; + + private String cover_image; + + private String domain; + + private String gender; + + private String statuses_count = "0"; + + private String favourites_count = "0"; + + private String created_at; + + private boolean following; + + private String allow_all_act_msg; + + private String remark; + + private String geo_enabled; + + private boolean verified; + + private String allow_all_comment; + + private String avatar_large; + + private String verified_reason; + + private int verified_type; + + private boolean follow_me; + + private String online_status; + + private String bi_followers_count; + + private String followers_count = "0"; + + private String friends_count = "0"; + + public String getFollowers_count() { + return followers_count; + } + + public void setFollowers_count(String followers_count) { + this.followers_count = followers_count; + } + + public String getFriends_count() { + return friends_count; + } + + public void setFriends_count(String friends_count) { + this.friends_count = friends_count; + } + + public boolean isEnterpriseV() { return verified_type == V_TYPE_ENTERPRISE; } @@ -241,81 +316,6 @@ public void setBi_followers_count(String bi_followers_count) { this.bi_followers_count = bi_followers_count; } - private String id; - - private String screen_name; - - private String name; - - private String province; - - private String city; - - private String location; - - private String description; - - private String url; - - private String profile_image_url; - - private String cover_image; - - private String domain; - - private String gender; - - private String statuses_count = "0"; - - private String favourites_count = "0"; - - private String created_at; - - private boolean following; - - private String allow_all_act_msg; - - private String remark; - - private String geo_enabled; - - private boolean verified; - - private String allow_all_comment; - - private String avatar_large; - - private String verified_reason; - - private int verified_type; - - private boolean follow_me; - - private String online_status; - - private String bi_followers_count; - - private String followers_count = "0"; - - private String friends_count = "0"; - - public String getFollowers_count() { - return followers_count; - } - - public void setFollowers_count(String followers_count) { - this.followers_count = followers_count; - } - - public String getFriends_count() { - return friends_count; - } - - public void setFriends_count(String friends_count) { - this.friends_count = friends_count; - } - - @Override public String toString() { return ObjectToStringUtility.toString(this); diff --git a/src/org/qii/weiciyuan/dao/URLHelper.java b/src/org/qii/weiciyuan/dao/URLHelper.java index 5a8bb2d33..00b8c2dcd 100644 --- a/src/org/qii/weiciyuan/dao/URLHelper.java +++ b/src/org/qii/weiciyuan/dao/URLHelper.java @@ -11,8 +11,10 @@ public class URLHelper { //login public static final String UID = URL_SINA_WEIBO + "account/get_uid.json"; public static final String URL_OAUTH2_ACCESS_AUTHORIZE = "https://api.weibo.com/oauth2/authorize"; - public static final String APP_KEY = "1065511513"; - public static final String APP_SECRET = "df428e88aae8bd31f20481d149c856ed"; +// public static final String APP_KEY = "1065511513"; + public static final String APP_KEY = "1381640061"; +// public static final String APP_SECRET = "df428e88aae8bd31f20481d149c856ed"; + public static final String APP_SECRET = "6eb16add3712811841e4da064d9625f8"; public static final String DIRECT_URL = "https://api.weibo.com/oauth2/default.html"; diff --git a/src/org/qii/weiciyuan/ui/login/OAuthActivity.java b/src/org/qii/weiciyuan/ui/login/OAuthActivity.java index 844ebdb29..cc37e5cfa 100644 --- a/src/org/qii/weiciyuan/ui/login/OAuthActivity.java +++ b/src/org/qii/weiciyuan/ui/login/OAuthActivity.java @@ -1,17 +1,5 @@ package org.qii.weiciyuan.ui.login; -import org.qii.weiciyuan.R; -import org.qii.weiciyuan.bean.AccountBean; -import org.qii.weiciyuan.bean.UserBean; -import org.qii.weiciyuan.dao.URLHelper; -import org.qii.weiciyuan.dao.login.OAuthDao; -import org.qii.weiciyuan.support.database.AccountDBTask; -import org.qii.weiciyuan.support.debug.AppLogger; -import org.qii.weiciyuan.support.error.WeiboException; -import org.qii.weiciyuan.support.lib.MyAsyncTask; -import org.qii.weiciyuan.support.utils.Utility; -import org.qii.weiciyuan.ui.interfaces.AbstractAppActivity; - import android.app.ActionBar; import android.app.AlertDialog; import android.app.Dialog; @@ -27,13 +15,20 @@ import android.view.MenuItem; import android.view.animation.Animation; import android.view.animation.AnimationUtils; -import android.webkit.CookieManager; -import android.webkit.CookieSyncManager; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; +import android.webkit.*; import android.widget.ImageView; import android.widget.Toast; +import org.qii.weiciyuan.R; +import org.qii.weiciyuan.bean.AccountBean; +import org.qii.weiciyuan.bean.UserBean; +import org.qii.weiciyuan.dao.URLHelper; +import org.qii.weiciyuan.dao.login.OAuthDao; +import org.qii.weiciyuan.support.database.AccountDBTask; +import org.qii.weiciyuan.support.debug.AppLogger; +import org.qii.weiciyuan.support.error.WeiboException; +import org.qii.weiciyuan.support.lib.MyAsyncTask; +import org.qii.weiciyuan.support.utils.Utility; +import org.qii.weiciyuan.ui.interfaces.AbstractAppActivity; import java.lang.ref.WeakReference; import java.util.HashMap; @@ -162,7 +157,7 @@ public void onPageStarted(WebView view, String url, Bitmap favicon) { @Override public void onReceivedError(WebView view, int errorCode, String description, - String failingUrl) { + String failingUrl) { super.onReceivedError(view, errorCode, description, failingUrl); new SinaWeiboErrorDialog().show(getSupportFragmentManager(), ""); } diff --git a/weiciyuan.iml b/weiciyuan.iml index 7f9b29a7f..47538a106 100644 --- a/weiciyuan.iml +++ b/weiciyuan.iml @@ -2,51 +2,22 @@ - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +