[代码规范]包名调整

build.gradle

@@ -5,6 +5,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.antfortune.freeline:gradle:0.8.7'
     }
 }
 

gradle.properties

@@ -5,15 +5,15 @@
 #
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 #
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-#Tue Aug 09 11:49:12 CST 2016
+#Mon Apr 03 21:34:54 CST 2017
 systemProp.http.proxyHost=127.0.0.1
 org.gradle.jvmargs=-Xmx4g -XX\:MaxPermSize\=512m
-systemProp.http.proxyPort=8080
 org.gradle.configureondemand=true
+systemProp.http.proxyPort=1080

weiSwift/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.antfortune.freeline'
 
 android {
     compileSdkVersion 23

weiSwift/src/main/AndroidManifest.xml

@@ -18,7 +18,7 @@
     <uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" />
 
     <application
-        android:name=".MyApplication"
+        android:name=".app.MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -29,7 +29,7 @@
 
 
         <activity
-            android:name=".ui.welcome.WelcomeActivity"
+            android:name=".app.welcome.activity.WelcomeActivity"
             android:theme="@android:style/Theme.Holo.Light.NoActionBar.Fullscreen">
 
             <intent-filter>
@@ -38,48 +38,48 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ui.unlogin.activity.UnLoginActivity" />
+        <activity android:name=".app.unlogin.activity.UnLoginActivity" />
 
-        <activity android:name=".ui.login.activity.MainActivity" />
+        <activity android:name=".app.home.activity.MainActivity" />
 
-        <activity android:name=".ui.login.fragment.profile.setting.SettingActivity" />
+        <activity android:name=".app.settings.activity.SettingSwipeActivity" />
 
 
-        <activity android:name=".ui.login.fragment.home.imagedetaillist.ImageDetailsActivity" />
+        <activity android:name=".app.imgpreview.ImageDetailsActivity" />
 
-        <activity android:name=".ui.login.fragment.home.weiboitemdetail.activity.OriginPicTextCommentDetailActivity" />
+        <activity android:name=".app.weibodetail.activity.OriginPicTextCommentDetailSwipeActivity" />
 
-        <activity android:name=".ui.login.fragment.home.weiboitemdetail.activity.RetweetPicTextCommentDetailActivity" />
+        <activity android:name=".app.weibodetail.activity.RetweetPicTextCommentDetailSwipeActivity" />
 
-        <activity android:name=".ui.login.fragment.message.mention.MentionActivity" />
+        <activity android:name=".app.message.mention.activity.MentionSwipeActivity" />
 
-        <activity android:name=".ui.login.fragment.message.comment.CommentActivity" />
+        <activity android:name=".app.message.comment.activity.CommentSwipeActivity" />
 
-        <activity android:name=".ui.login.fragment.profile.myweibo.MyWeiBoActivity" />
+        <activity android:name=".app.myself.myweibo.activity.MyWeiBoSwipeActivity" />
 
-        <activity android:name=".ui.login.fragment.discovery.hotweibo.HotWeiBoActivity" />
+        <activity android:name=".app.discover.hotweibo.HotWeiBoSwipeActivity" />
 
-        <activity android:name=".ui.login.fragment.profile.followers.FollowerActivity" />
+        <activity android:name=".app.myself.fans.activity.FansSwipeActivity" />
 
-        <activity android:name=".ui.login.fragment.profile.friends.FriendsActivity" />
+        <activity android:name=".app.myself.focus.activity.FocusSwipeActivity" />
 
-        <activity android:name=".ui.login.fragment.home.userdetail.UserActivity" />
+        <activity android:name=".app.profile.activity.ProfileSwipeActivity" />
 
-        <activity android:name=".ui.login.fragment.post.PostActivity" />
+        <activity android:name=".app.login.fragment.post.PostSwipeActivity" />
 
         <activity
-            android:name=".ui.login.fragment.post.idea.IdeaActivity"
+            android:name=".app.login.fragment.post.idea.IdeaSwipeActivity"
             android:windowSoftInputMode="adjustResize" />
 
 
-        <activity android:name=".ui.login.fragment.post.picselect.activity.AlbumActivity" />
+        <activity android:name=".app.login.fragment.post.picselect.activity.AlbumSwipeActivity" />
 
-        <activity android:name=".ui.unlogin.activity.WebViewActivity" />
-        <activity android:name=".ui.login.fragment.profile.setting.accoutlist.AccoutActivity" />
-        <activity android:name=".ui.login.fragment.profile.favorites.FavoritiesActivity" />
-        <activity android:name=".ui.login.fragment.profile.myphoto.MyPhotoActivity" />
+        <activity android:name=".app.unlogin.activity.WebViewActivity" />
+        <activity android:name=".app.settings.accouts.activity.AccoutSwipeActivity" />
+        <activity android:name=".app.myself.collect.activity.CollectSwipeActivity" />
+        <activity android:name=".app.myself.myphoto.activity.MyPhotoSwipeActivity" />
 
-        <service android:name=".ui.login.fragment.post.PostService" />
+        <service android:name=".app.login.fragment.post.PostService" />
 
         <!-- 登录web界面-->
         <activity
@@ -97,7 +97,7 @@
             android:configChanges="keyboardHidden|orientation" />
 
         <activity
-            android:name=".ui.login.activity.BackgroundActivity"
+            android:name=".app.login.activity.BackgroundActivity"
             android:theme="@style/noAnimationTheme" />
 
     </application>

weiSwift/src/main/java/com/wenming/weiswift/MyApplication.java → weiSwift/src/main/java/com/wenming/weiswift/app/MyApplication.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *******************************************************************************/
-package com.wenming.weiswift;
+package com.wenming.weiswift.app;
 
 import android.app.Activity;
 import android.app.Application;
@@ -28,7 +28,7 @@
 import com.wenming.library.LogReport;
 import com.wenming.library.save.imp.CrashWriter;
 import com.wenming.library.upload.email.EmailReporter;
-import com.wenming.weiswift.ui.login.activity.BackgroundActivity;
+import com.wenming.weiswift.app.login.activity.BackgroundActivity;
 import com.wenming.weiswift.utils.LogUtil;
 import com.wenming.weiswift.utils.SharedPreferencesUtil;
 

weiSwift/src/main/java/com/wenming/weiswift/api/CommentsAPI.java → weiSwift/src/main/java/com/wenming/weiswift/app/api/CommentsAPI.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wenming.weiswift.api;
+package com.wenming.weiswift.app.api;
 
 import android.content.Context;
 import android.util.SparseArray;

weiSwift/src/main/java/com/wenming/weiswift/api/FavoritesAPI.java → weiSwift/src/main/java/com/wenming/weiswift/app/api/FavoritesAPI.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wenming.weiswift.api;
+package com.wenming.weiswift.app.api;
 
 import android.content.Context;
 

weiSwift/src/main/java/com/wenming/weiswift/api/FriendshipsAPI.java → weiSwift/src/main/java/com/wenming/weiswift/app/api/FriendshipsAPI.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wenming.weiswift.api;
+package com.wenming.weiswift.app.api;
 
 import android.content.Context;
 

weiSwift/src/main/java/com/wenming/weiswift/api/GroupAPI.java → weiSwift/src/main/java/com/wenming/weiswift/app/api/GroupAPI.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wenming.weiswift.api;
+package com.wenming.weiswift.app.api;
 
 import android.content.Context;
 import android.text.TextUtils;

weiSwift/src/main/java/com/wenming/weiswift/api/StatusesAPI.java → weiSwift/src/main/java/com/wenming/weiswift/app/api/StatusesAPI.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wenming.weiswift.api;
+package com.wenming.weiswift.app.api;
 
 import android.content.Context;
 import android.graphics.Bitmap;

weiSwift/src/main/java/com/wenming/weiswift/api/UsersAPI.java → weiSwift/src/main/java/com/wenming/weiswift/app/api/UsersAPI.java

@@ -1,4 +1,4 @@
-package com.wenming.weiswift.api;
+package com.wenming.weiswift.app.api;
 
 import android.content.Context;
 import android.util.SparseArray;

weiSwift/src/main/java/com/wenming/weiswift/app/common/AppConstants.java

@@ -0,0 +1,8 @@
+package com.wenming.weiswift.app.common;
+
+/**
+ * Created by wenmingvs on 2017/4/3.
+ */
+
+public class AppConstants {
+}

weiSwift/src/main/java/com/wenming/weiswift/ui/common/BarManager.java → weiSwift/src/main/java/com/wenming/weiswift/app/common/BarManager.java

@@ -1,4 +1,4 @@
-package com.wenming.weiswift.ui.common;
+package com.wenming.weiswift.app.common;
 
 import android.content.Context;
 import android.view.View;

weiSwift/src/main/java/com/wenming/weiswift/ui/common/BasePopupWindow.java → weiSwift/src/main/java/com/wenming/weiswift/app/common/BasePopupWindow.java

@@ -1,4 +1,4 @@
-package com.wenming.weiswift.ui.common;
+package com.wenming.weiswift.app.common;
 
 import android.animation.ValueAnimator;
 import android.app.Activity;

weiSwift/src/main/java/com/wenming/weiswift/ui/common/FillContent.java → weiSwift/src/main/java/com/wenming/weiswift/app/common/FillContent.java

@@ -1,4 +1,4 @@
-package com.wenming.weiswift.ui.common;
+package com.wenming.weiswift.app.common;
 
 import android.app.Activity;
 import android.content.Context;
@@ -29,19 +29,19 @@
 import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
 import com.nostra13.universalimageloader.utils.DiskCacheUtils;
 import com.wenming.weiswift.R;
-import com.wenming.weiswift.entity.Comment;
-import com.wenming.weiswift.entity.Status;
-import com.wenming.weiswift.entity.User;
-import com.wenming.weiswift.mvp.model.imp.StatusDetailModelImp;
-import com.wenming.weiswift.ui.login.fragment.home.imagedetaillist.ImageDetailsActivity;
-import com.wenming.weiswift.ui.login.fragment.home.imagedetaillist.SaveImageDialog;
-import com.wenming.weiswift.ui.login.fragment.home.timelineimagelist.ImageAdapter;
-import com.wenming.weiswift.ui.login.fragment.home.userdetail.UserActivity;
-import com.wenming.weiswift.ui.login.fragment.home.weiboitemdetail.activity.OriginPicTextCommentDetailActivity;
-import com.wenming.weiswift.ui.login.fragment.home.weiboitemdetail.activity.RetweetPicTextCommentDetailActivity;
-import com.wenming.weiswift.ui.login.fragment.home.weiboitemdetail.adapter.CommentDetailAdapter;
-import com.wenming.weiswift.ui.login.fragment.post.PostService;
-import com.wenming.weiswift.ui.login.fragment.post.idea.IdeaActivity;
+import com.wenming.weiswift.app.common.entity.Comment;
+import com.wenming.weiswift.app.common.entity.Status;
+import com.wenming.weiswift.app.common.entity.User;
+import com.wenming.weiswift.app.mvp.model.imp.StatusDetailModelImp;
+import com.wenming.weiswift.app.imgpreview.ImageDetailsActivity;
+import com.wenming.weiswift.app.imgpreview.SaveImageDialog;
+import com.wenming.weiswift.app.home.adapter.ImageAdapter;
+import com.wenming.weiswift.app.profile.activity.ProfileSwipeActivity;
+import com.wenming.weiswift.app.weibodetail.activity.OriginPicTextCommentDetailSwipeActivity;
+import com.wenming.weiswift.app.weibodetail.activity.RetweetPicTextCommentDetailSwipeActivity;
+import com.wenming.weiswift.app.home.adapter.CommentDetailAdapter;
+import com.wenming.weiswift.app.login.fragment.post.PostService;
+import com.wenming.weiswift.app.login.fragment.post.idea.IdeaSwipeActivity;
 import com.wenming.weiswift.utils.DateUtils;
 import com.wenming.weiswift.utils.NetUtil;
 import com.wenming.weiswift.utils.SharedPreferencesUtil;
@@ -103,7 +103,7 @@ public static void fillProfileImg(final Context context, final User user, final
         profile_img.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(context, UserActivity.class);
+                Intent intent = new Intent(context, ProfileSwipeActivity.class);
                 intent.putExtra("screenName", user.screen_name);
                 context.startActivity(intent);
             }
@@ -274,11 +274,11 @@ public static void fillButtonBar(final Context context, final Status status, Lin
             @Override
             public void onClick(View v) {
                 if (status.retweeted_status == null) {
-                    Intent intent = new Intent(context, OriginPicTextCommentDetailActivity.class);
+                    Intent intent = new Intent(context, OriginPicTextCommentDetailSwipeActivity.class);
                     intent.putExtra("weiboitem", status);
                     ((Activity) context).startActivityForResult(intent, 101);
                 } else {
-                    Intent intent = new Intent(context, RetweetPicTextCommentDetailActivity.class);
+                    Intent intent = new Intent(context, RetweetPicTextCommentDetailSwipeActivity.class);
                     intent.putExtra("weiboitem", status);
                     ((Activity) context).startActivityForResult(intent, 101);
                 }
@@ -288,7 +288,7 @@ public void onClick(View v) {
         bottombar_retweet.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(context, IdeaActivity.class);
+                Intent intent = new Intent(context, IdeaSwipeActivity.class);
                 intent.putExtra("ideaType", PostService.POST_SERVICE_REPOST_STATUS);
                 intent.putExtra("status", status);
                 context.startActivity(intent);
@@ -307,7 +307,7 @@ public static void fillDetailButtonBar(final Context context, final Status statu
         bottombar_comment.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(context, IdeaActivity.class);
+                Intent intent = new Intent(context, IdeaSwipeActivity.class);
                 intent.putExtra("ideaType", PostService.POST_SERVICE_COMMENT_STATUS);
                 intent.putExtra("status", status);
                 context.startActivity(intent);
@@ -317,7 +317,7 @@ public void onClick(View v) {
         bottombar_retweet.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(context, IdeaActivity.class);
+                Intent intent = new Intent(context, IdeaSwipeActivity.class);
                 intent.putExtra("ideaType", PostService.POST_SERVICE_REPOST_STATUS);
                 intent.putExtra("status", status);
                 context.startActivity(intent);

weiSwift/src/main/java/com/wenming/weiswift/ui/common/FillContentHelper.java → weiSwift/src/main/java/com/wenming/weiswift/app/common/FillContentHelper.java

@@ -1,9 +1,9 @@
-package com.wenming.weiswift.ui.common;
+package com.wenming.weiswift.app.common;
 
 import android.text.TextUtils;
 
-import com.wenming.weiswift.entity.Comment;
-import com.wenming.weiswift.entity.Status;
+import com.wenming.weiswift.app.common.entity.Comment;
+import com.wenming.weiswift.app.common.entity.Status;
 
 import java.util.Random;
 import java.util.regex.Matcher;

weiSwift/src/main/java/com/wenming/weiswift/ui/common/ImageUtil.java → weiSwift/src/main/java/com/wenming/weiswift/app/common/ImageUtil.java

@@ -1,4 +1,4 @@
-package com.wenming.weiswift.ui.common;
+package com.wenming.weiswift.app.common;
 
 import android.content.Context;
 import android.graphics.Bitmap;

weiSwift/src/main/java/com/wenming/weiswift/ui/common/NewFeature.java → weiSwift/src/main/java/com/wenming/weiswift/app/common/NewFeature.java

@@ -1,4 +1,4 @@
-package com.wenming.weiswift.ui.common;
+package com.wenming.weiswift.app.common;
 
 /**
  * Created by wenmingvs on 2016/1/6.

weiSwift/src/main/java/com/wenming/weiswift/ui/common/StatusBarUtils.java → weiSwift/src/main/java/com/wenming/weiswift/app/common/StatusBarUtils.java

@@ -1,4 +1,4 @@
-package com.wenming.weiswift.ui.common;
+package com.wenming.weiswift.app.common;
 
 import android.annotation.TargetApi;
 import android.app.Activity;

weiSwift/src/main/java/com/wenming/weiswift/app/common/base/BaseAppCompatActivity.java

@@ -0,0 +1,20 @@
+package com.wenming.weiswift.app.common.base;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+/**
+ * Created by wenmingvs on 2017/4/3.
+ */
+
+public class BaseAppCompatActivity extends AppCompatActivity {
+    protected Context mContext;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContext = this;
+    }
+}

weiSwift/src/main/java/com/wenming/weiswift/app/common/base/BaseFragment.java

@@ -0,0 +1,8 @@
+package com.wenming.weiswift.app.common.base;
+
+/**
+ * Created by wenmingvs on 2017/4/3.
+ */
+
+public class BaseFragment {
+}

weiSwift/src/main/java/com/wenming/weiswift/ui/common/BaseActivity.java → weiSwift/src/main/java/com/wenming/weiswift/app/common/base/BaseSwipeActivity.java

@@ -1,23 +1,24 @@
-package com.wenming.weiswift.ui.common;
+package com.wenming.weiswift.app.common.base;
 
 import android.os.Bundle;
 
 import com.wenming.swipebacklayout.SwipeBackLayout;
 import com.wenming.swipebacklayout.app.SwipeBackActivity;
 import com.wenming.weiswift.R;
+import com.wenming.weiswift.app.common.StatusBarUtils;
 import com.wenming.weiswift.utils.SharedPreferencesUtil;
 
 
 /**
  * Created by wenmingvs on 2016/6/27.
  */
-public class BaseActivity extends SwipeBackActivity {
+public class BaseSwipeActivity extends SwipeBackActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getSwipeBackLayout().setSwipeMode(SwipeBackLayout.FULL_SCREEN_LEFT);
         getSwipeBackLayout().setEdgeTrackingEnabled(SwipeBackLayout.EDGE_LEFT);
-        getSwipeBackLayout().setSensitivity(BaseActivity.this, 0.3f);
+        getSwipeBackLayout().setSensitivity(BaseSwipeActivity.this, 0.3f);
         boolean isNightMode = (boolean) SharedPreferencesUtil.get(this, "setNightMode", false);
         if (!isNightMode) {
             StatusBarUtils.from(this)