Update android_server with new features.

[jduda]

• Add the Android_Item.pm module which is used for android testing and provides
  examples of how to use android display features from MH Generic_Item based
  objects.
• Added web/lib/android.xls to allow http://host/sub?android_xml to be
  displayed as a proper xml page.
• Update mh/bin and Voice_Text to move speak and play wav files from the
  main web directory in the source code tree to the html_alias_web diretory
  which is typically in the data directory.
• Update Generic_Item to remove the android_query method to determine how
  many "tags" are in play. Enhance the android_xml methods to allow better
  support for attributes which provide additional mechanisms for android
  display features.
• Update android_server.pl to fix various issues. Use JSON for communication
  in both directions on the service channel. Correct a problem with supporting
  multiple SSH tunnelled connections to multiple android devices. The service
  channel now passes "version" identifiers between host and android such that
  each side understands the version of software on the other side of the channel.
  We continue to provide backwards compatibility to earlier revisions through
  this transition.

[hollie]

Hey Jim,

Perfect, I will accept the pull request tomorrow morning.

The previous one I can simply delete.

Kind regards,
Lieven
Op 27 nov. 2012 23:04 schreef "Jim Duda" notifications@github.com het
volgende:

• Add the Android_Item.pm module which is used for android testing and
  provides examples of how to use android display features from MH
  Generic_Item based objects.
• Added web/lib/android.xls to allow http://host/sub?android_xml to be
  displayed as a proper xml page.
• Update mh/bin and Voice_Text to move speak and play wav files from
  the main web directory in the source code tree to the html_alias_web
  diretory which is typically in the data directory.
• Update Generic_Item to remove the android_query method to determine
  how many "tags" are in play. Enhance the android_xml methods to allow
  better support for attributes which provide additional mechanisms for
  android display features.
• Update android_server.pl to fix various issues. Use JSON for
  communication in both directions on the service channel. Correct a problem
  with supporting multiple SSH tunnelled connections to multiple android
  devices. The service channel now passes "version" identifiers between host
  and android such that each side understands the version of software on the
  other side of the channel. We continue to provide backwards compatibility
  to earlier revisions through this transition.

---

You can merge this Pull Request by running:

git pull https://github.com/jduda/misterhouse android_updates_pick

Or view, comment on, or merge it at:

#20
Commit Summary

• Update android_server with new features.

File Changes

• M bin/mh (5)
• M code/common/android_server.pl (200)
• A lib/Android_Item.pm (160)
• M lib/Generic_Item.pm (46)
• M lib/Voice_Cmd.pm (20)
• M lib/Voice_Text.pm (7)
• A web/lib/android.xsl (135)

Patch Links

• https://github.com/hollie/misterhouse/pull/20.patch

• https://github.com/hollie/misterhouse/pull/20.diff

  —
  Reply to this email directly or view it on GitHubhttps://github.com/Update android_server with new features. #20.

[jduda]

On 11/27/2012 05:06 PM, Lieven Hollevoet wrote:

Hey Jim,

Perfect, I will accept the pull request tomorrow morning.

But, first please test it :-)

Thanks,

Jim

[hollie]

Hi Jim,

for your reference, this is how I merged your change into master. It could not be done automatically because we made changes to the same file at the same place and you did not sync to master before creating the pull request. I fixed it by checkout out your version of the file like this:

508  git remote show
509  git remote add jduda git://github.com/jduda/misterhouse.git
510  git fetch jduda
511  git branch -a
512  git merge jduda/android_updates_pick
513  git status
514  git checkout jduda/android_updates_pick code/common/android_server.pl 
515  git status
516  git commit -m "Merged pull request of jduda #20"
517  git push origin master

[jduda]

On 11/28/2012 03:36 AM, Lieven Hollevoet wrote:

Hi Jim,

for your reference, this is how I merged your change into master. It
could not be done automatically because we made changes to the same
file at the same place and you did not sync to master before creating
the pull request. I fixed it by checkout out your version of the file
like this:

|508 git remote show
509 git remote add jduda git://github.com/jduda/misterhouse.git
510 git fetch jduda
511 git branch -a
512 git merge jduda/android_updates_pick
513 git status
514 git checkout jduda/android_updates_pick code/common/android_server.pl
515 git status
516 git commit -m "Merged pull request of jduda #20"
517 git push origin master|

|Thank you for resolving the conflict.

Regards,

Jim
|