From 27c7020c8b6b26d7968d7948246b15f1a7c28d6c Mon Sep 17 00:00:00 2001 From: kobayasi Date: Sun, 23 Sep 2012 12:22:30 +0900 Subject: [PATCH] 0.2.1 --- .gitignore | 2 + AndroidManifest.xml | 15 ++++ ant.properties | 17 ++++ build.properties | 0 build.xml | 92 ++++++++++++++++++++++ default.properties | 0 proguard-project.txt | 20 +++++ project.properties | 15 ++++ res/layout/main.xml | 13 +++ res/values/strings.xml | 4 + .../assetmanager/common/MMSConfigBaseColumns.java | 26 ++++++ .../common/playerconfig/MMSPlayerConfig.java | 65 +++++++++++++++ .../common/playerconfig/ModelMotion.java | 53 +++++++++++++ 13 files changed, 322 insertions(+) create mode 100644 .gitignore create mode 100644 AndroidManifest.xml create mode 100644 ant.properties create mode 100644 build.properties create mode 100644 build.xml create mode 100644 default.properties create mode 100644 proguard-project.txt create mode 100644 project.properties create mode 100644 res/layout/main.xml create mode 100644 res/values/strings.xml create mode 100644 src/info/projectkyoto/mms/assetmanager/common/MMSConfigBaseColumns.java create mode 100644 src/info/projectkyoto/mms/assetmanager/common/playerconfig/MMSPlayerConfig.java create mode 100644 src/info/projectkyoto/mms/assetmanager/common/playerconfig/ModelMotion.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fbcee36 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/gen/ +/nbandroid/ \ No newline at end of file diff --git a/AndroidManifest.xml b/AndroidManifest.xml new file mode 100644 index 0000000..609522a --- /dev/null +++ b/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/ant.properties b/ant.properties new file mode 100644 index 0000000..b0971e8 --- /dev/null +++ b/ant.properties @@ -0,0 +1,17 @@ +# This file is used to override default values used by the Ant build system. +# +# This file must be checked into Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/build.properties b/build.properties new file mode 100644 index 0000000..e69de29 diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..2b562c7 --- /dev/null +++ b/build.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/default.properties b/default.properties new file mode 100644 index 0000000..e69de29 diff --git a/proguard-project.txt b/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/project.properties b/project.properties new file mode 100644 index 0000000..db721fd --- /dev/null +++ b/project.properties @@ -0,0 +1,15 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-8 +android.library=true diff --git a/res/layout/main.xml b/res/layout/main.xml new file mode 100644 index 0000000..3e1b5f5 --- /dev/null +++ b/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml new file mode 100644 index 0000000..0be1647 --- /dev/null +++ b/res/values/strings.xml @@ -0,0 +1,4 @@ + + + MainActivity + diff --git a/src/info/projectkyoto/mms/assetmanager/common/MMSConfigBaseColumns.java b/src/info/projectkyoto/mms/assetmanager/common/MMSConfigBaseColumns.java new file mode 100644 index 0000000..105241b --- /dev/null +++ b/src/info/projectkyoto/mms/assetmanager/common/MMSConfigBaseColumns.java @@ -0,0 +1,26 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package info.projectkyoto.mms.assetmanager.common; + +import android.net.Uri; +import android.provider.BaseColumns; + +/** + * + * @author kobayasi + */ +public class MMSConfigBaseColumns implements BaseColumns{ + public static final String AUTHORITY = "info.projectkyoto.mms.mmsconfig"; + public static final Uri CONTENT_URI = Uri.parse("content://"+AUTHORITY+"/configs"); + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/info.projectkyoto.mms.mmsconfig"; + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/info.projectkyoto.mms.mmsconfig"; + public static final String TABLE_NAME = "mmsconfig"; + public static final String CONFIG_NAME = "config_name"; + public static final String CONFIG_TYPE = "config_type"; + public static final String DESCRIPTION = "description"; + public static final String CONFIG_DATA = "config_data"; + + public static final String CONFIG_TYPE_PLAYER_1 = "player1"; +} diff --git a/src/info/projectkyoto/mms/assetmanager/common/playerconfig/MMSPlayerConfig.java b/src/info/projectkyoto/mms/assetmanager/common/playerconfig/MMSPlayerConfig.java new file mode 100644 index 0000000..2b1f1b4 --- /dev/null +++ b/src/info/projectkyoto/mms/assetmanager/common/playerconfig/MMSPlayerConfig.java @@ -0,0 +1,65 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package info.projectkyoto.mms.assetmanager.common.playerconfig; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +/** + * + * @author kobayasi + */ +public class MMSPlayerConfig implements Serializable{ + private String musicUri; + private List modelMotionList; + + public MMSPlayerConfig() { + } + + public MMSPlayerConfig(String musicUri, List modelMotionList) { + this.musicUri = musicUri; + this.modelMotionList = modelMotionList; + } + public MMSPlayerConfig(JSONObject json) throws JSONException { + musicUri = json.getString("musicUri"); + JSONArray modelMotionArray = json.getJSONArray("modelMotionList"); + modelMotionList = new ArrayList(); + for(int i=0;i getModelMotionList() { + return modelMotionList; + } + + public void setModelMotionList(List modelMotionList) { + this.modelMotionList = modelMotionList; + } + + public String getMusicUri() { + return musicUri; + } + + public void setMusicUri(String musicUri) { + this.musicUri = musicUri; + } + +} diff --git a/src/info/projectkyoto/mms/assetmanager/common/playerconfig/ModelMotion.java b/src/info/projectkyoto/mms/assetmanager/common/playerconfig/ModelMotion.java new file mode 100644 index 0000000..dbe75d2 --- /dev/null +++ b/src/info/projectkyoto/mms/assetmanager/common/playerconfig/ModelMotion.java @@ -0,0 +1,53 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package info.projectkyoto.mms.assetmanager.common.playerconfig; + +import java.io.Serializable; +import org.json.JSONException; +import org.json.JSONObject; + +/** + * + * @author kobayasi + */ +public class ModelMotion implements Serializable { + + private String modelUri; + private String motionUri; + + public ModelMotion() { + } + + public ModelMotion(String modelUri, String motionUri) { + this.modelUri = modelUri; + this.motionUri = motionUri; + } + public ModelMotion(JSONObject jsonObject) throws JSONException { + modelUri = jsonObject.getString("modelUri"); + motionUri = jsonObject.getString("motionUri"); + } + public JSONObject toJSONObject() throws JSONException { + JSONObject jo = new JSONObject(); + jo.put("modelUri", modelUri); + jo.put("motionUri", motionUri); + return jo; + } + public String getModelUri() { + return modelUri; + } + + public void setModelUri(String modelUri) { + this.modelUri = modelUri; + } + + public String getMotionUri() { + return motionUri; + } + + public void setMotionUri(String motionUri) { + this.motionUri = motionUri; + } + +} -- 2.11.0