diff --git a/3rdparth/ScrollViewPull/.DS_Store b/3rdparth/ScrollViewPull/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/3rdparth/ScrollViewPull/.DS_Store and /dev/null differ diff --git a/3rdparth/ScrollViewPull/AndroidManifest.xml b/3rdparth/ScrollViewPull/AndroidManifest.xml deleted file mode 100755 index 8811618..0000000 --- a/3rdparth/ScrollViewPull/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparth/ScrollViewPull/proguard.cfg b/3rdparth/ScrollViewPull/proguard.cfg deleted file mode 100755 index 8ad7d33..0000000 --- a/3rdparth/ScrollViewPull/proguard.cfg +++ /dev/null @@ -1,34 +0,0 @@ --optimizationpasses 5 --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --dontpreverify --verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* - --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class com.android.vending.licensing.ILicensingService - --keepclasseswithmembernames class * { - native ; -} - --keepclasseswithmembernames class * { - public (android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembernames class * { - public (android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; -} diff --git a/3rdparth/ScrollViewPull/project.properties b/3rdparth/ScrollViewPull/project.properties deleted file mode 100755 index ea89160..0000000 --- a/3rdparth/ScrollViewPull/project.properties +++ /dev/null @@ -1,11 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-8 diff --git a/3rdparth/ScrollViewPull/res/drawable-hdpi/icon.png b/3rdparth/ScrollViewPull/res/drawable-hdpi/icon.png deleted file mode 100755 index 8074c4c..0000000 Binary files a/3rdparth/ScrollViewPull/res/drawable-hdpi/icon.png and /dev/null differ diff --git a/3rdparth/ScrollViewPull/res/drawable-ldpi/icon.png b/3rdparth/ScrollViewPull/res/drawable-ldpi/icon.png deleted file mode 100755 index 1095584..0000000 Binary files a/3rdparth/ScrollViewPull/res/drawable-ldpi/icon.png and /dev/null differ diff --git a/3rdparth/ScrollViewPull/res/drawable-mdpi/icon.png b/3rdparth/ScrollViewPull/res/drawable-mdpi/icon.png deleted file mode 100755 index a07c69f..0000000 Binary files a/3rdparth/ScrollViewPull/res/drawable-mdpi/icon.png and /dev/null differ diff --git a/3rdparth/ScrollViewPull/res/drawable/goicon.jpg b/3rdparth/ScrollViewPull/res/drawable/goicon.jpg deleted file mode 100755 index c732d22..0000000 Binary files a/3rdparth/ScrollViewPull/res/drawable/goicon.jpg and /dev/null differ diff --git a/3rdparth/ScrollViewPull/res/layout/pull_to_refresh_header.xml b/3rdparth/ScrollViewPull/res/layout/pull_to_refresh_header.xml deleted file mode 100755 index a7d09bc..0000000 --- a/3rdparth/ScrollViewPull/res/layout/pull_to_refresh_header.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - diff --git a/3rdparth/ScrollViewPull/res/layout/pull_to_refresh_tryscroll.xml b/3rdparth/ScrollViewPull/res/layout/pull_to_refresh_tryscroll.xml deleted file mode 100755 index 31d465a..0000000 --- a/3rdparth/ScrollViewPull/res/layout/pull_to_refresh_tryscroll.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/3rdparth/ScrollViewPull/res/values/strings.xml b/3rdparth/ScrollViewPull/res/values/strings.xml deleted file mode 100755 index 8c7a454..0000000 --- a/3rdparth/ScrollViewPull/res/values/strings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - pulltorefresh - - 下拉刷新 - 松开后刷新 - 刷新... - Tap to refresh... - 松开加载更多... - 上拉加载更多... - 加载中... - 下拉刷新 - 松开后刷新 - diff --git a/3rdparth/ScrollViewPull/screenshot/Screenshot_2012-11-06-10-52-04.png b/3rdparth/ScrollViewPull/screenshot/Screenshot_2012-11-06-10-52-04.png deleted file mode 100644 index 657fa10..0000000 Binary files a/3rdparth/ScrollViewPull/screenshot/Screenshot_2012-11-06-10-52-04.png and /dev/null differ diff --git a/3rdparth/ScrollViewPull/src/sqq/ScrollViewPull/ScrollViewPull.java b/3rdparth/ScrollViewPull/src/sqq/ScrollViewPull/ScrollViewPull.java deleted file mode 100755 index a7da8d2..0000000 --- a/3rdparth/ScrollViewPull/src/sqq/ScrollViewPull/ScrollViewPull.java +++ /dev/null @@ -1,122 +0,0 @@ -package sqq.ScrollViewPull; - -import sqq.ScrollViewPull.widget.TryRefreshableView; -import sqq.ScrollViewPull.widget.TryRefreshableView.RefreshListener; -import android.app.Activity; -import android.os.AsyncTask; -import android.os.Bundle; -import android.util.Log; -import android.view.View; -import android.widget.ScrollView; -import android.widget.TextView; -/** - * - * @author sqq - * - */ -public class ScrollViewPull extends Activity { - private ScrollView sv; - private String s; - private TryRefreshableView rv; - private String[] mStrings = { "aaaaaaaaaaaaaaaaaa", "bb" }; - private TextView msvTextView; - String msg = ""; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.pull_to_refresh_tryscroll); - sv = (ScrollView) findViewById(R.id.trymySv); - rv = (TryRefreshableView) findViewById(R.id.trymyRV); - rv.mfooterView = (View) findViewById(R.id.tryrefresh_footer); - rv.sv = sv; - - //mfooterView - rv.mfooterViewText = (TextView) findViewById(R.id.tryrefresh_footer_text); - - - - s = "AndroidһLinuxΪĿԴϵͳҪʹڱЯ豸Ŀǰδͳһƣй½϶ʹð׿ǹٷ£ٷ"; - - for (int t = 0; t < 20; t++) { - msg += s; - } - msvTextView = (TextView) findViewById(R.id.sv_text); - msvTextView.setText(msg); - Log.i("other","msvTextView.getHeight()"+msvTextView.getHeight()); - - msvTextView.setTextSize(23); - - - - //Ƿˢ - rv.setRefreshListener(new RefreshListener() { - - @Override - public void onRefresh() { - // TODO Auto-generated method stub - if (rv.mRefreshState == 4) { - new GetHeaderDataTask().execute(); - } else if (rv.mfooterRefreshState == 4) { - new GetFooterDataTask().execute(); - } - - } - }); - - - } - - private class GetHeaderDataTask extends AsyncTask { - - @Override - protected String[] doInBackground(Void... params) { - // TODO Auto-generated method stub - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - - } - return mStrings; - } - - @Override - protected void onPostExecute(String[] result) { - - msg = mStrings[0] + msg; - msvTextView.setText(msg); - msvTextView.setTextSize(23); - rv.finishRefresh(); - - super.onPostExecute(result); - } - - } - - private class GetFooterDataTask extends AsyncTask { - - @Override - protected String[] doInBackground(Void... params) { - // TODO Auto-generated method stub - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - - } - return mStrings; - } - - @Override - protected void onPostExecute(String[] result) { - - msg = msg + mStrings[0]; - msvTextView.setText(msg); - msvTextView.setTextSize(23); - rv.finishRefresh(); - - super.onPostExecute(result); - } - - } - -} \ No newline at end of file diff --git a/3rdparth/ScrollViewPull/src/sqq/ScrollViewPull/widget/TryPullToRefreshScrollView.java b/3rdparth/ScrollViewPull/src/sqq/ScrollViewPull/widget/TryPullToRefreshScrollView.java deleted file mode 100755 index 562d82f..0000000 --- a/3rdparth/ScrollViewPull/src/sqq/ScrollViewPull/widget/TryPullToRefreshScrollView.java +++ /dev/null @@ -1,64 +0,0 @@ -package sqq.ScrollViewPull.widget; - -import android.content.Context; -import android.os.Handler; -import android.util.AttributeSet; -import android.util.Log; -import android.view.View; -import android.widget.ScrollView; -/** - * - * @author sqq - * - */ -public class TryPullToRefreshScrollView extends ScrollView { - - public TryPullToRefreshScrollView(Context context) { - super(context); - init(context); - - } - - public TryPullToRefreshScrollView(Context context, AttributeSet attrs) { - super(context, attrs); - init(context); - - } - - public TryPullToRefreshScrollView(Context context, AttributeSet attrs, - int defStyle) { - super(context, attrs, defStyle); - init(context); - - } - - private void init(Context context) { - - } - - - public static void ScrollToPoint(final View scroll, final View inner,final int i) - { - Handler mHandler = new Handler(); - - mHandler.post(new Runnable() { - public void run() { - if (scroll == null || inner == null) { - return; - } - - int offset =inner.getMeasuredHeight() - scroll.getHeight()-i; - - if (offset < 0) { - offset = 0; - } - - scroll.scrollTo(0, offset); - - scroll.invalidate(); - } - }); - } - - -} \ No newline at end of file diff --git a/3rdparth/ScrollViewPull/src/sqq/ScrollViewPull/widget/TryRefreshableView.java b/3rdparth/ScrollViewPull/src/sqq/ScrollViewPull/widget/TryRefreshableView.java deleted file mode 100755 index d6f5da7..0000000 --- a/3rdparth/ScrollViewPull/src/sqq/ScrollViewPull/widget/TryRefreshableView.java +++ /dev/null @@ -1,499 +0,0 @@ -package sqq.ScrollViewPull.widget; - -import sqq.ScrollViewPull.R; -import android.content.Context; -import android.util.AttributeSet; -import android.util.Log; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.MotionEvent; -import android.view.View; -import android.view.animation.LinearInterpolator; -import android.view.animation.RotateAnimation; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.ListView; -import android.widget.ProgressBar; -import android.widget.ScrollView; -import android.widget.Scroller; -import android.widget.TextView; -/** - * - * @author sqq - * @remark οNonoĴ - * - */ -public class TryRefreshableView extends LinearLayout { - - private static final int TAP_TO_REFRESH = 1; // ʼ״̬ - private static final int PULL_TO_REFRESH = 2; // ˢ - private static final int RELEASE_TO_REFRESH = 3; // ͷˢ - private static final int REFRESHING = 4; // ˢ - public int mRefreshState;// ¼ͷǰ״̬ - public int mfooterRefreshState;//¼βǰ״̬ - public Scroller scroller; - public ScrollView sv; - private View refreshView;//ͷͼ - public View mfooterView;// βͼ - public TextView mfooterViewText; - private ImageView refreshIndicatorView; - private int refreshTargetTop = -60; - public int refreshFooter; - private ProgressBar bar; - private TextView downTextView; - private TextView timeTextView; - - private RefreshListener refreshListener; - - private int lastY; - // Ч - // Ϊµļͷ - private RotateAnimation mFlipAnimation; - // Ϊļͷ - private RotateAnimation mReverseFlipAnimation; - public int nowpull = -1;// 0Ϊͷ1Ϊβ - - private boolean isRecord; - private Context mContext; - - public TryRefreshableView(Context context) { - super(context); - mContext = context; - - } - - public TryRefreshableView(Context context, AttributeSet attrs) { - super(context, attrs); - mContext = context; - init(); - - } - - private void init() { - // TODO Auto-generated method stub - // ʼ - // - mFlipAnimation = new RotateAnimation(0, -180, - RotateAnimation.RELATIVE_TO_SELF, 0.5f, - RotateAnimation.RELATIVE_TO_SELF, 0.5f); - mFlipAnimation.setInterpolator(new LinearInterpolator()); - mFlipAnimation.setDuration(250); - mFlipAnimation.setFillAfter(true); - - mReverseFlipAnimation = new RotateAnimation(-180, 0, - RotateAnimation.RELATIVE_TO_SELF, 0.5f, - RotateAnimation.RELATIVE_TO_SELF, 0.5f); - mReverseFlipAnimation.setInterpolator(new LinearInterpolator()); - mReverseFlipAnimation.setDuration(250); - mReverseFlipAnimation.setFillAfter(true); - // - scroller = new Scroller(mContext); - - // ˢͼ˵ĵview - refreshView = LayoutInflater.from(mContext).inflate( - R.layout.pull_to_refresh_header, null); - //ͷͼ - refreshIndicatorView = (ImageView) refreshView - .findViewById(R.id.pull_to_refresh_image); - // ˢbar - bar = (ProgressBar) refreshView - .findViewById(R.id.pull_to_refresh_progress); - // ʾtext - downTextView = (TextView) refreshView - .findViewById(R.id.pull_to_refresh_text); - // ʾʱ - timeTextView = (TextView) refreshView - .findViewById(R.id.pull_to_refresh_updated_at); - - //ͷview - refreshView.setMinimumHeight(50); - LayoutParams lp = new LinearLayout.LayoutParams( - LayoutParams.FILL_PARENT, -refreshTargetTop); - lp.topMargin = refreshTargetTop; - lp.gravity = Gravity.CENTER; - addView(refreshView, lp); - - isRecord = false; - - mRefreshState = TAP_TO_REFRESH; - mfooterRefreshState = TAP_TO_REFRESH; - - - } - - public boolean onTouchEvent(MotionEvent event) { - - int y = (int) event.getRawY(); - - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - // ¼y - if (isRecord == false) { - Log.i("moveY", "lastY:" + y); - lastY = y; - isRecord = true; - } - break; - - case MotionEvent.ACTION_MOVE: - - Log.i("TAG", "ACTION_MOVE"); - // yƶ - Log.i("moveY", "lastY:" + lastY); - Log.i("moveY", "y:" + y); - int m = y - lastY; - - doMovement(m); - // ¼´˿y - lastY = y; - - - - break; - - case MotionEvent.ACTION_UP: - Log.i("TAG", "ACTION_UP"); - - fling(); - - isRecord = false; - break; - } - return true; - } - - /** - * up¼ - */ - private void fling() { - // TODO Auto-generated method stub - if (nowpull == 0 && mRefreshState != REFRESHING) { - LinearLayout.LayoutParams lp = (LayoutParams) refreshView - .getLayoutParams(); - Log.i("TAG", "fling()" + lp.topMargin); - if (lp.topMargin > 0) {// ˴ˢ¼ - refresh(); - } else { - returnInitState(); - } - } else if (nowpull == 1 && mfooterRefreshState != REFRESHING) { - - - if (refreshFooter >= 20 - && mfooterRefreshState == RELEASE_TO_REFRESH) { - mfooterRefreshState = REFRESHING; - FooterPrepareForRefresh(); // ׼ˢ - onRefresh(); // ˢ - } else { - if (refreshFooter>=0) - resetFooterPadding(); - else { - resetFooterPadding(); - mfooterRefreshState = TAP_TO_REFRESH; - Log.i("other","i::"+refreshFooter); - TryPullToRefreshScrollView.ScrollToPoint(sv, sv.getChildAt(0),-refreshFooter); - } - } - } - } - - // ˢ - public void onRefresh() { - Log.d("TAG", "ִˢ"); - - if (refreshListener != null) { - - refreshListener.onRefresh(); - } - } - - private void returnInitState() { - // TODO Auto-generated method stub - mRefreshState = TAP_TO_REFRESH; - LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) this.refreshView - .getLayoutParams(); - int i = lp.topMargin; - scroller.startScroll(0, i, 0, refreshTargetTop); - invalidate(); - } - - private void refresh() { - // TODO Auto-generated method stub - mRefreshState = REFRESHING; - LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) this.refreshView - .getLayoutParams(); - int i = lp.topMargin; - refreshIndicatorView.setVisibility(View.GONE); - refreshIndicatorView.setImageDrawable(null); - bar.setVisibility(View.VISIBLE); - timeTextView.setVisibility(View.GONE); - downTextView.setText(R.string.pull_to_refresh_refreshing_label); - scroller.startScroll(0, i, 0, 0 - i); - invalidate(); - - if (refreshListener != null) { - - refreshListener.onRefresh(); - } - - } - - private void resetFooterPadding() { - LayoutParams svlp = (LayoutParams) sv.getLayoutParams(); - svlp.bottomMargin=0; - - sv.setLayoutParams(svlp); - TryPullToRefreshScrollView.ScrollToPoint(sv, sv.getChildAt(0),0); - - } - - public void FooterPrepareForRefresh() { - resetFooterPadding(); - mfooterViewText - .setText(R.string.pull_to_refresh_footer_refreshing_label); - mfooterRefreshState = REFRESHING; - } - - /** - * - */ - @Override - public void computeScroll() { - // TODO Auto-generated method stub - if (scroller.computeScrollOffset()) { - int i = this.scroller.getCurrY(); - LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) this.refreshView - .getLayoutParams(); - int k = Math.max(i, refreshTargetTop); - lp.topMargin = k; - this.refreshView.setLayoutParams(lp); - this.refreshView.invalidate(); - invalidate(); - } - } - - /** - * move¼ - * - * @param moveY - */ - public void doMovement(int moveY) { - // TODO Auto-generated method stub - LinearLayout.LayoutParams lp = (LayoutParams) refreshView - .getLayoutParams(); - - if(sv.getScrollY() == 0 && moveY > 0&&refreshFooter<=0) - { - nowpull=0; - } - if(sv.getChildAt(0).getMeasuredHeight() <= sv.getScrollY() + getHeight() && moveY < 0&&lp.topMargin<=refreshTargetTop) - { - nowpull=1; - } - - if (nowpull == 0 && mRefreshState != REFRESHING) { - - // ȡviewϱ߾ - float f1 = lp.topMargin; - float f2 = f1 + moveY * 0.3F; - int i = (int) f2; - // ޸ϱ߾ - lp.topMargin = i; - // ޸ĺˢ - refreshView.setLayoutParams(lp); - refreshView.invalidate(); - invalidate(); - - - downTextView.setVisibility(View.VISIBLE); - - refreshIndicatorView.setVisibility(View.VISIBLE); - bar.setVisibility(View.GONE); - if (lp.topMargin > 0 && mRefreshState != RELEASE_TO_REFRESH) { - downTextView.setText(R.string.refresh_release_text); - // refreshIndicatorView.setImageResource(R.drawable.goicon); - refreshIndicatorView.clearAnimation(); - refreshIndicatorView.startAnimation(mFlipAnimation); - mRefreshState = RELEASE_TO_REFRESH; - - Log.i("TAG", "ڴ״̬"); - } else if (lp.topMargin <= 0 && mRefreshState != PULL_TO_REFRESH) { - downTextView.setText(R.string.refresh_down_text); - // refreshIndicatorView.setImageResource(R.drawable.goicon); - if (mRefreshState != TAP_TO_REFRESH) { - refreshIndicatorView.clearAnimation(); - refreshIndicatorView.startAnimation(mReverseFlipAnimation); - - Log.i("TAG", "ڴڻص״̬"); - - } - mRefreshState = PULL_TO_REFRESH; - - } - } - else if (nowpull == 1 && mfooterRefreshState != REFRESHING) { - - LayoutParams svlp = (LayoutParams) sv.getLayoutParams(); - svlp.bottomMargin=svlp.bottomMargin-moveY; - Log.i("other","svlp.bottomMargin::"+svlp.bottomMargin); - refreshFooter=svlp.bottomMargin; - sv.setLayoutParams(svlp); - TryPullToRefreshScrollView.ScrollToPoint(sv, sv.getChildAt(0),0); - - if (svlp.bottomMargin >= 20 - && mfooterRefreshState != RELEASE_TO_REFRESH) { - mfooterViewText.setText(R.string.pull_to_refresh_footer_label); - mfooterRefreshState = RELEASE_TO_REFRESH; - } else if (svlp.bottomMargin < 20 - && mfooterRefreshState != PULL_TO_REFRESH) { - mfooterViewText - .setText(R.string.pull_to_refresh_footer_pull_label); - mfooterRefreshState = PULL_TO_REFRESH; - } - - } - - } - - - public void setRefreshListener(RefreshListener listener) { - this.refreshListener = listener; - } - - - /** - * ˢ¼ - */ - public void finishRefresh() { - Log.i("TAG", "ִ=====finishRefresh"); - - if (mRefreshState != TAP_TO_REFRESH) { - mRefreshState = TAP_TO_REFRESH; // ʼˢ״̬ - LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) this.refreshView - .getLayoutParams(); - int i = lp.topMargin; - refreshIndicatorView.setImageResource(R.drawable.goicon); - refreshIndicatorView.clearAnimation(); - bar.setVisibility(View.GONE); - refreshIndicatorView.setVisibility(View.GONE); - downTextView.setText(R.string.pull_to_refresh_tap_label); - scroller.startScroll(0, i, 0, refreshTargetTop); - invalidate(); - } - if (mfooterRefreshState != TAP_TO_REFRESH) { - resetFooter(); - } - } - - public void resetFooter() { - - mfooterRefreshState = TAP_TO_REFRESH; // ʼˢ״̬ - // ʹͷͼ toppadding ָʼֵ - resetFooterPadding(); - // Set refresh view text to the pull label - // ֳʼ - mfooterViewText.setText(R.string.pull_to_refresh_footer_pull_label); - - } - - public void HideFooter() { - LayoutParams mfvlp = new LinearLayout.LayoutParams( - LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT); - mfvlp.bottomMargin = refreshFooter; - mfooterView.setLayoutParams(mfvlp); - mfooterRefreshState = TAP_TO_REFRESH; - } - - - /* - * ÷һontouchEvent һ - * - * @see - * android.view.ViewGroup#onInterceptTouchEvent(android.view.MotionEvent) - */ - @Override - public boolean onInterceptTouchEvent(MotionEvent e) { - // TODO Auto-generated method stub - int action = e.getAction(); - int y = (int) e.getRawY(); - switch (action) { - case MotionEvent.ACTION_DOWN: - // lastY = y; - if (isRecord == false) { - Log.i("moveY", "lastY:" + y); - lastY = y; - isRecord = true; - } - break; - - case MotionEvent.ACTION_MOVE: - // yƶ - int m = y - lastY; - - if (canScroll(m)) { - return true; - } - break; - case MotionEvent.ACTION_UP: - isRecord = false; - break; - - case MotionEvent.ACTION_CANCEL: - - break; - } - return false; - } - - private boolean canScroll(int diff) { - // TODO Auto-generated method stub - View childView; - Log.i("other", "mRefreshState:" + mRefreshState); - if (mRefreshState == REFRESHING || mfooterRefreshState == REFRESHING) { - return true; - } - if (getChildCount() > 1) { - childView = this.getChildAt(1); - if (childView instanceof ListView) { - int top = ((ListView) childView).getChildAt(0).getTop(); - int pad = ((ListView) childView).getListPaddingTop(); - if ((Math.abs(top - pad)) < 3 - && ((ListView) childView).getFirstVisiblePosition() == 0) { - return true; - } else { - return false; - } - } else if (childView instanceof ScrollView) { - - // ͷ - if (((ScrollView) childView).getScrollY() == 0 && diff > 0) { - nowpull = 0; - Log.i("other", ""); - return true; - } else if ((((ScrollView) childView).getChildAt(0) - .getMeasuredHeight() <= ((ScrollView) childView) - .getScrollY() + getHeight() && diff < 0)) {// ײ - Log.i("other", "2"); - nowpull = 1; - - return true; - } else { - Log.i("other", "ScrollView"); - return false; - } - } - - } - return false; - } - - /** - * ˢ¼ӿ - * - * @author Nono - * - */ - public interface RefreshListener { - public void onRefresh(); - } -} diff --git a/3rdparth/joy_20121011_client/.classpath b/3rdparth/joy_20121011_client/.classpath deleted file mode 100644 index e6b382f..0000000 --- a/3rdparth/joy_20121011_client/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/3rdparth/joy_20121011_client/.project b/3rdparth/joy_20121011_client/.project deleted file mode 100644 index 22cfe09..0000000 --- a/3rdparth/joy_20121011_client/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - joy - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/3rdparth/joy_20121011_client/AndroidManifest.xml b/3rdparth/joy_20121011_client/AndroidManifest.xml deleted file mode 100755 index eb7f082..0000000 --- a/3rdparth/joy_20121011_client/AndroidManifest.xml +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/libs/Analytics_Android_SDK_3.3.jar b/3rdparth/joy_20121011_client/libs/Analytics_Android_SDK_3.3.jar deleted file mode 100644 index c5113d0..0000000 Binary files a/3rdparth/joy_20121011_client/libs/Analytics_Android_SDK_3.3.jar and /dev/null differ diff --git a/3rdparth/joy_20121011_client/libs/commons-io.jar b/3rdparth/joy_20121011_client/libs/commons-io.jar deleted file mode 100644 index 624fc1a..0000000 Binary files a/3rdparth/joy_20121011_client/libs/commons-io.jar and /dev/null differ diff --git a/3rdparth/joy_20121011_client/libs/tencent_openapi.jar b/3rdparth/joy_20121011_client/libs/tencent_openapi.jar deleted file mode 100644 index 40fd881..0000000 Binary files a/3rdparth/joy_20121011_client/libs/tencent_openapi.jar and /dev/null differ diff --git a/3rdparth/joy_20121011_client/libs/umeng_sdk.jar b/3rdparth/joy_20121011_client/libs/umeng_sdk.jar deleted file mode 100644 index bb09e04..0000000 Binary files a/3rdparth/joy_20121011_client/libs/umeng_sdk.jar and /dev/null differ diff --git a/3rdparth/joy_20121011_client/proguard.cfg b/3rdparth/joy_20121011_client/proguard.cfg deleted file mode 100755 index b1cdf17..0000000 --- a/3rdparth/joy_20121011_client/proguard.cfg +++ /dev/null @@ -1,40 +0,0 @@ --optimizationpasses 5 --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --dontpreverify --verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* - --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class * extends android.app.backup.BackupAgentHelper --keep public class * extends android.preference.Preference --keep public class com.android.vending.licensing.ILicensingService - --keepclasseswithmembernames class * { - native ; -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers class * extends android.app.Activity { - public void *(android.view.View); -} - --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; -} diff --git a/3rdparth/joy_20121011_client/project.properties b/3rdparth/joy_20121011_client/project.properties deleted file mode 100755 index ea89160..0000000 --- a/3rdparth/joy_20121011_client/project.properties +++ /dev/null @@ -1,11 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-8 diff --git a/3rdparth/joy_20121011_client/res/color/textview.xml b/3rdparth/joy_20121011_client/res/color/textview.xml deleted file mode 100644 index 6b5621b..0000000 --- a/3rdparth/joy_20121011_client/res/color/textview.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/bottom_onclick.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/bottom_onclick.png deleted file mode 100755 index 36a5fc5..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/bottom_onclick.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/btnleft.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/btnleft.png deleted file mode 100755 index f1e2235..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/btnleft.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/btnleft1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/btnleft1.png deleted file mode 100755 index 96fccec..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/btnleft1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/btnright.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/btnright.png deleted file mode 100755 index 5d75ba1..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/btnright.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/btnright1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/btnright1.png deleted file mode 100755 index 397d4e2..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/btnright1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/daren.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/daren.png deleted file mode 100644 index 41c83e0..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/daren.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/dou.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/dou.png deleted file mode 100644 index 457be0e..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/dou.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/dou_left.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/dou_left.png deleted file mode 100644 index 2dc67ac..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/dou_left.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/editbg.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/editbg.png deleted file mode 100644 index 8ea4f89..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/editbg.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/editbg_white.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/editbg_white.png deleted file mode 100644 index b11f90b..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/editbg_white.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/edittext_search_image.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/edittext_search_image.png deleted file mode 100755 index 16e72d5..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/edittext_search_image.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/guanzhu.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/guanzhu.png deleted file mode 100644 index ceadf00..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/guanzhu.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/guanzhu1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/guanzhu1.png deleted file mode 100644 index f4d0afb..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/guanzhu1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/guanzhuall.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/guanzhuall.png deleted file mode 100644 index c2b19c4..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/guanzhuall.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/guanzhuall1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/guanzhuall1.png deleted file mode 100644 index 354bd81..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/guanzhuall1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/head.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/head.png deleted file mode 100755 index 973e74f..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/head.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/huifu.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/huifu.png deleted file mode 100644 index ade7a1d..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/huifu.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/huifu1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/huifu1.png deleted file mode 100644 index ff74bfe..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/huifu1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_launcher.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_launcher.png deleted file mode 100755 index 8074c4c..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_first_normal.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_first_normal.png deleted file mode 100644 index 45b2ffe..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_first_normal.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_first_pressed.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_first_pressed.png deleted file mode 100644 index 6ca21fd..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_first_pressed.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_last_normal.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_last_normal.png deleted file mode 100644 index 511ee1c..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_last_normal.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_last_pressed.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_last_pressed.png deleted file mode 100644 index a2748be..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_last_pressed.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_normal.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_normal.png deleted file mode 100644 index 74128ef..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_normal.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_pressed.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_pressed.png deleted file mode 100644 index 8be4ae0..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_pressed.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_single_normal.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_single_normal.png deleted file mode 100644 index d528a36..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_single_normal.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_single_pressed.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_single_pressed.png deleted file mode 100644 index 4ccd07f..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_preference_single_pressed.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_pulltorefresh_arrow.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_pulltorefresh_arrow.png deleted file mode 100755 index 8067538..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_pulltorefresh_arrow.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_pulltorefresh_arrow_up.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_pulltorefresh_arrow_up.png deleted file mode 100755 index ec3fa0b..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/ic_pulltorefresh_arrow_up.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/icon1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/icon1.png deleted file mode 100755 index 9a81c52..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/icon1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/icon2.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/icon2.png deleted file mode 100755 index c408a68..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/icon2.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/icon3.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/icon3.png deleted file mode 100755 index a9fffbc..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/icon3.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/icon4.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/icon4.png deleted file mode 100755 index 4003eb5..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/icon4.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/jianjieback0.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/jianjieback0.png deleted file mode 100644 index 0cf4acc..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/jianjieback0.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/jianjieback1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/jianjieback1.png deleted file mode 100644 index 91d2fd3..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/jianjieback1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/jujibt0.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/jujibt0.png deleted file mode 100644 index b24e318..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/jujibt0.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/jujibt1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/jujibt1.png deleted file mode 100644 index 5fbd0b4..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/jujibt1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/kanguo.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/kanguo.png deleted file mode 100644 index 5c6eb09..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/kanguo.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/kanguoblack.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/kanguoblack.png deleted file mode 100644 index 255614f..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/kanguoblack.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/longbt.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/longbt.png deleted file mode 100755 index e38c4db..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/longbt.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/longbt1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/longbt1.png deleted file mode 100755 index 0c1c0b4..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/longbt1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/mm_submenu_normal.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/mm_submenu_normal.png deleted file mode 100755 index b8384cc..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/mm_submenu_normal.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/mm_submenu_pressed.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/mm_submenu_pressed.png deleted file mode 100755 index 1a0936c..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/mm_submenu_pressed.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/phonetabview_bg.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/phonetabview_bg.png deleted file mode 100755 index fe325db..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/phonetabview_bg.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/pic_bg.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/pic_bg.png deleted file mode 100755 index d909c00..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/pic_bg.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/pinglun.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/pinglun.png deleted file mode 100644 index 7f2bb18..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/pinglun.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/play.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/play.png deleted file mode 100644 index e4dab05..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/play.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/play1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/play1.png deleted file mode 100644 index e60dbe0..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/play1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/qq.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/qq.png deleted file mode 100644 index 153b5d9..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/qq.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/qq_onclick.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/qq_onclick.png deleted file mode 100644 index 05618dd..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/qq_onclick.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/shoucang.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/shoucang.png deleted file mode 100644 index 8570f7a..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/shoucang.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/shoucang_bt0.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/shoucang_bt0.png deleted file mode 100644 index 2c9aee5..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/shoucang_bt0.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/shoucang_bt1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/shoucang_bt1.png deleted file mode 100644 index 6cd9c98..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/shoucang_bt1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/shoucangblack.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/shoucangblack.png deleted file mode 100644 index 6d6ade9..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/shoucangblack.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/sina.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/sina.png deleted file mode 100644 index a2836bf..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/sina.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/sina_onclick.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/sina_onclick.png deleted file mode 100644 index 54c500f..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/sina_onclick.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/smalltab.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/smalltab.png deleted file mode 100644 index 01fb1b1..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/smalltab.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/smalltab1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/smalltab1.png deleted file mode 100644 index 09aa718..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/smalltab1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/sousuo.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/sousuo.png deleted file mode 100644 index 7e4eb27..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/sousuo.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/sousuo1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/sousuo1.png deleted file mode 100644 index c90b5c1..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/sousuo1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/synchronous_qq_false.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/synchronous_qq_false.png deleted file mode 100644 index 945f8ca..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/synchronous_qq_false.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/synchronous_qq_true.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/synchronous_qq_true.png deleted file mode 100644 index 2d56ecd..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/synchronous_qq_true.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/synchronous_sina_false.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/synchronous_sina_false.png deleted file mode 100644 index 05d6ced..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/synchronous_sina_false.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/synchronous_sina_true.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/synchronous_sina_true.png deleted file mode 100644 index d6be967..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/synchronous_sina_true.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/title.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/title.png deleted file mode 100755 index 069b6c2..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/title.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/topbarmid.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/topbarmid.png deleted file mode 100755 index d871716..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/topbarmid.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/topbarmid1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/topbarmid1.png deleted file mode 100755 index e07c9d5..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/topbarmid1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/topbarright.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/topbarright.png deleted file mode 100755 index 574c2d3..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/topbarright.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/topbarright1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/topbarright1.png deleted file mode 100755 index d332a6f..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/topbarright1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/topleft.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/topleft.png deleted file mode 100755 index 313cd8e..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/topleft.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/topleft1.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/topleft1.png deleted file mode 100755 index 2cb87b9..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/topleft1.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/tuijian.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/tuijian.png deleted file mode 100644 index 810d22e..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/tuijian.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/welcome.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/welcome.png deleted file mode 100755 index 10d2d41..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/welcome.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/xiaoxibg.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/xiaoxibg.png deleted file mode 100644 index 8d3079e..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/xiaoxibg.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-hdpi/zhuyebg.png b/3rdparth/joy_20121011_client/res/drawable-hdpi/zhuyebg.png deleted file mode 100644 index 39004ea..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-hdpi/zhuyebg.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-ldpi/ic_launcher.png b/3rdparth/joy_20121011_client/res/drawable-ldpi/ic_launcher.png deleted file mode 100755 index 1095584..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-ldpi/ic_launcher.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable-mdpi/ic_launcher.png b/3rdparth/joy_20121011_client/res/drawable-mdpi/ic_launcher.png deleted file mode 100755 index a07c69f..0000000 Binary files a/3rdparth/joy_20121011_client/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_guanzhu.xml b/3rdparth/joy_20121011_client/res/drawable/btn_guanzhu.xml deleted file mode 100644 index 5c8a773..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_guanzhu.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_guanzhuall.xml b/3rdparth/joy_20121011_client/res/drawable/btn_guanzhuall.xml deleted file mode 100644 index 79fccd5..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_guanzhuall.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_huifu.xml b/3rdparth/joy_20121011_client/res/drawable/btn_huifu.xml deleted file mode 100644 index 306bb40..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_huifu.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_jianjie.xml b/3rdparth/joy_20121011_client/res/drawable/btn_jianjie.xml deleted file mode 100644 index 7fb23f0..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_jianjie.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_juji.xml b/3rdparth/joy_20121011_client/res/drawable/btn_juji.xml deleted file mode 100644 index e0a914a..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_juji.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_longbt.xml b/3rdparth/joy_20121011_client/res/drawable/btn_longbt.xml deleted file mode 100755 index b90ba3e..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_longbt.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_play.xml b/3rdparth/joy_20121011_client/res/drawable/btn_play.xml deleted file mode 100644 index 97c723c..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_play.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_qq.xml b/3rdparth/joy_20121011_client/res/drawable/btn_qq.xml deleted file mode 100644 index baa01d5..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_qq.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_shoucangbt.xml b/3rdparth/joy_20121011_client/res/drawable/btn_shoucangbt.xml deleted file mode 100644 index 160079c..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_shoucangbt.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_sina.xml b/3rdparth/joy_20121011_client/res/drawable/btn_sina.xml deleted file mode 100644 index 7f8f507..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_sina.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_smalltab.xml b/3rdparth/joy_20121011_client/res/drawable/btn_smalltab.xml deleted file mode 100644 index 0f0444a..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_smalltab.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_sousuo.xml b/3rdparth/joy_20121011_client/res/drawable/btn_sousuo.xml deleted file mode 100644 index 2ffdfa9..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_sousuo.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_top_left.xml b/3rdparth/joy_20121011_client/res/drawable/btn_top_left.xml deleted file mode 100755 index 5c2c709..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_top_left.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_top_right.xml b/3rdparth/joy_20121011_client/res/drawable/btn_top_right.xml deleted file mode 100755 index 5a86ca0..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_top_right.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_topbar.xml b/3rdparth/joy_20121011_client/res/drawable/btn_topbar.xml deleted file mode 100755 index 5bcf82c..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_topbar.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_topleft.xml b/3rdparth/joy_20121011_client/res/drawable/btn_topleft.xml deleted file mode 100755 index e083c80..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_topleft.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/btn_topright.xml b/3rdparth/joy_20121011_client/res/drawable/btn_topright.xml deleted file mode 100755 index 696067b..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/btn_topright.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/mm_submenu.xml b/3rdparth/joy_20121011_client/res/drawable/mm_submenu.xml deleted file mode 100755 index 88e0c24..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/mm_submenu.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/preference_first_item.xml b/3rdparth/joy_20121011_client/res/drawable/preference_first_item.xml deleted file mode 100755 index 8215bcc..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/preference_first_item.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/preference_item.xml b/3rdparth/joy_20121011_client/res/drawable/preference_item.xml deleted file mode 100755 index 02536a1..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/preference_item.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/preference_last_item.xml b/3rdparth/joy_20121011_client/res/drawable/preference_last_item.xml deleted file mode 100755 index c4bfa7c..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/preference_last_item.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/drawable/preference_single_item.xml b/3rdparth/joy_20121011_client/res/drawable/preference_single_item.xml deleted file mode 100755 index e943595..0000000 --- a/3rdparth/joy_20121011_client/res/drawable/preference_single_item.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/layout/activity01.xml b/3rdparth/joy_20121011_client/res/layout/activity01.xml deleted file mode 100755 index 3c186ff..0000000 --- a/3rdparth/joy_20121011_client/res/layout/activity01.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - diff --git a/3rdparth/joy_20121011_client/res/layout/gridview_item.xml b/3rdparth/joy_20121011_client/res/layout/gridview_item.xml deleted file mode 100755 index 06309a1..0000000 --- a/3rdparth/joy_20121011_client/res/layout/gridview_item.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/layout/guanzhuderen.xml b/3rdparth/joy_20121011_client/res/layout/guanzhuderen.xml deleted file mode 100644 index 09fd5d0..0000000 --- a/3rdparth/joy_20121011_client/res/layout/guanzhuderen.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/layout/joyactivity.xml b/3rdparth/joy_20121011_client/res/layout/joyactivity.xml deleted file mode 100644 index f307168..0000000 --- a/3rdparth/joy_20121011_client/res/layout/joyactivity.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/layout/list_item.xml b/3rdparth/joy_20121011_client/res/layout/list_item.xml deleted file mode 100644 index 607dc43..0000000 --- a/3rdparth/joy_20121011_client/res/layout/list_item.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/layout/loginactivity.xml b/3rdparth/joy_20121011_client/res/layout/loginactivity.xml deleted file mode 100644 index e64d560..0000000 --- a/3rdparth/joy_20121011_client/res/layout/loginactivity.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/layout/umeng_xp_highlight_banner.xml b/3rdparth/joy_20121011_client/res/layout/umeng_xp_highlight_banner.xml deleted file mode 100644 index 62fe653..0000000 --- a/3rdparth/joy_20121011_client/res/layout/umeng_xp_highlight_banner.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/layout/wall.xml b/3rdparth/joy_20121011_client/res/layout/wall.xml deleted file mode 100755 index b4aa89e..0000000 --- a/3rdparth/joy_20121011_client/res/layout/wall.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/3rdparth/joy_20121011_client/res/layout/welcome.xml b/3rdparth/joy_20121011_client/res/layout/welcome.xml deleted file mode 100755 index 120a88e..0000000 --- a/3rdparth/joy_20121011_client/res/layout/welcome.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/joylink/res/layout/umeng_xp_highlight_banner.xml b/joylink/res/layout/umeng_xp_highlight_banner.xml new file mode 100644 index 0000000..69f01fa --- /dev/null +++ b/joylink/res/layout/umeng_xp_highlight_banner.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/joylink/res/layout/wifi.xml b/joylink/res/layout/wifi.xml new file mode 100644 index 0000000..1c975a9 --- /dev/null +++ b/joylink/res/layout/wifi.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yueshipin/res/layout/umeng_xp_highlight_banner.xml b/yueshipin/res/layout/umeng_xp_highlight_banner.xml index 62fe653..0c56b62 100755 --- a/yueshipin/res/layout/umeng_xp_highlight_banner.xml +++ b/yueshipin/res/layout/umeng_xp_highlight_banner.xml @@ -1,152 +1,152 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -