diff --git a/代码/Shop/AndroidManifest.xml b/代码/Shop/AndroidManifest.xml index 5c8ca9f..09a6837 100644 --- a/代码/Shop/AndroidManifest.xml +++ b/代码/Shop/AndroidManifest.xml @@ -126,6 +126,10 @@ android:name="com.stone.shop.view.MultiScreenGroup" android:label="@string/app_name" > + + diff --git a/代码/Shop/bin/AndroidManifest.xml b/代码/Shop/bin/AndroidManifest.xml index 5c8ca9f..09a6837 100644 --- a/代码/Shop/bin/AndroidManifest.xml +++ b/代码/Shop/bin/AndroidManifest.xml @@ -126,6 +126,10 @@ android:name="com.stone.shop.view.MultiScreenGroup" android:label="@string/app_name" > + + diff --git a/代码/Shop/bin/Shop.apk b/代码/Shop/bin/Shop.apk index 6ba7a17..fb92b4d 100644 Binary files a/代码/Shop/bin/Shop.apk and b/代码/Shop/bin/Shop.apk differ diff --git a/代码/Shop/bin/classes.dex b/代码/Shop/bin/classes.dex index 8c9fc10..142a73e 100644 Binary files a/代码/Shop/bin/classes.dex and b/代码/Shop/bin/classes.dex differ diff --git a/代码/Shop/bin/classes/com/stone/shop/view/MainActivity.class b/代码/Shop/bin/classes/com/stone/shop/view/MainActivity.class index 32045ca..873ae7a 100644 Binary files a/代码/Shop/bin/classes/com/stone/shop/view/MainActivity.class and b/代码/Shop/bin/classes/com/stone/shop/view/MainActivity.class differ diff --git a/代码/Shop/bin/classes/com/stone/shop/view/MultiScreenActivity.class b/代码/Shop/bin/classes/com/stone/shop/view/MultiScreenActivity.class index 0ad6648..9864bd2 100644 Binary files a/代码/Shop/bin/classes/com/stone/shop/view/MultiScreenActivity.class and b/代码/Shop/bin/classes/com/stone/shop/view/MultiScreenActivity.class differ diff --git a/代码/Shop/bin/classes/com/stone/shop/view/MultiViewGroup.class b/代码/Shop/bin/classes/com/stone/shop/view/MultiViewGroup.class index 7b4cc81..d77fa2d 100644 Binary files a/代码/Shop/bin/classes/com/stone/shop/view/MultiViewGroup.class and b/代码/Shop/bin/classes/com/stone/shop/view/MultiViewGroup.class differ diff --git a/代码/Shop/bin/classes/com/stone/shop/view/SplashActivity$1.class b/代码/Shop/bin/classes/com/stone/shop/view/SplashActivity$1.class index 09730d3..56e0ae6 100644 Binary files a/代码/Shop/bin/classes/com/stone/shop/view/SplashActivity$1.class and b/代码/Shop/bin/classes/com/stone/shop/view/SplashActivity$1.class differ diff --git a/代码/Shop/bin/dexedLibs/android-support-v4-9b31d1575c9ee13eb9e9762cdda835b9.jar b/代码/Shop/bin/dexedLibs/android-support-v4-3916f2fc48f5ad399783eb11c5a1f966.jar similarity index 99% rename from 代码/Shop/bin/dexedLibs/android-support-v4-9b31d1575c9ee13eb9e9762cdda835b9.jar rename to 代码/Shop/bin/dexedLibs/android-support-v4-3916f2fc48f5ad399783eb11c5a1f966.jar index 63cff80..c630d88 100644 Binary files a/代码/Shop/bin/dexedLibs/android-support-v4-9b31d1575c9ee13eb9e9762cdda835b9.jar and b/代码/Shop/bin/dexedLibs/android-support-v4-3916f2fc48f5ad399783eb11c5a1f966.jar differ diff --git a/代码/Shop/bin/dexedLibs/bmobPush_0.1beta-2a683b0cbe3b726919169397d9bc1b75.jar b/代码/Shop/bin/dexedLibs/bmobPush_0.1beta-b1b2cb926b87965389423f71d7d841ea.jar similarity index 99% rename from 代码/Shop/bin/dexedLibs/bmobPush_0.1beta-2a683b0cbe3b726919169397d9bc1b75.jar rename to 代码/Shop/bin/dexedLibs/bmobPush_0.1beta-b1b2cb926b87965389423f71d7d841ea.jar index f512f15..c1128b6 100644 Binary files a/代码/Shop/bin/dexedLibs/bmobPush_0.1beta-2a683b0cbe3b726919169397d9bc1b75.jar and b/代码/Shop/bin/dexedLibs/bmobPush_0.1beta-b1b2cb926b87965389423f71d7d841ea.jar differ diff --git a/代码/Shop/bin/dexedLibs/bmob_v3.1.0beta-76cd134b4a22ef94eb23a3912f3f5c64.jar b/代码/Shop/bin/dexedLibs/bmob_v3.1.0beta-dd32da1911cf6c330485c102e5b302a2.jar similarity index 95% rename from 代码/Shop/bin/dexedLibs/bmob_v3.1.0beta-76cd134b4a22ef94eb23a3912f3f5c64.jar rename to 代码/Shop/bin/dexedLibs/bmob_v3.1.0beta-dd32da1911cf6c330485c102e5b302a2.jar index 27bbd3c..c54e46a 100644 Binary files a/代码/Shop/bin/dexedLibs/bmob_v3.1.0beta-76cd134b4a22ef94eb23a3912f3f5c64.jar and b/代码/Shop/bin/dexedLibs/bmob_v3.1.0beta-dd32da1911cf6c330485c102e5b302a2.jar differ diff --git a/代码/Shop/bin/dexedLibs/mta-sdk-1.6.2-e791cdd8f12795b98d16d11983746acd.jar b/代码/Shop/bin/dexedLibs/mta-sdk-1.6.2-1602b769944d4f57d7f77f7e08d2db71.jar similarity index 99% rename from 代码/Shop/bin/dexedLibs/mta-sdk-1.6.2-e791cdd8f12795b98d16d11983746acd.jar rename to 代码/Shop/bin/dexedLibs/mta-sdk-1.6.2-1602b769944d4f57d7f77f7e08d2db71.jar index deb8ba7..8372ea3 100644 Binary files a/代码/Shop/bin/dexedLibs/mta-sdk-1.6.2-e791cdd8f12795b98d16d11983746acd.jar and b/代码/Shop/bin/dexedLibs/mta-sdk-1.6.2-1602b769944d4f57d7f77f7e08d2db71.jar differ diff --git a/代码/Shop/bin/dexedLibs/open_sdk_r5756-cec0e2d8f96eb34b85a191fffdb0fce6.jar b/代码/Shop/bin/dexedLibs/open_sdk_r5756-f6c2a769efd64e0d57311c92da0d6bba.jar similarity index 98% rename from 代码/Shop/bin/dexedLibs/open_sdk_r5756-cec0e2d8f96eb34b85a191fffdb0fce6.jar rename to 代码/Shop/bin/dexedLibs/open_sdk_r5756-f6c2a769efd64e0d57311c92da0d6bba.jar index bb9fde3..d91e62d 100644 Binary files a/代码/Shop/bin/dexedLibs/open_sdk_r5756-cec0e2d8f96eb34b85a191fffdb0fce6.jar and b/代码/Shop/bin/dexedLibs/open_sdk_r5756-f6c2a769efd64e0d57311c92da0d6bba.jar differ diff --git a/代码/Shop/bin/jarlist.cache b/代码/Shop/bin/jarlist.cache new file mode 100644 index 0000000..0565465 --- /dev/null +++ b/代码/Shop/bin/jarlist.cache @@ -0,0 +1,3 @@ +# cache for current jar dependency. DO NOT EDIT. +# format is +# Encoding is UTF-8 diff --git a/代码/Shop/bin/proguard.txt b/代码/Shop/bin/proguard.txt index d73c224..01aa138 100644 --- a/代码/Shop/bin/proguard.txt +++ b/代码/Shop/bin/proguard.txt @@ -1,16 +1,16 @@ # view res/layout/activity_shop_item.xml #generated:12 -keep class android.support.v4.view.PagerTabStrip { (...); } -# view AndroidManifest.xml #generated:157 +# view AndroidManifest.xml #generated:161 -keep class com.stone.shop.view.AboutActivity { (...); } # view AndroidManifest.xml #generated:109 -keep class com.stone.shop.view.AwardActivity { (...); } -# view AndroidManifest.xml #generated:163 +# view AndroidManifest.xml #generated:167 -keep class com.stone.shop.view.BXTActivity { (...); } -# view AndroidManifest.xml #generated:167 +# view AndroidManifest.xml #generated:171 -keep class com.stone.shop.view.BXTNewsActivity { (...); } # view AndroidManifest.xml #generated:65 @@ -19,7 +19,7 @@ # view AndroidManifest.xml #generated:73 -keep class com.stone.shop.view.ClassroomActivity { (...); } -# view AndroidManifest.xml #generated:145 +# view AndroidManifest.xml #generated:149 -keep class com.stone.shop.view.FeedBackActivity { (...); } # view AndroidManifest.xml #generated:101 @@ -34,15 +34,18 @@ # view AndroidManifest.xml #generated:113 -keep class com.stone.shop.view.MineActivity { (...); } -# view AndroidManifest.xml #generated:133 +# view AndroidManifest.xml #generated:137 -keep class com.stone.shop.view.MineInfoActivity { (...); } -# view AndroidManifest.xml #generated:137 +# view AndroidManifest.xml #generated:141 -keep class com.stone.shop.view.MineInfoEditActivity { (...); } -# view AndroidManifest.xml #generated:141 +# view AndroidManifest.xml #generated:145 -keep class com.stone.shop.view.MineSoftActivity { (...); } +# view AndroidManifest.xml #generated:129 +-keep class com.stone.shop.view.MultiScreenActivity { (...); } + # view AndroidManifest.xml #generated:125 -keep class com.stone.shop.view.MultiScreenGroup { (...); } @@ -50,7 +53,7 @@ # view res/layout/multiview.xml #generated:8 -keep class com.stone.shop.view.MultiViewGroup { (...); } -# view AndroidManifest.xml #generated:153 +# view AndroidManifest.xml #generated:157 -keep class com.stone.shop.view.NewsActivity { (...); } # view AndroidManifest.xml #generated:93 @@ -62,7 +65,7 @@ # view AndroidManifest.xml #generated:77 -keep class com.stone.shop.view.RegisterActivity { (...); } -# view AndroidManifest.xml #generated:129 +# view AndroidManifest.xml #generated:133 -keep class com.stone.shop.view.ReservationActivity { (...); } # view AndroidManifest.xml #generated:81 @@ -80,7 +83,7 @@ # view AndroidManifest.xml #generated:105 -keep class com.stone.shop.view.WsqActivity { (...); } -# view AndroidManifest.xml #generated:149 +# view AndroidManifest.xml #generated:153 -keep class com.stone.shop.view.old.OldMineActivity { (...); } # view res/layout/activity_home.xml #generated:85 @@ -98,10 +101,10 @@ # view res/layout/activity_shop_item.xml #generated:6 -keep class com.stone.ui.ViewPagerCompat { (...); } -# view AndroidManifest.xml #generated:185 +# view AndroidManifest.xml #generated:189 -keep class com.tencent.connect.common.AssistActivity { (...); } -# view AndroidManifest.xml #generated:171 +# view AndroidManifest.xml #generated:175 -keep class com.tencent.tauth.AuthActivity { (...); } # onClick res/layout/header_mine_info.xml #generated:8 diff --git a/代码/Shop/bin/resources.ap_ b/代码/Shop/bin/resources.ap_ index 64df08f..4f8b205 100644 Binary files a/代码/Shop/bin/resources.ap_ and b/代码/Shop/bin/resources.ap_ differ diff --git a/代码/Shop/src/com/stone/shop/view/MainActivity.java b/代码/Shop/src/com/stone/shop/view/MainActivity.java index 71f0ca6..455bf4f 100644 --- a/代码/Shop/src/com/stone/shop/view/MainActivity.java +++ b/代码/Shop/src/com/stone/shop/view/MainActivity.java @@ -54,6 +54,5 @@ public class MainActivity extends Activity implements OnClickListener { } - Intent intent = new Intent(MainActivity.this,LoginActivity.class); } diff --git a/代码/Shop/src/com/stone/shop/view/MultiScreenActivity.java b/代码/Shop/src/com/stone/shop/view/MultiScreenActivity.java index 4416659..b1c2e08 100644 --- a/代码/Shop/src/com/stone/shop/view/MultiScreenActivity.java +++ b/代码/Shop/src/com/stone/shop/view/MultiScreenActivity.java @@ -1,8 +1,9 @@ package com.stone.shop.view; import com.stone.shop.R; - +import android.content.Intent; import android.app.Activity; +import android.content.Intent; import android.os.Bundle; import android.util.DisplayMetrics; import android.view.View; @@ -51,15 +52,18 @@ public class MultiScreenActivity extends Activity implements OnClickListener { @Override public void onClick(View v) { // TODO Auto-generated method stub + Intent intent = new Intent(MultiScreenActivity.this,LoginActivity.class); switch (v.getId()) { case R.id.bt_scrollLeft: - mulTiViewGroup.startMove() ; //��һ�� + startActivity(intent); + //mulTiViewGroup.startMove() ; //��һ�� break; case R.id.bt_scrollRight: mulTiViewGroup.stopMove() ; //ֹͣ���� break; } } + } diff --git a/代码/Shop/src/com/stone/shop/view/MultiViewGroup.java b/代码/Shop/src/com/stone/shop/view/MultiViewGroup.java index cec3975..cf420c9 100644 --- a/代码/Shop/src/com/stone/shop/view/MultiViewGroup.java +++ b/代码/Shop/src/com/stone/shop/view/MultiViewGroup.java @@ -1,6 +1,6 @@ package com.stone.shop.view; -import android.R; +import com.stone.shop.R; import android.app.Activity; import android.content.Context; import android.graphics.Canvas; @@ -297,18 +297,25 @@ public class MultiViewGroup extends ViewGroup { // 初始化3个 LinearLayout控件 LinearLayout oneLL = new LinearLayout(mContext); - //oneLL.setBackground(R.drawable.); - oneLL.setBackgroundColor(Color.RED); + oneLL.setBackground(getResources().getDrawable(R.drawable.w01)); addView(oneLL); LinearLayout twoLL = new LinearLayout(mContext); - twoLL.setBackgroundColor(Color.YELLOW); + twoLL.setBackground(getResources().getDrawable(R.drawable.w02)); addView(twoLL); LinearLayout threeLL = new LinearLayout(mContext); - threeLL.setBackgroundColor(Color.BLUE); + threeLL.setBackground(getResources().getDrawable(R.drawable.w03)); addView(threeLL); + LinearLayout fourLL = new LinearLayout(mContext); + fourLL.setBackground(getResources().getDrawable(R.drawable.w04)); + addView(fourLL); + + LinearLayout fiveLL = new LinearLayout(mContext); + fiveLL.setBackground(getResources().getDrawable(R.drawable.w05)); + addView(fiveLL); + //初始化一个最小滑动距离 mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop(); } diff --git a/代码/Shop/src/com/stone/shop/view/SplashActivity.java b/代码/Shop/src/com/stone/shop/view/SplashActivity.java index 6baf56c..fbb1d72 100644 --- a/代码/Shop/src/com/stone/shop/view/SplashActivity.java +++ b/代码/Shop/src/com/stone/shop/view/SplashActivity.java @@ -65,8 +65,8 @@ public class SplashActivity extends Activity { @Override public void onAnimationEnd(Animation arg0) { startActivity(new Intent(SplashActivity.this, - MainActivity.class)); - finish(); + MultiScreenActivity.class)); + //finish(); } });