From a30829fe9029211ac9a55be83bb2673466f3ac91 Mon Sep 17 00:00:00 2001
From: Antipas <905002073@qq.com>
Date: Sun, 20 Sep 2015 15:52:37 +0800
Subject: [PATCH 1/9] fix bugs
---
app/app.iml | 56 +++++++++----------
.../activity/ArticleActivity.java | 2 +-
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/app/app.iml b/app/app.iml
index 4b7c8ae..cf73528 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -106,44 +106,44 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/ArticleActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/ArticleActivity.java
index 688ee8e..2801954 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/ArticleActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/ArticleActivity.java
@@ -196,7 +196,7 @@ public void parseJson(JSONObject response) {
(new FormHtmlAsyncTask(new WecenterImageGetter.Builder(ArticleActivity.this).padding(DisplayUtil.dip2px(ArticleActivity.this,20)).build(),contentWebView)).execute(artleInfo.getMessage());
signatureTextView.setText(artleInfo.getSignature());
contentWebView.setBackgroundColor(getResources().getColor(R.color.bg_color_grey));
- ImageLoader.getInstance().displayImage(artleInfo.getAvatar_file(), circleImageView, ImageOptions.optionsImage);
+ ImageLoader.getInstance().displayImage(RelativeUrl.AVATAR + artleInfo.getAvatar_file(), circleImageView, ImageOptions.optionsImage);
toolbar.setTitle(artleInfo.getArticleTitle());
// setShareContent(artleInfo.getArticleTitle(),"http://iflab.org");
From 609a65a37b333b33f65473837134d48fccefc0b0 Mon Sep 17 00:00:00 2001
From: Antipas <905002073@qq.com>
Date: Sat, 10 Oct 2015 21:47:04 +0800
Subject: [PATCH 2/9] add swipeback and animation
---
app/app.iml | 2 +
app/build.gradle | 2 +
.../activity/AnswerCommentActivity.java | 80 +++++++++++-
.../activity/BaseActivity.java | 4 +-
.../activity/LoginActivity.java | 12 +-
.../activity/PersonalAnswerActivity.java | 2 +-
.../activity/PersonalArticleActivity.java | 2 +-
.../activity/PersonalCenterEditActivity.java | 2 +-
.../activity/PersonalFollowingActivity.java | 2 +-
.../activity/PersonalQuestionActivity.java | 2 +-
.../activity/PersonalTopicActivity.java | 2 +-
.../activity/PhotoPickActivity.java | 2 +-
.../PublishAnswerArticleActivity.java | 45 ++++++-
.../activity/PublishPhotoDetailActivity.java | 2 +-
.../activity/PublishQuestionActivity.java | 2 +-
.../activity/QuestionAnswerActivity.java | 3 +
.../activity/QuestionDetailActivity.java | 2 +-
.../activity/ShareBaseActivity.java | 2 +-
.../activity/SwipeBackBaseActivity.java | 76 +++++++++++
.../activity/WencenterActivity.java | 20 +--
.../application/WecenterApplication.java | 2 +-
.../fragment/FoundChildFragment.java | 20 +--
.../fragment/HomePageFragment.java | 14 +-
.../http/AsyncHttpWecnter.java | 19 ++-
.../http/RelativeUrl.java | 3 +-
.../tools/DisplayUtil.java | 29 ++++-
.../ui/RevealBackgroundView.java | 123 ++++++++++++++++++
.../main/res/drawable-hdpi/shadow_left.png | Bin 0 -> 2865 bytes
app/src/main/res/drawable/shadow_top.xml | 10 ++
.../res/layout/activity_answer_comment.xml | 25 +++-
app/src/main/res/layout/activity_publish.xml | 11 +-
app/src/main/res/layout/nav_header.xml | 2 -
app/src/main/res/values/styles.xml | 2 +
33 files changed, 473 insertions(+), 53 deletions(-)
create mode 100644 app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/SwipeBackBaseActivity.java
create mode 100644 app/src/main/java/org/iflab/wecentermobileandroidrestructure/ui/RevealBackgroundView.java
create mode 100644 app/src/main/res/drawable-hdpi/shadow_left.png
create mode 100644 app/src/main/res/drawable/shadow_top.xml
diff --git a/app/app.iml b/app/app.iml
index cf73528..8b6e0e8 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -89,6 +89,7 @@
+
@@ -122,6 +123,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index 014f468..0e84834 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,6 +69,7 @@ dependencies {
compile 'com.github.chrisbanes.photoview:library:1.2.3'
compile 'com.google.code.gson:gson:2.3'
compile 'com.marshalchen.ultimaterecyclerview:library:0.3.9'
+ compile 'me.imid.swipebacklayout.lib:library:1.0.0'
compile files('libs/volley.jar')
compile 'com.jakewharton:butterknife:7.0.1'
compile files('src/main/libs/httpmime-4.1.3.jar')
@@ -79,6 +80,7 @@ dependencies {
compile files('src/main/libs/SocialSDK_WeiXin_1.jar')
compile files('src/main/libs/SocialSDK_WeiXin_2.jar')
compile files('src/main/libs/umeng_social_sdk.jar')
+
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
}
\ No newline at end of file
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/AnswerCommentActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/AnswerCommentActivity.java
index cd2c584..8ebdfa7 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/AnswerCommentActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/AnswerCommentActivity.java
@@ -1,9 +1,12 @@
package org.iflab.wecentermobileandroidrestructure.activity;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
+import android.support.v4.view.ViewCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
@@ -11,8 +14,13 @@
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.DecelerateInterpolator;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -29,14 +37,18 @@
import org.iflab.wecentermobileandroidrestructure.http.RelativeUrl;
import org.iflab.wecentermobileandroidrestructure.model.article.ArticleComment;
import org.iflab.wecentermobileandroidrestructure.model.question.CommentInfo;
+import org.iflab.wecentermobileandroidrestructure.tools.DisplayUtil;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
-public class AnswerCommentActivity extends AppCompatActivity {
+import butterknife.Bind;
+import butterknife.ButterKnife;
+public class AnswerCommentActivity extends BaseActivity {
+ public static final String ARG_DRAWING_START_LOCATION = "arg_drawing_start_location";
Toolbar toolbar;
SwipeRefreshLayout refreshLayout;
RecyclerView recyclerView;
@@ -51,11 +63,21 @@ public class AnswerCommentActivity extends AppCompatActivity {
InputMethodManager inputManager;
boolean isArticle;
int atUid = -1;
+ int drawingStartLocation;
+
+ @Bind(R.id.contentRoot)
+ FrameLayout contentRoot;
+
+ @Bind(R.id.llAddComment)
+ LinearLayout llAddComment;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_answer_comment);
+ ButterKnife.bind(this);
+ overridePendingTransition(0, 0);
answerID = getIntent().getIntExtra("answer_id", -1);
articleID = getIntent().getIntExtra("article_id",1);
@@ -63,6 +85,18 @@ protected void onCreate(Bundle savedInstanceState) {
setViews();
setToolBars();
+ drawingStartLocation = getIntent().getIntExtra(ARG_DRAWING_START_LOCATION, 0);
+ if (savedInstanceState == null) {
+ contentRoot.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+ @Override
+ public boolean onPreDraw() {
+ contentRoot.getViewTreeObserver().removeOnPreDrawListener(this);
+ startIntroAnimation();
+ return true;
+ }
+ });
+ }
+
if(answerID != -1){
commentsList = new ArrayList<>();
loadData();
@@ -75,6 +109,33 @@ protected void onCreate(Bundle savedInstanceState) {
}
+ private void startIntroAnimation() {
+ ViewCompat.setElevation(toolbar, 0);
+ contentRoot.setScaleY(0.1f);
+ contentRoot.setPivotY(drawingStartLocation);
+ llAddComment.setTranslationY(200);
+
+ contentRoot.animate()
+ .scaleY(1)
+ .setDuration(200)
+ .setInterpolator(new AccelerateInterpolator())
+ .setListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ ViewCompat.setElevation(toolbar, DisplayUtil.dip2px(getApplicationContext(),8));
+ animateContent();
+ }
+ })
+ .start();
+ }
+
+ private void animateContent() {
+ llAddComment.animate().translationY(0)
+ .setInterpolator(new DecelerateInterpolator())
+ .setDuration(200)
+ .start();
+ }
+
private void findViews() {
toolbar = (Toolbar)findViewById(R.id.toolbar);
@@ -221,7 +282,7 @@ public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
}.getType());
commentsAdapter = new CommentsAdapter(AnswerCommentActivity.this, commentsList, new OnClickItemCallBack() {
@Override
- public void clickItemCallBack(String userName,int userID) {
+ public void clickItemCallBack(String userName, int userID) {
atUid = userID;
commentEdt.setText("@" + userName + " ");
commentEdt.setFocusable(true);
@@ -248,6 +309,21 @@ public void onFinish() {
});
}
+ @Override
+ public void onBackPressed() {
+ ViewCompat.setElevation(toolbar, 0);
+ contentRoot.animate()
+ .translationY(DisplayUtil.getScreenHeight(this))
+ .setDuration(200)
+ .setListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ AnswerCommentActivity.super.onBackPressed();
+ }
+ })
+ .start();
+ }
+
private void showNoComment(){
final Snackbar snackbar = Snackbar.make(refreshLayout,"没有评论",Snackbar.LENGTH_SHORT);
snackbar.show();
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/BaseActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/BaseActivity.java
index bc1f04d..cc93935 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/BaseActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/BaseActivity.java
@@ -61,8 +61,8 @@ public void toastNo200() {
@Override
protected void onDestroy() {
super.onDestroy();
- RefWatcher refWatcher = WecenterApplication.getRefWatcher(getApplication());
- refWatcher.watch(this);
+// RefWatcher refWatcher = WecenterApplication.getRefWatcher(getApplication());
+// refWatcher.watch(this);
}
@Override
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/LoginActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/LoginActivity.java
index ab5e2ca..11826cc 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/LoginActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/LoginActivity.java
@@ -40,10 +40,17 @@ public class LoginActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
+ if(User.getLoginUser(getApplicationContext()).getUid() != -1){
+ startActivity(new Intent(LoginActivity.this, WencenterActivity.class));
+ finish();
+ }
+
setContentView(R.layout.activity_login);
findViews();
setViews();
setListeners();
+
}
protected void findViews() {
@@ -73,16 +80,15 @@ public void onClick(View v) {
private void login() {
String usernameString = userName.getText().toString();
- User user = User.getLoginUser(getApplicationContext());
// usernameString = user.getUserName();
-// usernameString = "hc";
+ usernameString = "Lyn";
if (usernameString.equals("")) {
toast("用户名不能为空");
return;
}
String passWordString = passWord.getText().toString();
-// passWordString = "huahua";
+ passWordString = "935600f12";
if (passWordString.equals("")) {
toast("密码不能为空");
return;
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalAnswerActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalAnswerActivity.java
index 6f7b836..3383043 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalAnswerActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalAnswerActivity.java
@@ -28,7 +28,7 @@
import java.util.ArrayList;
import java.util.List;
-public class PersonalAnswerActivity extends AppCompatActivity {
+public class PersonalAnswerActivity extends SwipeBackBaseActivity {
private EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener;
private RecyclerView recyclerView;
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalArticleActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalArticleActivity.java
index 728ca6c..7d5aa46 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalArticleActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalArticleActivity.java
@@ -31,7 +31,7 @@
* @time 15/8/15 17:33
*/
-public class PersonalArticleActivity extends BaseActivity{
+public class PersonalArticleActivity extends SwipeBackBaseActivity{
private EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener;
private RecyclerView recyclerView;
private SwipeRefreshLayout refreshLayout;
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalCenterEditActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalCenterEditActivity.java
index ccb6f10..b4d152b 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalCenterEditActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalCenterEditActivity.java
@@ -50,7 +50,7 @@
* Created by hcjcch on 15/6/6.
*/
-public class PersonalCenterEditActivity extends BaseActivity {
+public class PersonalCenterEditActivity extends SwipeBackBaseActivity {
private Uri fileUri;
private final int RESULT_REQUEST_PHOTO = 1005;
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalFollowingActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalFollowingActivity.java
index cdb0e7c..331e2cb 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalFollowingActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalFollowingActivity.java
@@ -28,7 +28,7 @@
import java.util.ArrayList;
import java.util.List;
-public class PersonalFollowingActivity extends AppCompatActivity {
+public class PersonalFollowingActivity extends SwipeBackBaseActivity {
public static final String FOLLOWING = "following";
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalQuestionActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalQuestionActivity.java
index 2814ad2..1b0ec3f 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalQuestionActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalQuestionActivity.java
@@ -26,7 +26,7 @@
import java.util.ArrayList;
import java.util.List;
-public class PersonalQuestionActivity extends AppCompatActivity {
+public class PersonalQuestionActivity extends SwipeBackBaseActivity {
private RecyclerView recyclerView;
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalTopicActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalTopicActivity.java
index 737dfb0..be21a40 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalTopicActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalTopicActivity.java
@@ -34,7 +34,7 @@
import java.util.ArrayList;
import java.util.List;
-public class PersonalTopicActivity extends AppCompatActivity {
+public class PersonalTopicActivity extends SwipeBackBaseActivity {
private EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener;
private RecyclerView recyclerView;
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PhotoPickActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PhotoPickActivity.java
index e5a15cd..2ce3059 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PhotoPickActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PhotoPickActivity.java
@@ -43,7 +43,7 @@
* Created by hcjcch on 15/5/22.
*/
-public class PhotoPickActivity extends BaseActivity implements LoaderManager.LoaderCallbacks {
+public class PhotoPickActivity extends SwipeBackBaseActivity implements LoaderManager.LoaderCallbacks {
final int RESULT_CAMERA = 21;
private PhotoPickGridAdapter photoPickGridAdapter;
private GridView photoGridview;
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PublishAnswerArticleActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PublishAnswerArticleActivity.java
index 026998d..c5f09a2 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PublishAnswerArticleActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PublishAnswerArticleActivity.java
@@ -10,10 +10,12 @@
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import android.view.ViewTreeObserver;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.EditText;
import android.widget.RelativeLayout;
+import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
@@ -31,6 +33,7 @@
import org.iflab.wecentermobileandroidrestructure.tools.MD5Transform;
import org.iflab.wecentermobileandroidrestructure.tools.RecycleBitmapInLayout;
import org.iflab.wecentermobileandroidrestructure.ui.AutoHeightGridView;
+import org.iflab.wecentermobileandroidrestructure.ui.RevealBackgroundView;
import org.json.JSONException;
import org.json.JSONObject;
@@ -48,12 +51,12 @@
/**
* Created by hcjcch on 15/5/23.
*/
-public class PublishAnswerArticleActivity extends BaseActivity {
+public class PublishAnswerArticleActivity extends SwipeBackBaseActivity implements RevealBackgroundView.OnStateChangeListener{
public static final String PUBLISH_QUESTION = "publih_question";
public static final String PUBLISH_ARTICLE = "publish_article";
public static final String PUBLISH_ANSWER = "publish_answer";
-
+ public static final String ARG_REVEAL_START_LOCATION = "reveal_start_location";
private String publishType;
public static final String PUBLISH_TYPE_INTENT = "publish_type";
public static final String QUESTION_ID_INTENT = "question_id";
@@ -86,6 +89,11 @@ public class PublishAnswerArticleActivity extends BaseActivity {
@Bind(R.id.txt_title)
TextView txt_title;
+ @Bind(R.id.vRevealBackground)
+ RevealBackgroundView vRevealBackground;
+
+ @Bind(R.id.sv_root)
+ ScrollView rel_root;
private String url;
private Intent intent;
private int questionId;
@@ -95,6 +103,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_publish);
ButterKnife.bind(this);
+ setupRevealBackground(savedInstanceState);
photoOperate = new PhotoOperate(getApplicationContext());
intent = getIntent();
publishType = intent.getStringExtra(PUBLISH_TYPE_INTENT);
@@ -102,6 +111,7 @@ protected void onCreate(Bundle savedInstanceState) {
findViews();
setViews();
setToolBars();
+
}
private void setPublishId() {
@@ -144,6 +154,24 @@ private void findViews() {
toolbar = (Toolbar) findViewById(R.id.toolbar);
}
+ private void setupRevealBackground(Bundle savedInstanceState) {
+ vRevealBackground.setFillPaintColor(getResources().getColor(R.color.primary_pressed));
+ vRevealBackground.setOnStateChangeListener(this);
+ if (savedInstanceState == null) {
+ final int[] startingLocation = getIntent().getIntArrayExtra(ARG_REVEAL_START_LOCATION);
+ vRevealBackground.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+ @Override
+ public boolean onPreDraw() {
+ vRevealBackground.getViewTreeObserver().removeOnPreDrawListener(this);
+ vRevealBackground.startFromLocation(startingLocation);
+ return true;
+ }
+ });
+ } else {
+ vRevealBackground.setToFinishedFrame();
+ }
+ }
+
private void setViews() {
attachmentGridAdapter = new AttachmentGridAdapter(mData,getApplicationContext());
gridView.setAdapter(attachmentGridAdapter);
@@ -237,6 +265,15 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
} else super.onActivityResult(requestCode, resultCode, data);
}
+ @Override
+ public void onStateChange(int state) {
+ if (RevealBackgroundView.STATE_FINISHED == state) {
+ vRevealBackground.setVisibility(View.GONE);
+ rel_root.setVisibility(View.VISIBLE);
+ titleEditText.requestFocus();
+ }
+ }
+
public static class PhotoData {
Uri uri = Uri.parse("");
String serviceUri = "";
@@ -276,7 +313,7 @@ private void uploadAttachment(final File attachment) throws FileNotFoundExceptio
params.put("attach_access_key", attach_access_key);
params.put("qqfile", attachment);
System.out.println(publishId + " " + attach_access_key + " " + attachment);
- AsyncHttpWecnter.loadData(getApplicationContext(), RelativeUrl.ATTACHMENT_UPLOAD, params, AsyncHttpWecnter.Request.Post, new UploadNetWork(attachIds,hashtable,attachment));
+ AsyncHttpWecnter.loadData(getApplicationContext(), RelativeUrl.ATTACHMENT_UPLOAD, params, AsyncHttpWecnter.Request.Post, new UploadNetWork(attachIds, hashtable, attachment));
}
private static class UploadNetWork extends NetWork{
@@ -379,6 +416,8 @@ protected void onDestroy() {
attachIds.clear();
RecycleBitmapInLayout.getInstance(false).recycle(gridView);
+ mData.clear();
+ attachmentGridAdapter.notifyDataSetChanged();
}
@Override
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PublishPhotoDetailActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PublishPhotoDetailActivity.java
index 25098f0..3f62d2a 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PublishPhotoDetailActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PublishPhotoDetailActivity.java
@@ -22,7 +22,7 @@
/**
* Created by hcjcch on 15/6/20.
*/
-public class PublishPhotoDetailActivity extends BaseActivity {
+public class PublishPhotoDetailActivity extends SwipeBackBaseActivity {
private PhotoViewPager pager;
private ArrayList arrUri;
private int position;
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PublishQuestionActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PublishQuestionActivity.java
index ae6bfba..16f50b3 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PublishQuestionActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PublishQuestionActivity.java
@@ -39,7 +39,7 @@
import butterknife.Bind;
import butterknife.ButterKnife;
-public class PublishQuestionActivity extends AppCompatActivity {
+public class PublishQuestionActivity extends SwipeBackBaseActivity {
@Bind(R.id.toolbar)
Toolbar toolbar;
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/QuestionAnswerActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/QuestionAnswerActivity.java
index a823d97..289e8b2 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/QuestionAnswerActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/QuestionAnswerActivity.java
@@ -157,6 +157,9 @@ public void gotoShare(View view){
public void gotoComment(View view){
Intent intent = new Intent(QuestionAnswerActivity.this,AnswerCommentActivity.class);
intent.putExtra("answer_id", answerID);
+ int[] startingLocation = new int[2];
+ view.getLocationOnScreen(startingLocation);
+ intent.putExtra(AnswerCommentActivity.ARG_DRAWING_START_LOCATION,startingLocation[1]);
startActivity(intent);
}
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/QuestionDetailActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/QuestionDetailActivity.java
index 4d4ca9e..0489d10 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/QuestionDetailActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/QuestionDetailActivity.java
@@ -49,7 +49,7 @@
import java.util.Iterator;
import java.util.List;
-public class QuestionDetailActivity extends BaseActivity implements View.OnClickListener {
+public class QuestionDetailActivity extends SwipeBackBaseActivity implements View.OnClickListener {
private Toolbar toolbar;
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/ShareBaseActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/ShareBaseActivity.java
index 8b25887..1aa97ea 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/ShareBaseActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/ShareBaseActivity.java
@@ -19,7 +19,7 @@
/**
* Created by Lyn on 15/8/23.
*/
-public class ShareBaseActivity extends BaseActivity implements ShareRegister {
+public class ShareBaseActivity extends SwipeBackBaseActivity implements ShareRegister {
UMSocialService mController;
String shareUrl = "www.wecenter.com";
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/SwipeBackBaseActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/SwipeBackBaseActivity.java
new file mode 100644
index 0000000..31f5c80
--- /dev/null
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/SwipeBackBaseActivity.java
@@ -0,0 +1,76 @@
+package org.iflab.wecentermobileandroidrestructure.activity;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+
+import com.nostra13.universalimageloader.core.ImageLoader;
+
+import me.imid.swipebacklayout.lib.SwipeBackLayout;
+import me.imid.swipebacklayout.lib.Utils;
+import me.imid.swipebacklayout.lib.app.SwipeBackActivityBase;
+import me.imid.swipebacklayout.lib.app.SwipeBackActivityHelper;
+
+/**
+ * Created by Lyn on 15/10/8.
+ */
+public class SwipeBackBaseActivity extends BaseActivity implements SwipeBackActivityBase {
+ private SwipeBackActivityHelper mHelper;
+
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mHelper = new SwipeBackActivityHelper(this);
+ mHelper.onActivityCreate();
+
+ }
+
+ @Override
+ protected void onPostCreate(Bundle savedInstanceState) {
+ super.onPostCreate(savedInstanceState);
+ mHelper.onPostCreate();
+ }
+
+ @Override
+ public View findViewById(int id) {
+ View v = super.findViewById(id);
+ if (v == null && mHelper != null)
+ return mHelper.findViewById(id);
+ return v;
+ }
+
+ @Override
+ public SwipeBackLayout getSwipeBackLayout() {
+ return mHelper.getSwipeBackLayout();
+ }
+
+ @Override
+ public void setSwipeBackEnable(boolean enable) {
+ getSwipeBackLayout().setEnableGesture(enable);
+ }
+
+ @Override
+ public void scrollToFinishActivity() {
+ Utils.convertActivityToTranslucent(this);
+ getSwipeBackLayout().scrollToFinishActivity();
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+// RefWatcher refWatcher = WecenterApplication.getRefWatcher(getApplication());
+// refWatcher.watch(this);
+
+ }
+
+ @Override
+ public void onTrimMemory(int level) {
+ super.onTrimMemory(level);
+ if(level >=TRIM_MEMORY_MODERATE){
+ ImageLoader.getInstance().clearDiskCache();
+ ImageLoader.getInstance().clearMemoryCache();
+ Log.e("TRIM_MEMORY_MODERATE", "clear ImageLoader Cache...");
+ }
+ }
+}
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/WencenterActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/WencenterActivity.java
index d1dea09..044c4a6 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/WencenterActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/WencenterActivity.java
@@ -11,6 +11,7 @@
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.widget.Toolbar;
import android.text.TextUtils;
+import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -32,6 +33,7 @@
import org.iflab.wecentermobileandroidrestructure.fragment.HomePageFragment;
import org.iflab.wecentermobileandroidrestructure.fragment.SearchFragment;
import org.iflab.wecentermobileandroidrestructure.http.AsyncHttpWecnter;
+import org.iflab.wecentermobileandroidrestructure.http.RelativeUrl;
import org.iflab.wecentermobileandroidrestructure.model.User;
import org.iflab.wecentermobileandroidrestructure.tools.ImageOptions;
@@ -56,8 +58,10 @@ public class WencenterActivity extends BaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.avtivity_wencenter);
+
findViews();
setToolbar();
+ getUserData();
mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, toolbar, R.string.hello_world, R.string.hello_world) {
@Override
public void onDrawerOpened(View drawerView) {
@@ -214,21 +218,20 @@ public void onConfigurationChanged(Configuration newConfig) {
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
+
+
+ }
+
+ private void getUserData() {
User user = User.getLoginUser(this);
if (user != null) {
- ImageLoader.getInstance().displayImage(user.getAvatarFile(), profile_image, ImageOptions.optionsImagePersonalDetailAvatar);
+ ImageLoader.getInstance().displayImage(RelativeUrl.AVATAR + user.getAvatarFile(), profile_image, ImageOptions.optionsImagePersonalDetailAvatar);
+// Log.v("avatar",RelativeUrl.AVATAR + user.getAvatarFile());
user_name.setText(user.getUserName());
if (!TextUtils.isEmpty(user.getSignNature())) {
user_signature.setText(user.getSignNature());
- } else {
- getUserData();
}
}
-
- }
-
- private void getUserData() {
-
}
public boolean onKeyDown(int keyCode, KeyEvent event) {
@@ -250,4 +253,5 @@ protected void onDestroy() {
super.onDestroy();
ImageLoader.getInstance().clearMemoryCache();
}
+
}
\ No newline at end of file
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/application/WecenterApplication.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/application/WecenterApplication.java
index ebab21e..4f3cf50 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/application/WecenterApplication.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/application/WecenterApplication.java
@@ -29,7 +29,7 @@ public void onCreate() {
sWidthPix = getResources().getDisplayMetrics().widthPixels;
sHeightPix = getResources().getDisplayMetrics().heightPixels;
initImageLoader(getApplicationContext());
- initRefWatcher();
+// initRefWatcher();
}
private void initRefWatcher() {
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/fragment/FoundChildFragment.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/fragment/FoundChildFragment.java
index bdcdafa..b3b2363 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/fragment/FoundChildFragment.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/fragment/FoundChildFragment.java
@@ -135,18 +135,19 @@ public void parseJson(JSONObject response) {
QuestionInfo questionInfo = new QuestionInfo();
questionInfo.setQuestionId(row.getInt("question_id"));
questionInfo.setQuestionContent(row.getString("question_content"));
- questionInfo.setQuestionDetail(row.getString("question_detail"));
+// questionInfo.setQuestionDetail(row.getString("question_detail"));
+ questionInfo.setQuestionDetail("no question_detail...");
questionInfo.setUpdateTime(row.getString("update_time"));
questionInfo.setType(post_type);
int answerCount = row.getInt("answer_count");
- if (answerCount != 0) {
- JSONObject answerObject = row.getJSONObject("answer");
- JSONObject userInfoObject = answerObject.getJSONObject("user_info");
- questionInfo.setAnswerUid(userInfoObject.getInt("uid"));
- questionInfo.setAnswerUserName(userInfoObject.getString("user_name"));
- questionInfo.setAnswerAvatarFile(userInfoObject.getString("avatar_file"));
- questionInfo.setAnswerContent(answerObject.getString("answer_content"));
- }
+// if (answerCount != 0) {
+// JSONObject answerObject = row.getJSONObject("answer");
+// JSONObject userInfoObject = answerObject.getJSONObject("user_info");
+// questionInfo.setAnswerUid(userInfoObject.getInt("uid"));
+// questionInfo.setAnswerUserName(userInfoObject.getString("user_name"));
+// questionInfo.setAnswerAvatarFile(userInfoObject.getString("avatar_file"));
+// questionInfo.setAnswerContent(answerObject.getString("answer_content"));
+// }
JSONObject userInfoObject = row.getJSONObject("user_info");
questionInfo.setPublishUid(userInfoObject.getInt("uid"));
questionInfo.setPublishUserName(userInfoObject.getString("user_name"));
@@ -154,6 +155,7 @@ public void parseJson(JSONObject response) {
foundDatas.add(questionInfo);
} catch (Exception e) {
e.printStackTrace();
+ Toast.makeText(getActivity().getApplicationContext(),"失败接口: "+RelativeUrl.FOUND+" 缺少question_detail字段",Toast.LENGTH_LONG).show();
}
} else if (post_type.equalsIgnoreCase("article")) {
try {
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/fragment/HomePageFragment.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/fragment/HomePageFragment.java
index bf9584a..55e85bc 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/fragment/HomePageFragment.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/fragment/HomePageFragment.java
@@ -7,6 +7,7 @@
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -110,10 +111,15 @@ public void onRefresh() {
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+
+ int[] startingLocation = new int[2];
+ v.getLocationOnScreen(startingLocation);
+ startingLocation[0] += v.getWidth() / 2;
Intent intent = new Intent(getActivity().getApplicationContext(), PublishAnswerArticleActivity.class);
intent.putExtra(PublishAnswerArticleActivity.PUBLISH_TYPE_INTENT,PublishAnswerArticleActivity.PUBLISH_QUESTION);
+ intent.putExtra(PublishAnswerArticleActivity.ARG_REVEAL_START_LOCATION, startingLocation);
startActivity(intent);
-
+ getActivity().overridePendingTransition(0, 0);
}
});
endlessRecyclerOnScrollListener = new EndlessRecyclerOnScrollListener(linearLayoutManager) {
@@ -251,4 +257,10 @@ private void refreshReset() {
loadMore = true;
endlessRecyclerOnScrollListener.reset();
}
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ homePages.clear();
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/AsyncHttpWecnter.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/AsyncHttpWecnter.java
index 4340926..6a00e37 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/AsyncHttpWecnter.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/AsyncHttpWecnter.java
@@ -16,6 +16,7 @@
import org.apache.http.Header;
import org.iflab.wecentermobileandroidrestructure.common.NetWork;
+import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -26,7 +27,8 @@
public class AsyncHttpWecnter {
public static final String TAG = "AsyncHttpWecnter";
- public static final String BASE_URL = "http://we.bistu.edu.cn/";
+// public static final String BASE_URL = "http://we.bistu.edu.cn/";
+public static final String BASE_URL = "http://we.edustack.org/";
public static AsyncHttpClient client = new AsyncHttpClient();
/**
@@ -97,11 +99,24 @@ public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
@Override
public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
- Log.d(TAG, "失败 [url:\" + url + \"]" + responseString);
+ Log.d(TAG, "失败 [url:" + url +" ]" + responseString);
//TODO 访问失败
+ Toast.makeText(context.getApplicationContext(),"失败接口: "+url+" 信息:"+responseString.toString(),Toast.LENGTH_LONG).show();
netWork.failure();
}
+ @Override
+ public void onFailure(int statusCode, Header[] headers, Throwable throwable, JSONObject errorResponse) {
+ super.onFailure(statusCode, headers, throwable, errorResponse);
+ Toast.makeText(context.getApplicationContext(),"失败接口: "+url+" 信息:"+errorResponse.toString(),Toast.LENGTH_LONG).show();
+ }
+
+ @Override
+ public void onFailure(int statusCode, Header[] headers, Throwable throwable, JSONArray errorResponse) {
+ super.onFailure(statusCode, headers, throwable, errorResponse);
+ Toast.makeText(context.getApplicationContext(),"失败接口: "+url+" 信息:"+errorResponse.toString(),Toast.LENGTH_LONG).show();
+ }
+
@Override
public void onFinish() {
netWork.finish();
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/RelativeUrl.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/RelativeUrl.java
index 7bb9a6a..961ba04 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/RelativeUrl.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/RelativeUrl.java
@@ -4,7 +4,8 @@
* Created by hcjcch on 15/5/17.
*/
public class RelativeUrl {
- public static String AVATAR = "http://we.bistu.edu.cn/uploads/avatar/";//头像文件夹
+// public static String AVATAR = "http://we.bistu.edu.cn/uploads/avatar/";//头像文件夹
+ public static String AVATAR = "http://we.edustack.org/uploads/avatar/";
public static String USER_LOGIN = "?/api/account/login_process/"; //登录
public static String HOME_PAGE = "?/api/home/"; //首页
public static String USER_INFO = "?/api/account/get_userinfo/";//用户信息
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/tools/DisplayUtil.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/tools/DisplayUtil.java
index fa7a7f8..9b58ec1 100755
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/tools/DisplayUtil.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/tools/DisplayUtil.java
@@ -1,10 +1,14 @@
package org.iflab.wecentermobileandroidrestructure.tools;
import android.content.Context;
+import android.graphics.Point;
+import android.view.Display;
+import android.view.WindowManager;
public class DisplayUtil {
-
+ private static int screenWidth = 0;
+ private static int screenHeight = 0;
/**
* 将px值转换为dip或dp值
*/
@@ -42,4 +46,27 @@ public static int sp2px(Context context, float spValue) {
return (int) (spValue * fontScale + 0.5f);
}
+ public static int getScreenHeight(Context c) {
+ if (screenHeight == 0) {
+ WindowManager wm = (WindowManager) c.getSystemService(Context.WINDOW_SERVICE);
+ Display display = wm.getDefaultDisplay();
+ Point size = new Point();
+ display.getSize(size);
+ screenHeight = size.y;
+ }
+
+ return screenHeight;
+ }
+
+ public static int getScreenWidth(Context c) {
+ if (screenWidth == 0) {
+ WindowManager wm = (WindowManager) c.getSystemService(Context.WINDOW_SERVICE);
+ Display display = wm.getDefaultDisplay();
+ Point size = new Point();
+ display.getSize(size);
+ screenWidth = size.x;
+ }
+
+ return screenWidth;
+ }
}
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/ui/RevealBackgroundView.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/ui/RevealBackgroundView.java
new file mode 100644
index 0000000..fef2789
--- /dev/null
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/ui/RevealBackgroundView.java
@@ -0,0 +1,123 @@
+package org.iflab.wecentermobileandroidrestructure.ui;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ObjectAnimator;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.Interpolator;
+
+/**
+ * Created by Miroslaw Stanek on 18.01.15.
+ */
+public class RevealBackgroundView extends View {
+ public static final int STATE_NOT_STARTED = 0;
+ public static final int STATE_FILL_STARTED = 1;
+ public static final int STATE_FINISHED = 2;
+
+ private static final Interpolator INTERPOLATOR = new AccelerateInterpolator();
+ private static final int FILL_TIME = 400;
+
+ private int state = STATE_NOT_STARTED;
+
+ private Paint fillPaint;
+ private int currentRadius;
+ ObjectAnimator revealAnimator;
+
+ private int startLocationX;
+ private int startLocationY;
+
+
+ private OnStateChangeListener onStateChangeListener;
+
+ public RevealBackgroundView(Context context) {
+ super(context);
+ init();
+ }
+
+ public RevealBackgroundView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ init();
+ }
+
+ public RevealBackgroundView(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ init();
+ }
+
+ @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+ public RevealBackgroundView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ init();
+ }
+
+ private void init() {
+ fillPaint = new Paint();
+ fillPaint.setStyle(Paint.Style.FILL);
+ fillPaint.setColor(Color.WHITE);
+ }
+
+ public void setFillPaintColor(int color) {
+ fillPaint.setColor(color);
+ }
+
+ public void startFromLocation(int[] tapLocationOnScreen) {
+ changeState(STATE_FILL_STARTED);
+ startLocationX = tapLocationOnScreen[0];
+ startLocationY = tapLocationOnScreen[1];
+ revealAnimator = ObjectAnimator.ofInt(this, "currentRadius", 0, getWidth() + getHeight()).setDuration(FILL_TIME);
+ revealAnimator.setInterpolator(INTERPOLATOR);
+ revealAnimator.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ changeState(STATE_FINISHED);
+ }
+ });
+ revealAnimator.start();
+ }
+
+ public void setToFinishedFrame() {
+ changeState(STATE_FINISHED);
+ invalidate();
+ }
+
+ @Override
+ protected void onDraw(Canvas canvas) {
+ if (state == STATE_FINISHED) {
+ canvas.drawRect(0, 0, getWidth(), getHeight(), fillPaint);
+ } else {
+ canvas.drawCircle(startLocationX, startLocationY, currentRadius, fillPaint);
+ }
+ }
+
+ private void changeState(int state) {
+ if (this.state == state) {
+ return;
+ }
+
+ this.state = state;
+ if (onStateChangeListener != null) {
+ onStateChangeListener.onStateChange(state);
+ }
+ }
+
+ public void setOnStateChangeListener(OnStateChangeListener onStateChangeListener) {
+ this.onStateChangeListener = onStateChangeListener;
+ }
+
+ public void setCurrentRadius(int radius) {
+ this.currentRadius = radius;
+ invalidate();
+ }
+
+ public static interface OnStateChangeListener {
+ void onStateChange(int state);
+ }
+}
diff --git a/app/src/main/res/drawable-hdpi/shadow_left.png b/app/src/main/res/drawable-hdpi/shadow_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..82c71c2f280955778b1b314eaa929a984152a921
GIT binary patch
literal 2865
zcmV-13(oY3P)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)In3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C
z0A5K%K~#9!?9MR?z%UF0Kso9Ezw9m#sw9%V$4s
zjC|lAARr(hARr(hARr(hARr(hARr(hARr(hARr(hARzvVxB&nF|NjF3ER+M?iLvGh
P00000NkvXXu0mjfWSMC2
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable/shadow_top.xml b/app/src/main/res/drawable/shadow_top.xml
new file mode 100644
index 0000000..6613e85
--- /dev/null
+++ b/app/src/main/res/drawable/shadow_top.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_answer_comment.xml b/app/src/main/res/layout/activity_answer_comment.xml
index 73095e0..79b0118 100644
--- a/app/src/main/res/layout/activity_answer_comment.xml
+++ b/app/src/main/res/layout/activity_answer_comment.xml
@@ -14,15 +14,28 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/toolbar"
- android:layout_above="@+id/linearLayout2">
+ android:layout_above="@+id/llAddComment">
-
+ android:id="@+id/contentRoot"
+ android:background="@color/white">
-
+
+
+
+
+
+
@@ -33,7 +46,7 @@
android:layout_alignParentBottom="true"
android:background="@drawable/rectangle"
android:padding="0.5dp"
- android:id="@+id/linearLayout2">
+ android:id="@+id/llAddComment">
+
+
+
+
+ android:layout_below="@id/toolbar"
+ android:id="@+id/sv_root"
+ android:visibility="gone">
@color/toolbar_color
- true
- false
+ - true
+
+
+
+
+
diff --git a/build.gradle b/build.gradle
index 92ef976..60a5b9f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.0.0-alpha1'
+ classpath 'com.android.tools.build:gradle:1.3.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
From 2beb15dc0cad91819a13692d5b1b8add23ee4d8b Mon Sep 17 00:00:00 2001
From: Antipas <905002073@qq.com>
Date: Wed, 2 Mar 2016 18:33:12 +0800
Subject: [PATCH 8/9] first fix
---
.../activity/PersonalCenterActivity.java | 2 +-
.../activity/WencenterActivity.java | 8 ++++----
app/src/main/res/layout/fragment_homepage.xml | 2 +-
app/src/main/res/mipmap-xhdpi/explore.png | Bin 0 -> 1834 bytes
app/src/main/res/mipmap-xhdpi/home.png | Bin 0 -> 1863 bytes
app/src/main/res/mipmap-xhdpi/search.png | Bin 0 -> 1918 bytes
app/src/main/res/mipmap-xhdpi/user.png | Bin 0 -> 1495 bytes
app/src/main/res/mipmap-xhdpi/write.png | Bin 0 -> 1667 bytes
8 files changed, 6 insertions(+), 6 deletions(-)
create mode 100644 app/src/main/res/mipmap-xhdpi/explore.png
create mode 100644 app/src/main/res/mipmap-xhdpi/home.png
create mode 100644 app/src/main/res/mipmap-xhdpi/search.png
create mode 100644 app/src/main/res/mipmap-xhdpi/user.png
create mode 100644 app/src/main/res/mipmap-xhdpi/write.png
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalCenterActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalCenterActivity.java
index c786f99..a7ec453 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalCenterActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/PersonalCenterActivity.java
@@ -227,7 +227,7 @@ public void parseJson(JSONObject response) {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.menu_wencenter, menu);
+// getMenuInflater().inflate(R.menu.menu_wencenter, menu);
return true;
}
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/WencenterActivity.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/WencenterActivity.java
index 614fcbb..5436b75 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/WencenterActivity.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/activity/WencenterActivity.java
@@ -204,19 +204,19 @@ public View getView(int position, View convertView, ViewGroup parent) {
TextView textView = (TextView) convertView.findViewById(R.id.text_nav);
switch (position) {
case 0:
- imageView.setImageResource(R.drawable.ic_sidebar_user);
+ imageView.setImageResource(R.mipmap.user);
textView.setText(navStrings[position]);
break;
case 1:
- imageView.setImageResource(R.drawable.ic_sidebar_home);
+ imageView.setImageResource(R.mipmap.home);
textView.setText(navStrings[position]);
break;
case 2:
- imageView.setImageResource(R.drawable.ic_sidebar_explore);
+ imageView.setImageResource(R.mipmap.explore);
textView.setText(navStrings[position]);
break;
case 3:
- imageView.setImageResource(R.drawable.ic_sidebar_search);
+ imageView.setImageResource(R.mipmap.search);
textView.setText(navStrings[position]);
break;
case 4:
diff --git a/app/src/main/res/layout/fragment_homepage.xml b/app/src/main/res/layout/fragment_homepage.xml
index f9e9e97..649b52d 100644
--- a/app/src/main/res/layout/fragment_homepage.xml
+++ b/app/src/main/res/layout/fragment_homepage.xml
@@ -30,7 +30,7 @@
android:layout_margin="16dp"
android:layout_marginBottom="10dp"
android:layout_marginRight="10dp"
- android:src="@drawable/ic_publishment_article_question"
+ android:src="@mipmap/write"
fab:fab_colorNormal="@color/primary"
fab:fab_colorPressed="@color/primary_pressed"
fab:fab_colorRipple="@color/ripple" />
diff --git a/app/src/main/res/mipmap-xhdpi/explore.png b/app/src/main/res/mipmap-xhdpi/explore.png
new file mode 100644
index 0000000000000000000000000000000000000000..43eb3577021bd92f17e1d9e9248c0dc3192ee75f
GIT binary patch
literal 1834
zcmZ8hc~nzp7XN^N5Q(6}e#X;>6_iSrmxKr}h#`UyF$k2+IszeiB!Q5G3J9p>2xSqXgFq`#L>4(RDvSk0oClqm5u97%}nWkPz`_)&cXvT%+uiNbe@lQ
zsARaU_>ja(Y<2&{k&ZUZ_gWaMFO--NR-eIZ`!c-zJRu=_%l7ip^KZ&*d7Sw>pH1({
zcPfu+^(*fUh}!qUxIBL5*d8Y@(<^n~yIu%7r0@UBqlx+s=f;P*#e*e_DJd!27$e%|
zTv5+&@O$;jl#MVc2*A9
z7C!je>=n~5QgZf-{K|`#hBgg$9kirN8y~qGA9JO@$sFVLzL7@%T>sXqjS}x^
z65-U2%$j;n`9(!KnVq9qg
zKGLU~FKz91tofPz#U0L9aSiRIrApmkPO+hh$j%boojLTjVE%1v`t!ypne(7yS3r-!
zuGt3Njn3nTn_?l+$wp+BI3Iv==1cU0wfSr#L!Xnho=?2SQ_HGKw&xz-Y4W3_B2S!0
z-(OIfHRy%dofUK3E-s{N`xcq&I?JN1CwYLIi?dAbRWA%U
zjCvAI4F(X>lLC{9gD(uoZpw;^-!Uxi92xovPKnoC1PQ!};g|g2C9=J8*n%lNabkSC
zOLsOQw*%0As(W1@ZCh#56<7BrnwuH%%+|!9s#HI?zQn<@%qIPMZ$n`G?P2DhR3v{X
zKjCkCA08IF%o*5Si>NX9Ms;}JrhnqbcQ-;vt(#5$+}zhkIeCtDo&TDW6e}ASzp(16
zuO(dghHDkuqC9{0bkFJxz=(f6GPat
zC%GJ|*X*&&!KT>KleQ=QpwY5w{)lcaJ4E+ao1Ce+F3o*&*BA>kuXEFED{7l#|6ECd
zj>;^(jNDUmW@H(V6z~!SVw5isON9v#i{egkC&M%-7-m6QcUClu3H{d|
z_JAZ9rbMVzjYdO}uCnmJSrmmzY;3M`!x5s*of2U^E)UO_s_;
z5X}XGHt;f^;&yhccA=8w#8?FJQ3#V)EfFLLpG*zl%J+@bKVa6LiXi@|R4l>pHPMbe
zwwB@;+Yfa9gNcxeFv%)p*4dYdL+n3*@TG|;ma0U-+7hTrxp;Sdc;Fv&_@Ouozzh#}
z7K`c5glpORN^ywg2Rffh(@?+&;Br@V5xel-XCL&!LUEHkW
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-xhdpi/home.png b/app/src/main/res/mipmap-xhdpi/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..1eac3b3ac9fe7a79582523edacb6683804cc19ca
GIT binary patch
literal 1863
zcmZ8hX;@Qd7QUcR3?Nhp;#RJ;AgD=hHV79K2?Pk300A+$AxSRbN)||NWGPyTbYKQW
z1SyM%lx2`okjhrsB#2-U5tYF@Q;S8>;LswWDhf(3bY>o>KhAfa?>+DPp7Wg_-(Q3H
zzUG9r1ONccxqjXPJa5Ot!(=&rzAiUG@w8m($@2t&Z%>)dM;hUGQ0yn*0YH)i0HmY=
zz#AM&(E)%40)S_S001rkfYq_Zt-kR;3pWH;lZ!2Q`!qqq^T#B>3oejAA
zF0Qv{sPO7|!2ubOW1Vv4!OJ^)Ynw%9ZLFOLFVlzE-w4@WRv8t~JJa(eD*&+T(Xy&Uri(e|;+|;iI
zAGGD!-g5t?P(9cpje0pSn6i3B{b?UEZ6~Gge*f{3vV?5ejz`8L9nOOm+upcz%~Wre
zEemWZw;o`!(tV76=pJJQ-n38H$fI`I*lbRSs_S|^Z*ArFfPZN?N}1iacH~mVu!R2Z
zi;QK&(+{hrkP@u|{_ZAgdon*OKGwkZlOdB)DyY2`WLWWhg;nz&+1Q85hsgR|OPA_R
zJ4wd{f!QB#S!08Rv_CT1zpKXjSb@ACMe9)K*HO#xZ}nQf$|zsuL!kHA3=|$azBZ|X
z`Ml-vUEV>_!@NeWXWdNm)x%at<3>8KjrVN%si8QZZ6?Uv7_P{s1riR_0TEB^jciN*
zrnoXxgXaJEY4wq5p>LI)j=(9{aWLaiQ?I?6huI&<`M3Q@Ou`O3x|-B@c!V5O=^8vf
z|Ag4_c|gv-&BUTZDYQYSp$_+7e+{dhWxEN_0k)-Q8U$y8o%@bJ35CbLuiPF9brCqz
z9lbH%4nzdYjGj8Z0*oCuUU2mFpIt|I9^UVsYCv$UbnI5b=}B9?a>Ccu#+l7s`KI1|oLE}GzO>=Swr=XNszMuf@NU>6;KpZmU$|%YliB5z
zj9~0Sz8$~jW}(YIN89sbU!Ky{{AO~?bTYbX|Emwp#Kl%6b{ela(x&daX7tlF#<~0T
z;e%fNKN+;z@+D=z-7cIIZN4n&v#sX(=tLeQ?|F_#@4fax_tlvU{r6JW^QxeW?|)o?<8h;
zq)9V(`O8lmR?MZ_j5|)5w(Tw0y*_Ki@#u8wO8U=3Y1kE{Z8pU3>Ouh4b7SFbgl-{h
zA<>wj
zG%C!5U@B`X#DXEH?8W7Y{}afS5;Q7tQNSQU3=)kIN~6IL4W>E&AsCJNs01o{TQ4
z@W54MrAlgKR?Nhm#Y@gdq_9{imm>-c0DTb!qKd?nDj4*XC`Aa!mB}<}YzYFXE@X%d
zZ39EXd_hh^tWt%6K{Ab$#8rUgB`^$8sZpf@#s`BSkgY*w5)g6%L1jr4{<8zNi|sM0RDwkV
z3_7I!%V7>qS@Rx+hsqHwF%|)qmOzPBNIfov@&Dw*3&mLgmF~)-GgwrH^TFMPPjQOX
zdp;p(5(2o8U0DHa_9$_Ih?n=iSKck)0#T?8!8cBcR?3mZy{nW;Y-#^Uq&g85D-~n~
wf>Fd01qqc)$^Qez3W{1KrckL2SJyvICX9XIehOr_Mz0@0VU-5{Qv*}
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-xhdpi/search.png b/app/src/main/res/mipmap-xhdpi/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..e839a8871c926fcb1d0088bb6a88cc88efc7aa5a
GIT binary patch
literal 1918
zcmZ9Mdpy+n8pprJHO3-JE@iMT#oU+~GqVa4#)QdbTx(^_eVH-F$TiEPgJohfIjkw;
zq^M076%~~xoE>aB;V88w8!st^oEKV~^V8XLUY-5pdA_gj_j!Ll&+~fz_?Cvzsm6xZ
zh5!I#T9AJPbo#D`few^G;*BUM>+t+S{Q$UJVYJHBh3*JeP(&yIInDqS6anx7dMcO(
zAOi!yOdUu8Q)$G^K<%b``rN4!Ki+4r5rN=
z4zH^7c3_fvG_<#7&s6SWt<)KL9cf^b3_GPD4yxfp1<2#UmHqvlz4Vox0~^iD#pXUn
zigBjNkw=%Cs~fA9=9{>0MxNdc+1PkfSq>#*c;SlJF(@l<_E9&jjYyw
z#4omLrRw+HS1~S6&=39S5-?KU_qJES?U-p#IiH5}Anmy`95*?u)AY@5&FSEyw~DQ?
z2fs>4cxmAy;cwk(DO^S3sAmbgeh*EW-L#8YoE6{eH(#l4(uXCc&esV%NL
zm7%w0n)@+ox8AAKjAez@xvSf2dSFGdK^uGv5FomR`9oZa%@yx*O=+->lYR9y*nV^T
z-lvtjFDgp9+*KKYKf_HyVg+$cL#tg@as%DELb+P5?3jmB?X5AxZw>03wGtUb74l86
zb(cmI{(9)P&Jet8>=aGgqHJ{K+|xK~K!KO!w7m3kjy~yRRIqRL0(IWXYNTyCw}Ps9
zKTwuWe^q8QtF-(s-4>tnktr%kI74iXdF;kgy}oW-8$MRMU?~J-7;OiAetR!>}cG&2>Sfg!52fb%bb>C7~+E(4Yt{(Jm
z*uL%H5NhdT{7Rv|9L64M=razPyRT;ncN^54xQKcl$+xgCZfC?ukNi0Nf|)zKzvhvw
zE`E&hxbP=Q+*g#V_b~5?KYKfc?g+v5n(kVKn|1X#+9skq(hM)^Us4Odb5O>*$Q>vI
z#0^}Jrm{s+amN95ey!TV(}Em!zTTw_S*2`%nU9zFU9W+|h@`umypSu_
zqlrsxg^t%F~B;z()+@tPvYUF|jYu5ZmmroOT0s2r(lqv=vGuotgO
zx_R-YxA*8%UQ+S|IC(9(2>q~PF8ijLEU)_5K7NEj(@;g_V!chEsm#n^_7#Ib1^6PRtIjAF*6k2WNYia>-s_L95bgrRWkr;FvDIhmlvZ2X
zwzaY8H7#}HX@B2dD>C#YI!Oa!rEI2@LuN@h&;dL!SUeKrh4jEPJg{UOiR|g=h9QzM
znCBte*#9RGrm_Xx>~#SSiNPT~hzzVJ8BZeP{t$FW`ZhoU`g(`-RIW6WDd7N`kjdkO
zGI;`4GJ=32qKHT=1`&=WAhL*r0|Xr6zwNOk1Yar@lhNqR%uJMET?GZCLZwQ0x^N{P
za^AA;%;0ATlgMQMR91$NBa)KIVGx=QuuW?n=sz)^dXvdP9089nh33W_8r>v-7|YLm
z{$OGRY$<;odFvd2gAl9FkWhh;Bh40bz^AFuViC`$HJbh>pHK!w0jwv9NFd<6h@MkV
z9dAL1`DZ?nf*cO;MB#|R6v|MaT{~2c|EwGpK?7Vt3I|#Nnx87^6nkxOY5Dqgv
zTfj;cp+p=hn#C3&1wtO`e~&B?I$gp-W3hNV_CFbqK|ymqm#R{rE`Sz5_rE|%l>Hk4
Cr3HNe
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-xhdpi/user.png b/app/src/main/res/mipmap-xhdpi/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..38bf4756f2fd3940a996c5a4dac9ea5eeca1f123
GIT binary patch
literal 1495
zcmZ`(do+}37=KgtLTr|yn$(nvlgxZGJJ*j`8X8&BpmA#%<1;hX%xA}^!7SU@T*~#7
zL}N-&ZVg{xkmNag9
zqqfTrbTK7`(VMh8dQ%wXP5RoFmRrY+jy9F`w$LMW)7GI+lG873sj#&uz*b}x6afBa
z=N;QW$~~UnIC{eIsxtWUNf*`q+g&o%?Sv8K%|cZp=efsGbHdksX9qGO^Fn_)OeD{@
zB333-nlYQ1Gj*xqNA@Aw+`1vZ<0^XDz`Ao8?J1n`%!r?YYyBLR;sDGMeaH2y(nVT3
z1QLh_yJkzqf-j|HpAKLU4Z7JEAkMp!HM}Sr`bb~t+yY_2dqB~$5RSh6ZYR?W{_&~j
zCOUz5Mgft7s&+An1{&L(k8esL6Nk~)>xOPccT$eX?wP&zpT9(-R*hFC3
z>_p5qPD|=a8n_VVzvqTw|D07#Fei&+XQ^tCp3iD+xH?p(d)ZLx_$EiI)>ZbXw~j~E
zu}lgr-v-P&*0s!ROU-{q8;+Bw76w{dG3KoAjwB<^Zfki1!^v~Cl6(3ph5hAjw}u>z
z>eANvFY9y8nt9)OC@2fa5KQpxSp{!jDtfEQsx=cPRU6b|x^6;0$l)Tt(4ffIMq6s~
zgIgx?*Xp(qc<_rICsy5lReb8k6QrJA5#Wb-z3i*(Wb_C37bSKcTyGrpI{Sda9dIk*K%0Zj=Wd(`H>ZK6Jfy(!QTyFRUJlMN|_d2jkBC%$VF|
zK5~Q^|ElLkyYTz!{Z}+l-}MbivlTR?o>{W7>hWHCjkFlm*
z%`9)*lr&w`*!J$}lOhXURFT_#hR%UyOR&wQgh0x@X48w<8j{%-D=V2c(|tJAX!P5D
zC;7GEg+A+Ziz_y>rO6{h>6!S;+lIONW8p#!fkg@gPk;td8Fo~f9Ypn|(O?=AhB&qm
z8-^eQ>)zOZ5oBn%G$Q{0391BX2Tt%>a)?1AFr`p|0C$;CjCcygQqeagCYeoU+fgCX
zekzj`$7Y5w>7-?Qh-F9RkR%uu4O1verIIXNV&Mm8kx_+Me|0efS6;iM>??_tg~2cv
z6~)RBIR?YtI5Y-O&o9;o?#sCvL#ofgiN}`0gM=8in91ph!>|va|>Viek$PL4+~!QV}XA%Mpws3YXhS
pWn%I_MUk8mqYzQ3R1ORJE7F-{e9lKJyW?;d;O^?ht#S!X{u9V^Y^DGJ
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-xhdpi/write.png b/app/src/main/res/mipmap-xhdpi/write.png
new file mode 100644
index 0000000000000000000000000000000000000000..d28b5cf9d60014e9516474bddb62fff26b15b146
GIT binary patch
literal 1667
zcmZ`(c~BE)6#ptxtwIs6s32_XNJYr85E57zVjvm<2E!>@M-0g(SxK^(Y(Nxmq+qp*
z;4KD<2SPza5G#mv1maPpfItPU;(P-K5-<$8f-|@aTvzsCcU6>5WCc>eRqm|@A&VfbGc3HYrCmj{>oE_(cq#ew$iL2giQ+34^
zUOYAA+XIU39X#Qp%hi*N6DA}kiSm-`ehbbH&ZH8}8)|2_w3{*}X>Uv(dH85(Btu)#
zzpbs@>d2*+dp90$o7a8I&n(cLZMU^(eV*`#Y4*JtmS36+;@39N?cTqMW}7eN@Y6h+
znI1Mle|o4({ni|cGwcaCIlVthI?L+r+vLrXVpqzGyEpZz&uUT@a3*usa4C;9^zvk<
z0jGfxR>j@+fE11~-tsu#v)9$h$*kj270Zmm9`p$iaz+~S*?mTN!~ts;e%VdmkbVvB
zsZ3k(VK(#Fcdh!qogXc_;@>&er+nQpbJYu4gLhAs>|&;cRr~Bx?;At1>fXVcJ=|li
z3(5_uVjefQ7H>Qh)N*UXl1UB`9nIDs=jNujWHqw0J;gC^DeD71%!**2Gj&z2qw<=%
z3ySW)Sc3kDwl$j+>GR*H_b26)*?xm06!^3E=Ea_$yN2NJzTVI?t>kt=>xI45;a0k9
zP)FD~Pyd9Jo@ssjNJ~yq$*`9>=FFM&_LP12%HtgM)uZ#ao!faqbZA*6d_e)KPFV;_
znV8>Zm9iz&oA`<@E$AS=iAN5
zPffd0f7_wLH}8Ghv-FyynWA>XBD$@sz^-rsBvl1C>#)%wJn{yS8ij?XD0nN%)?N
zZyt0eS9SL09ce%g4kvic^*$?9PpN%{-4qP{`tH;`&Y4)I-r|WE-D8q;@doDOSYUgN
zzsDe<+_w5WU9Y`%dcfGZ;owurAnX=g_cV#xs=x}{OWH$onyIOOyqr0wknUGr$zHX*
z$h&8AIezW%#{F^KYIsN|D~ukDY~ffXY6T1$o=JY33yGx>gj7tRh(v>u3Aiv|H!94a
zy1=0>E(jAwm@FrTJHlYpRT|g-hoHixm@NMP3E9U)jU*v()Ip2Oh&ZtZ1p<{=jta$c
zOcD*TXznz3(hCZLSh8v1S)BcB1qqokPA3H0gaQ_g#R~B8u`$i`
zCEKgVwZno1K!zz%a^rLbu0lumuEB9)Z2zcO8;?nFHBF5Ybcs|=#Z+?IzeS0fuGL8B
fFzn&x`uE9prIB;)u-m
Date: Wed, 11 May 2016 22:53:22 +0800
Subject: [PATCH 9/9] change url
---
.../http/AsyncHttpWecnter.java | 4 +---
.../wecentermobileandroidrestructure/http/RelativeUrl.java | 5 ++---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/AsyncHttpWecnter.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/AsyncHttpWecnter.java
index 3333294..45f3eea 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/AsyncHttpWecnter.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/AsyncHttpWecnter.java
@@ -30,10 +30,8 @@
public class AsyncHttpWecnter {
public static final String TAG = "AsyncHttpWecnter";
- public static final String BASE_URL = "http://wecenter.dev.hihwei.com/";
-//public static final String BASE_URL = "http://www.jingfangjie.cn/";
+ public static final String BASE_URL = "http://wetest.edustack.org/";
public static final String SIGN = "12884789df747d7affbcd6a7cadd9359";
-// public static final String BASE_URL = "http://we.edustack.org/";
public static AsyncHttpClient client = new AsyncHttpClient();
/**
diff --git a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/RelativeUrl.java b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/RelativeUrl.java
index 289ba64..ce3bb5a 100644
--- a/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/RelativeUrl.java
+++ b/app/src/main/java/org/iflab/wecentermobileandroidrestructure/http/RelativeUrl.java
@@ -7,8 +7,7 @@
*/
public class RelativeUrl {
// public static String AVATAR = "http://we.bistu.edu.cn/uploads/avatar/";//头像文件夹
- public static String AVATAR = "http://we.edustack.org/uploads/avatar/" + MD5Transform.getSign("account");
- public static String USER_LOGIN = "/api/account/login_process/" + MD5Transform.getSign("account"); //登录
+ public static String USER_LOGIN = "?/api/account/login_process/" + MD5Transform.getSign("account"); //登录
public static String HOME_PAGE = "/api/home/" + MD5Transform.getSign("home"); //首页
public static String USER_INFO = "/api/account/get_userinfo/";//用户信息
public static String USER_IMG_EDIT = "/api/account/avatar_upload/" + MD5Transform.getSign("account");//用户头像修改
@@ -28,7 +27,7 @@ public class RelativeUrl {
public static String TOPICS = "/api/topic/topics/" + MD5Transform.getSign("topic");
public static String FOLLOWER = "api/people/follows/";//个人粉丝
public static String ARTICLE_INFO = "/api/article/" ; //文章
- public static String QUESTION_INFO = "/api/question/" + MD5Transform.getSign("question");//问题
+ public static String QUESTION_INFO = "?/api/question/" + MD5Transform.getSign("question");//问题
public static String QUESTION_FOUCS = "/question/ajax/focus/" + MD5Transform.getSign("ajax");//关注问题
public static String QUESTION_ANSWER_INFO = "/api/question/answer/";
public static String ANSWER_VOTE = "/question/ajax/answer_vote/" + MD5Transform.getSign("ajax");