Merge branch 'xujiaming_branch' into 'master'

增加“学校通知”模块

整合覃佳明代码,添加“学校通知”模块

See merge request !2
This commit is contained in:
王尚文 2016-08-24 14:47:15 +08:00
commit 94cb177e01
536 changed files with 13254 additions and 0 deletions

BIN
Shop/.DS_Store vendored Normal file

Binary file not shown.

10
Shop/.classpath Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<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.DEPENDENCIES"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

33
Shop/.project Normal file
View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Shop</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

View File

@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8

View File

@ -0,0 +1,12 @@
eclipse.preferences.version=1
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.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6

196
Shop/AndroidManifest.xml Normal file
View File

@ -0,0 +1,196 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.stone.shop"
android:versionCode="2"
android:versionName="Beta 1.5.8" >
<uses-sdk
android:minSdkVersion="8"
android:targetSdkVersion="19" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_LOGS" />
<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
android:allowBackup="true"
android:icon="@drawable/ic_app"
android:label="@string/app_name"
android:theme="@style/NoTitleBarTheme" >
<!-- ********************************QQ登陆配置*********************************** -->
<!--
<activity
android:name="com.tencent.connect.common.AssistActivity"
android:screenOrientation="portrait"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
<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="tencent101080318" />
</intent-filter>
</activity>
-->
<!-- ********************************QQ登陆配置*********************************** -->
<activity
android:name="com.stone.shop.view.SplashActivity"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="com.stone.shop.view.BaseActivity"
android:label="@string/app_name" >
</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
android:name="com.stone.shop.view.LibraryActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.RegisterActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.ShopActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.ShopAllActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.ShopItemActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.OrderActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.OrderInfoActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.HomeActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.WsqActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.AwardActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.MineActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.ReservationActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.LibraryReservationActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.MineInfoActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.MineInfoEditActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.MineSoftActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.FeedBackActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.old.OldMineActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.NewsActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.AboutActivity"
android:label="@string/app_name" >
</activity>
<!-- 教学类 -->
<activity
android:name="com.stone.shop.view.BXTActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.BXTNewsActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.InformationActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.InfoContentActivity"
android:label="@string/app_name" >
</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>
</manifest>

View File

@ -0,0 +1,196 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.stone.shop"
android:versionCode="2"
android:versionName="Beta 1.5.8" >
<uses-sdk
android:minSdkVersion="8"
android:targetSdkVersion="19" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_LOGS" />
<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
android:allowBackup="true"
android:icon="@drawable/ic_app"
android:label="@string/app_name"
android:theme="@style/NoTitleBarTheme" >
<!-- ********************************QQ登陆配置*********************************** -->
<!--
<activity
android:name="com.tencent.connect.common.AssistActivity"
android:screenOrientation="portrait"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
<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="tencent101080318" />
</intent-filter>
</activity>
-->
<!-- ********************************QQ登陆配置*********************************** -->
<activity
android:name="com.stone.shop.view.SplashActivity"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="com.stone.shop.view.BaseActivity"
android:label="@string/app_name" >
</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
android:name="com.stone.shop.view.LibraryActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.RegisterActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.ShopActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.ShopAllActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.ShopItemActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.OrderActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.OrderInfoActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.HomeActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.WsqActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.AwardActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.MineActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.ReservationActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.LibraryReservationActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.MineInfoActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.MineInfoEditActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.MineSoftActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.FeedBackActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.old.OldMineActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.NewsActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.AboutActivity"
android:label="@string/app_name" >
</activity>
<!-- 教学类 -->
<activity
android:name="com.stone.shop.view.BXTActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.BXTNewsActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.InformationActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="com.stone.shop.view.InfoContentActivity"
android:label="@string/app_name" >
</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>
</manifest>

BIN
Shop/bin/Shop.apk Normal file

Binary file not shown.

BIN
Shop/bin/classes.dex Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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