test

.gitignore

@@ -21,3 +21,5 @@ proguard-project.txt
 build.xml
 project.properties
 weiciyuan.iml
+gen/
+out/

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);
 }

libs/google-play-services_lib/google-play-services_lib.iml

@@ -4,16 +4,17 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="LIBRARY_PROJECT" value="true" />
+        <option name="UPDATE_PROPERTY_FILES" value="true" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.3 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

libs/showcaseviewlibrary/AndroidManifest.xml

@@ -4,6 +4,6 @@
           android:versionCode="1"
           android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="19"/>
+    <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="19"/>
 
 </manifest>

libs/showcaseviewlibrary/showcaseviewlibrary.iml

@@ -10,22 +10,11 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/test" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.4 Platformh" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="libs" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../android-support-v4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
   </component>
 </module>
 

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);
 }

libs/slidingmenulibrary/slidingmenulibrary.iml

@@ -3,50 +3,20 @@
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
-        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
-        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/assets" />
-        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/libs" />
-        <option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
-        <option name="CUSTOM_APK_RESOURCE_FOLDER" value="" />
-        <option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
-        <option name="CUSTOM_COMPILER_MANIFEST" value="" />
-        <option name="APK_PATH" value="" />
         <option name="LIBRARY_PROJECT" value="true" />
-        <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
-        <option name="GENERATE_UNSIGNED_APK" value="false" />
-        <option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
-        <option name="PACK_TEST_CODE" value="false" />
-        <option name="RUN_PROGUARD" value="false" />
-        <option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
-        <resOverlayFolders>
-          <path>/res-overlay</path>
-        </resOverlayFolders>
-        <includeSystemProguardFile>true</includeSystemProguardFile>
-        <includeAssetsFromLibraries>false</includeAssetsFromLibraries>
-        <additionalNativeLibs />
+        <option name="UPDATE_PROPERTY_FILES" value="true" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.0.3 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../weiciyuan/weiciyuan/libs/android-support-v4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="libs" level="project" />
   </component>
 </module>
 

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);

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";
 
 

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(), "");
         }