Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
35bb0440
authored
Jan 19, 2016
by
Fernando Martínez Santiago
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Pruebas con el PCB. Batch mode
parent
aa7b533d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
30 deletions
android/.idea/android.iml
android/.idea/workspace.xml
android/Pictogrammar/app/build.gradle
android/Pictogrammar/app/src/main/AndroidManifest.xml
android/Pictogrammar/app/src/main/java/com/yottacode/pictogram/gui/SerialActivity.java
android/Pictogrammar/build.gradle
android/.idea/android.iml
View file @
35bb0440
<?xml version="1.0" encoding="UTF-8"?>
<module
type=
"JAVA_MODULE"
version=
"4"
>
<component
name=
"FacetManager"
>
<facet
type=
"android"
name=
"Android"
>
<configuration>
<option
name=
"GEN_FOLDER_RELATIVE_PATH_APT"
value=
"/../../android/gen"
/>
<option
name=
"GEN_FOLDER_RELATIVE_PATH_AIDL"
value=
"/../../android/gen"
/>
<option
name=
"MANIFEST_FILE_RELATIVE_PATH"
value=
"/../../android/AndroidManifest.xml"
/>
<option
name=
"RES_FOLDER_RELATIVE_PATH"
value=
"/../../android/res"
/>
<option
name=
"ASSETS_FOLDER_RELATIVE_PATH"
value=
"/../../android/assets"
/>
<option
name=
"LIBS_FOLDER_RELATIVE_PATH"
value=
"/../../android/libs"
/>
<option
name=
"PROGUARD_LOGS_FOLDER_RELATIVE_PATH"
value=
"/../../android/proguard_logs"
/>
</configuration>
</facet>
</component>
<component
name=
"NewModuleRootManager"
inherit-compiler-output=
"true"
>
<exclude-output
/>
<content
url=
"file://$MODULE_DIR$"
/>
<orderEntry
type=
"inheritedJdk"
/>
<content
url=
"file://$MODULE_DIR$"
>
<sourceFolder
url=
"file://$MODULE_DIR$/gen"
isTestSource=
"false"
generated=
"true"
/>
</content>
<orderEntry
type=
"jdk"
jdkName=
"Android API 21 Platform"
jdkType=
"Android SDK"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
</component>
</module>
</module>
\ No newline at end of file
android/.idea/workspace.xml
View file @
35bb0440
This diff is collapsed.
Click to expand it.
android/Pictogrammar/app/build.gradle
View file @
35bb0440
apply
plugin:
'com.android.application'
android
{
compileSdkVersion
2
1
buildToolsVersion
"2
1.1.2
"
compileSdkVersion
2
3
buildToolsVersion
"2
3.0.1
"
defaultConfig
{
applicationId
"com.yottacode.pictogrammar"
minSdkVersion
19
...
...
android/Pictogrammar/app/src/main/AndroidManifest.xml
View file @
35bb0440
...
...
@@ -37,6 +37,9 @@
android:name=
".gui.MainActivity"
android:label=
"@string/app_name"
android:screenOrientation=
"landscape"
>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
</intent-filter>
</activity>
<activity
android:name=
".gui.SerialActivity"
...
...
@@ -65,7 +68,6 @@
android:screenOrientation=
"portrait"
>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
</intent-filter>
</activity>
...
...
android/Pictogrammar/app/src/main/java/com/yottacode/pictogram/gui/SerialActivity.java
View file @
35bb0440
...
...
@@ -22,27 +22,7 @@ import android.widget.EditText;
import
android.widget.TextView
;
import
android.widget.Toast
;
import
org.apache.http.HttpEntity
;
import
org.apache.http.HttpResponse
;
import
org.apache.http.HttpVersion
;
import
org.apache.http.NameValuePair
;
import
org.apache.http.StatusLine
;
import
org.apache.http.client.ClientProtocolException
;
import
org.apache.http.client.HttpClient
;
import
org.apache.http.client.methods.HttpGet
;
import
org.apache.http.client.methods.HttpPost
;
import
org.apache.http.conn.ClientConnectionManager
;
import
org.apache.http.conn.scheme.PlainSocketFactory
;
import
org.apache.http.conn.scheme.Scheme
;
import
org.apache.http.conn.scheme.SchemeRegistry
;
import
org.apache.http.conn.ssl.SSLSocketFactory
;
import
org.apache.http.entity.StringEntity
;
import
org.apache.http.impl.client.DefaultHttpClient
;
import
org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager
;
import
org.apache.http.params.BasicHttpParams
;
import
org.apache.http.params.HttpParams
;
import
org.apache.http.params.HttpProtocolParams
;
import
org.apache.http.protocol.HTTP
;
import
org.json.JSONArray
;
import
org.json.JSONException
;
import
org.json.JSONObject
;
...
...
@@ -243,13 +223,14 @@ public class SerialActivity extends Activity implements iRestapiListener, iImgDo
@Override
public
void
result
(
JSONArray
result
)
{
Log
.
d
(
LOG_TAG
,
"Users:"
+
result
.
toString
());
}
@Override
public
void
result
(
JSONObject
result
)
{
// Si llego aquí es porque hay un único valor, no un array
try
{
Log
.
d
(
LOG_TAG
,
result
.
toString
());
Log
.
d
(
LOG_TAG
,
"User:"
+
result
.
toString
());
// Saco el token y los demás valores
Vector
<
User
>
users
=
new
Vector
<
User
>(
1
);
...
...
android/Pictogrammar/build.gradle
View file @
35bb0440
...
...
@@ -5,7 +5,7 @@ buildscript {
jcenter
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:1.
3
.0'
classpath
'com.android.tools.build:gradle:1.
5
.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment