This commit is contained in:
ram 2016-08-18 09:07:58 +08:00
parent 3ddd9c87ef
commit 4882dc9389
157 changed files with 1637 additions and 813 deletions

View File

@ -3,11 +3,6 @@
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry exported="true" kind="lib" path="libs/android-support-v4.jar"/>
<classpathentry exported="true" kind="lib" path="libs/open_sdk.jar"/>
<classpathentry exported="true" kind="lib" path="libs/mta-sdk-1.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="libs/bmob_v3.1.0beta.jar"/>
<classpathentry kind="lib" path="libs/bmobPush_0.1beta.jar"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/> <classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/> <classpathentry kind="output" path="bin/classes"/>

View File

@ -30,11 +30,4 @@
<nature>com.android.ide.eclipse.adt.AndroidNature</nature> <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<linkedResources>
<link>
<name>res/drawable-hdpi/初始背景.jpg</name>
<type>1</type>
<location>C:/Users/sandaye/Desktop/第四组界面/初始背景.jpg</location>
</link>
</linkedResources>
</projectDescription> </projectDescription>

View File

@ -1,5 +1,6 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.compliance=1.6

View File

@ -15,12 +15,25 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_LOGS" /> <uses-permission android:name="android.permission.READ_LOGS" />
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<!-- SDK2.1新增获取用户位置信息 -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.GET_TASKS" />
<application <application
android:allowBackup="true" android:allowBackup="true"
android:icon="@drawable/ic_app" android:icon="@drawable/ic_app"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/NoTitleBarTheme" > android:theme="@style/NoTitleBarTheme" >
<!-- ********************************QQ登陆配置*********************************** --> <!-- ********************************QQ登陆配置*********************************** -->
<!-- <!--
<activity <activity
@ -37,13 +50,15 @@
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="tencent101080318" /> <data android:scheme="tencent101080318" />
</intent-filter> </intent-filter>
</activity> --> </activity>
-->
<!-- ********************************QQ登陆配置*********************************** --> <!-- ********************************QQ登陆配置*********************************** -->
<activity <activity
android:name="com.stone.shop.view.LoginActivity" android:name="com.stone.shop.view.SplashActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -51,6 +66,14 @@
android:name="com.stone.shop.view.BaseActivity" android:name="com.stone.shop.view.BaseActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity
android:name="com.stone.shop.view.LoginActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.ClassroomActivity"
android:label="@string/app_name" >
</activity>
<activity <activity
android:name="com.stone.shop.view.RegisterActivity" android:name="com.stone.shop.view.RegisterActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
@ -91,6 +114,10 @@
android:name="com.stone.shop.view.MineActivity" android:name="com.stone.shop.view.MineActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity
android:name="com.stone.shop.view.ReservationActivity"
android:label="@string/app_name" >
</activity>
<activity <activity
android:name="com.stone.shop.view.MineInfoActivity" android:name="com.stone.shop.view.MineInfoActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
@ -129,6 +156,25 @@
android:name="com.stone.shop.view.BXTNewsActivity" android:name="com.stone.shop.view.BXTNewsActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity
android:name="com.tencent.tauth.AuthActivity"
android:launchMode="singleTask"
android:noHistory="true" >
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="tencent222222" />
<!-- 100380359 100381104 222222 -->
</intent-filter>
</activity>
<activity
android:name="com.tencent.connect.common.AssistActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="behind"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
</application> </application>
</manifest> </manifest>

View File

@ -15,12 +15,25 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_LOGS" /> <uses-permission android:name="android.permission.READ_LOGS" />
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<!-- SDK2.1新增获取用户位置信息 -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.GET_TASKS" />
<application <application
android:allowBackup="true" android:allowBackup="true"
android:icon="@drawable/ic_app" android:icon="@drawable/ic_app"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/NoTitleBarTheme" > android:theme="@style/NoTitleBarTheme" >
<!-- ********************************QQ登陆配置*********************************** --> <!-- ********************************QQ登陆配置*********************************** -->
<!-- <!--
<activity <activity
@ -37,13 +50,15 @@
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="tencent101080318" /> <data android:scheme="tencent101080318" />
</intent-filter> </intent-filter>
</activity> --> </activity>
-->
<!-- ********************************QQ登陆配置*********************************** --> <!-- ********************************QQ登陆配置*********************************** -->
<activity <activity
android:name="com.stone.shop.view.LoginActivity" android:name="com.stone.shop.view.SplashActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -51,6 +66,14 @@
android:name="com.stone.shop.view.BaseActivity" android:name="com.stone.shop.view.BaseActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity
android:name="com.stone.shop.view.LoginActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.ClassroomActivity"
android:label="@string/app_name" >
</activity>
<activity <activity
android:name="com.stone.shop.view.RegisterActivity" android:name="com.stone.shop.view.RegisterActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
@ -91,6 +114,10 @@
android:name="com.stone.shop.view.MineActivity" android:name="com.stone.shop.view.MineActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity
android:name="com.stone.shop.view.ReservationActivity"
android:label="@string/app_name" >
</activity>
<activity <activity
android:name="com.stone.shop.view.MineInfoActivity" android:name="com.stone.shop.view.MineInfoActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
@ -129,6 +156,25 @@
android:name="com.stone.shop.view.BXTNewsActivity" android:name="com.stone.shop.view.BXTNewsActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity
android:name="com.tencent.tauth.AuthActivity"
android:launchMode="singleTask"
android:noHistory="true" >
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="tencent222222" />
<!-- 100380359 100381104 222222 -->
</intent-filter>
</activity>
<activity
android:name="com.tencent.connect.common.AssistActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="behind"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
</application> </application>
</manifest> </manifest>

Binary file not shown.

Binary file not shown.

View File

@ -1,67 +1,76 @@
# view res/layout/activity_shop_item.xml #generated:12 # view res/layout/activity_shop_item.xml #generated:12
-keep class android.support.v4.view.PagerTabStrip { <init>(...); } -keep class android.support.v4.view.PagerTabStrip { <init>(...); }
# view AndroidManifest.xml #generated:118 # view AndroidManifest.xml #generated:145
-keep class com.stone.shop.view.AboutActivity { <init>(...); } -keep class com.stone.shop.view.AboutActivity { <init>(...); }
# view AndroidManifest.xml #generated:86 # view AndroidManifest.xml #generated:109
-keep class com.stone.shop.view.AwardActivity { <init>(...); } -keep class com.stone.shop.view.AwardActivity { <init>(...); }
# view AndroidManifest.xml #generated:124 # view AndroidManifest.xml #generated:151
-keep class com.stone.shop.view.BXTActivity { <init>(...); } -keep class com.stone.shop.view.BXTActivity { <init>(...); }
# view AndroidManifest.xml #generated:128 # view AndroidManifest.xml #generated:155
-keep class com.stone.shop.view.BXTNewsActivity { <init>(...); } -keep class com.stone.shop.view.BXTNewsActivity { <init>(...); }
# view AndroidManifest.xml #generated:50 # view AndroidManifest.xml #generated:65
-keep class com.stone.shop.view.BaseActivity { <init>(...); } -keep class com.stone.shop.view.BaseActivity { <init>(...); }
# view AndroidManifest.xml #generated:106 # view AndroidManifest.xml #generated:73
-keep class com.stone.shop.view.ClassroomActivity { <init>(...); }
# view AndroidManifest.xml #generated:133
-keep class com.stone.shop.view.FeedBackActivity { <init>(...); } -keep class com.stone.shop.view.FeedBackActivity { <init>(...); }
# view AndroidManifest.xml #generated:78 # view AndroidManifest.xml #generated:101
-keep class com.stone.shop.view.HomeActivity { <init>(...); } -keep class com.stone.shop.view.HomeActivity { <init>(...); }
# view AndroidManifest.xml #generated:42 # view AndroidManifest.xml #generated:69
-keep class com.stone.shop.view.LoginActivity { <init>(...); } -keep class com.stone.shop.view.LoginActivity { <init>(...); }
# view AndroidManifest.xml #generated:90 # view AndroidManifest.xml #generated:113
-keep class com.stone.shop.view.MineActivity { <init>(...); } -keep class com.stone.shop.view.MineActivity { <init>(...); }
# view AndroidManifest.xml #generated:94 # view AndroidManifest.xml #generated:121
-keep class com.stone.shop.view.MineInfoActivity { <init>(...); } -keep class com.stone.shop.view.MineInfoActivity { <init>(...); }
# view AndroidManifest.xml #generated:98 # view AndroidManifest.xml #generated:125
-keep class com.stone.shop.view.MineInfoEditActivity { <init>(...); } -keep class com.stone.shop.view.MineInfoEditActivity { <init>(...); }
# view AndroidManifest.xml #generated:102 # view AndroidManifest.xml #generated:129
-keep class com.stone.shop.view.MineSoftActivity { <init>(...); } -keep class com.stone.shop.view.MineSoftActivity { <init>(...); }
# view AndroidManifest.xml #generated:114 # view AndroidManifest.xml #generated:141
-keep class com.stone.shop.view.NewsActivity { <init>(...); } -keep class com.stone.shop.view.NewsActivity { <init>(...); }
# view AndroidManifest.xml #generated:70 # view AndroidManifest.xml #generated:93
-keep class com.stone.shop.view.OrderActivity { <init>(...); } -keep class com.stone.shop.view.OrderActivity { <init>(...); }
# view AndroidManifest.xml #generated:74 # view AndroidManifest.xml #generated:97
-keep class com.stone.shop.view.OrderInfoActivity { <init>(...); } -keep class com.stone.shop.view.OrderInfoActivity { <init>(...); }
# view AndroidManifest.xml #generated:54 # view AndroidManifest.xml #generated:77
-keep class com.stone.shop.view.RegisterActivity { <init>(...); } -keep class com.stone.shop.view.RegisterActivity { <init>(...); }
# view AndroidManifest.xml #generated:58 # view AndroidManifest.xml #generated:117
-keep class com.stone.shop.view.ReservationActivity { <init>(...); }
# view AndroidManifest.xml #generated:81
-keep class com.stone.shop.view.ShopActivity { <init>(...); } -keep class com.stone.shop.view.ShopActivity { <init>(...); }
# view AndroidManifest.xml #generated:62 # view AndroidManifest.xml #generated:85
-keep class com.stone.shop.view.ShopAllActivity { <init>(...); } -keep class com.stone.shop.view.ShopAllActivity { <init>(...); }
# view AndroidManifest.xml #generated:66 # view AndroidManifest.xml #generated:89
-keep class com.stone.shop.view.ShopItemActivity { <init>(...); } -keep class com.stone.shop.view.ShopItemActivity { <init>(...); }
# view AndroidManifest.xml #generated:82 # view AndroidManifest.xml #generated:56
-keep class com.stone.shop.view.SplashActivity { <init>(...); }
# view AndroidManifest.xml #generated:105
-keep class com.stone.shop.view.WsqActivity { <init>(...); } -keep class com.stone.shop.view.WsqActivity { <init>(...); }
# view AndroidManifest.xml #generated:110 # view AndroidManifest.xml #generated:137
-keep class com.stone.shop.view.old.OldMineActivity { <init>(...); } -keep class com.stone.shop.view.old.OldMineActivity { <init>(...); }
# view res/layout/activity_home.xml #generated:85 # view res/layout/activity_home.xml #generated:85
@ -70,15 +79,21 @@
# view res/layout/activity_home.xml #generated:12 # view res/layout/activity_home.xml #generated:12
-keep class com.stone.ui.ListScrollView { <init>(...); } -keep class com.stone.ui.ListScrollView { <init>(...); }
# view res/layout/activity_shop.xml #generated:119 # view res/layout/activity_shop.xml #generated:128
# view res/layout/activity_shop.xml #generated:151 # view res/layout/activity_shop.xml #generated:160
# view res/layout/activity_shop.xml #generated:39 # view res/layout/activity_shop.xml #generated:47
# view res/layout/activity_shop.xml #generated:79 # view res/layout/activity_shop.xml #generated:88
-keep class com.stone.ui.MyGridView { <init>(...); } -keep class com.stone.ui.MyGridView { <init>(...); }
# view res/layout/activity_shop_item.xml #generated:6 # view res/layout/activity_shop_item.xml #generated:6
-keep class com.stone.ui.ViewPagerCompat { <init>(...); } -keep class com.stone.ui.ViewPagerCompat { <init>(...); }
# view AndroidManifest.xml #generated:173
-keep class com.tencent.connect.common.AssistActivity { <init>(...); }
# view AndroidManifest.xml #generated:159
-keep class com.tencent.tauth.AuthActivity { <init>(...); }
# onClick res/layout/header_mine_info.xml #generated:8 # onClick res/layout/header_mine_info.xml #generated:8
-keepclassmembers class * { *** clickBack(...); } -keepclassmembers class * { *** clickBack(...); }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 556 B

After

Width:  |  Height:  |  Size: 525 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 570 B

After

Width:  |  Height:  |  Size: 531 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 471 B

After

Width:  |  Height:  |  Size: 442 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 464 B

After

Width:  |  Height:  |  Size: 435 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 922 B

Some files were not shown because too many files have changed in this diff Show More