Skip to content

Caoligai #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elorita wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Caoligai #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f5bdde
new branch
Sailboats Mar 13, 2015
de9308b
修改了入库界面的背景颜色，buttom 样式及每个 view 之间的间隔，但是 spinner 的样式仍然是系统的原生样式，不够美观。
Sailboats Mar 13, 2015
15a18a8
增加登录功能，程序入口改为 login.java
Sailboats Mar 15, 2015
723dd5f
修复了真机不能登录的问题
Sailboats Mar 18, 2015
e644bcd
修改了 viewpager(主界面) 和入库界面的布局,还没进行真机测试
Sailboats Mar 26, 2015
e6ac94e
增加了悬浮菜单rfid管理和扫描二维码，并增加了对应的页面
Sailboats Mar 30, 2015
1c42d55
完成了基本界面和功能，细节需要完善。
Sailboats Mar 31, 2015
4fdad26
为验证 RFID 结果页面添加动作条和继续验证按钮
Sailboats Apr 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 74 additions & 58 deletions SimuHandset/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2012 - 2013 Benjamin Weiss
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="simu.app.handset"
android:versionCode="11"
android:versionName="1.8.1" >

<uses-sdk
android:minSdkVersion="4"
android:targetSdkVersion="17" />



<uses-feature
android:name="android.hardware.touchscreen"
android:required="false"/>


<application
android:name="MyApplication"
android:allowBackup="true"
android:icon="@drawable/laucher"
android:label="@string/app_name" >
<activity
android:name="simu.app.handset.CroutonDemo"
android:label="@string/app_name"
android:theme="@style/Theme.Sherlock.Light" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="simu.app.handset.SpeedActivity"></activity>
</application>

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

</manifest>
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2012 - 2013 Benjamin Weiss
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="simu.app.handset"
android:versionCode="11"
android:versionName="1.8.1" >

<uses-sdk
android:minSdkVersion="4"
android:targetSdkVersion="17" />

<uses-feature
android:name="android.hardware.touchscreen"
android:required="false" />

<application
android:name="MyApplication"
android:allowBackup="true"
android:icon="@drawable/laucher"
android:label="@string/app_name" >
<activity
android:name="simu.app.handset.Login"
android:label="@string/app_name"
android:theme="@style/Sherlock.__Theme.Light" >

<!-- android:theme="@style/android:Theme.Light" -->

<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="simu.app.handset.SpeedActivity" >
</activity>
<activity android:name="simu.app.handset.CroutonFragmentConfrim" >
</activity>
<activity android:name="simu.app.handset.VerifyRFID" >
</activity>
<activity
android:name="simu.app.handset.VerifyRFIDResult"
android:label="@string/app_name"
android:theme="@style/Sherlock.__Theme.Light" >
</activity>
<activity
android:name="simu.app.handset.CroutonDemo"
android:label="@string/app_name"
android:theme="@style/Theme.Sherlock.Light" >
>
</activity>
</application>

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

</manifest>
Expand Down
Loading