代码更新 8.24

代码/Shop/AndroidManifest.xml

@@ -126,6 +126,10 @@
             android:name="com.stone.shop.view.MultiScreenGroup"
             android:label="@string/app_name" >
         </activity>
+        <activity
+            android:name="com.stone.shop.view.MultiScreenActivity"
+            android:label="@string/app_name" >
+        </activity>
         <activity
             android:name="com.stone.shop.view.ReservationActivity"
             android:label="@string/app_name" >

代码/Shop/bin/AndroidManifest.xml

@@ -126,6 +126,10 @@
             android:name="com.stone.shop.view.MultiScreenGroup"
             android:label="@string/app_name" >
         </activity>
+        <activity
+            android:name="com.stone.shop.view.MultiScreenActivity"
+            android:label="@string/app_name" >
+        </activity>
         <activity
             android:name="com.stone.shop.view.ReservationActivity"
             android:label="@string/app_name" >

代码/Shop/bin/jarlist.cache

@@ -0,0 +1,3 @@
+# cache for current jar dependency. DO NOT EDIT.
+# format is <lastModified> <length> <SHA-1> <path>
+# Encoding is UTF-8

代码/Shop/bin/proguard.txt

@@ -1,16 +1,16 @@
 # view res/layout/activity_shop_item.xml #generated:12
 -keep class android.support.v4.view.PagerTabStrip { <init>(...); }
 
-# view AndroidManifest.xml #generated:157
+# view AndroidManifest.xml #generated:161
 -keep class com.stone.shop.view.AboutActivity { <init>(...); }
 
 # view AndroidManifest.xml #generated:109
 -keep class com.stone.shop.view.AwardActivity { <init>(...); }
 
-# view AndroidManifest.xml #generated:163
+# view AndroidManifest.xml #generated:167
 -keep class com.stone.shop.view.BXTActivity { <init>(...); }
 
-# view AndroidManifest.xml #generated:167
+# view AndroidManifest.xml #generated:171
 -keep class com.stone.shop.view.BXTNewsActivity { <init>(...); }
 
 # view AndroidManifest.xml #generated:65
@@ -19,7 +19,7 @@
 # view AndroidManifest.xml #generated:73
 -keep class com.stone.shop.view.ClassroomActivity { <init>(...); }
 
-# view AndroidManifest.xml #generated:145
+# view AndroidManifest.xml #generated:149
 -keep class com.stone.shop.view.FeedBackActivity { <init>(...); }
 
 # view AndroidManifest.xml #generated:101
@@ -34,15 +34,18 @@
 # view AndroidManifest.xml #generated:113
 -keep class com.stone.shop.view.MineActivity { <init>(...); }
 
-# view AndroidManifest.xml #generated:133
+# view AndroidManifest.xml #generated:137
 -keep class com.stone.shop.view.MineInfoActivity { <init>(...); }
 
-# view AndroidManifest.xml #generated:137
+# view AndroidManifest.xml #generated:141
 -keep class com.stone.shop.view.MineInfoEditActivity { <init>(...); }
 
-# view AndroidManifest.xml #generated:141
+# view AndroidManifest.xml #generated:145
 -keep class com.stone.shop.view.MineSoftActivity { <init>(...); }
 
+# view AndroidManifest.xml #generated:129
+-keep class com.stone.shop.view.MultiScreenActivity { <init>(...); }
+
 # view AndroidManifest.xml #generated:125
 -keep class com.stone.shop.view.MultiScreenGroup { <init>(...); }
 
@@ -50,7 +53,7 @@
 # view res/layout/multiview.xml #generated:8
 -keep class com.stone.shop.view.MultiViewGroup { <init>(...); }
 
-# view AndroidManifest.xml #generated:153
+# view AndroidManifest.xml #generated:157
 -keep class com.stone.shop.view.NewsActivity { <init>(...); }
 
 # view AndroidManifest.xml #generated:93
@@ -62,7 +65,7 @@
 # view AndroidManifest.xml #generated:77
 -keep class com.stone.shop.view.RegisterActivity { <init>(...); }
 
-# view AndroidManifest.xml #generated:129
+# view AndroidManifest.xml #generated:133
 -keep class com.stone.shop.view.ReservationActivity { <init>(...); }
 
 # view AndroidManifest.xml #generated:81
@@ -80,7 +83,7 @@
 # view AndroidManifest.xml #generated:105
 -keep class com.stone.shop.view.WsqActivity { <init>(...); }
 
-# view AndroidManifest.xml #generated:149
+# view AndroidManifest.xml #generated:153
 -keep class com.stone.shop.view.old.OldMineActivity { <init>(...); }
 
 # 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 { <init>(...); }
 
-# view AndroidManifest.xml #generated:185
+# view AndroidManifest.xml #generated:189
 -keep class com.tencent.connect.common.AssistActivity { <init>(...); }
 
-# view AndroidManifest.xml #generated:171
+# view AndroidManifest.xml #generated:175
 -keep class com.tencent.tauth.AuthActivity { <init>(...); }
 
 # onClick res/layout/header_mine_info.xml #generated:8

代码/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);
 
 }

代码/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,10 +52,12 @@ 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() ; //<EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>
+			startActivity(intent);
+			//mulTiViewGroup.startMove() ; //<EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>
 			break;
 		case R.id.bt_scrollRight:
 			mulTiViewGroup.stopMove() ; //ֹͣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -62,4 +65,5 @@ public class MultiScreenActivity extends Activity implements OnClickListener {
 		}
 	}
 	
+
 }

代码/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();
 	}

代码/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();
 			}
 		});