rhodes 2.2.6 → 2.3.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +20 -0
- data/README.md +46 -0
- data/Rakefile +85 -80
- data/bin/rhodes +2 -2
- data/bin/rhogen +1 -1
- data/doc/application.txt +277 -0
- data/doc/bb-css.txt +209 -0
- data/doc/build.txt +785 -0
- data/doc/configuration.txt +236 -0
- data/doc/connect-to-web-services.txt +282 -0
- data/doc/contributing.txt +64 -0
- data/doc/css-framework.txt +144 -0
- data/doc/device-caps.txt +1152 -0
- data/doc/extensions.txt +528 -0
- data/doc/files.txt +4 -0
- data/doc/generator.txt +141 -0
- data/doc/install.txt +35 -0
- data/doc/introduction.txt +88 -0
- data/doc/rhom.txt +826 -0
- data/doc/standard-css.txt +392 -0
- data/doc/synchronization.txt +542 -0
- data/doc/test-log-debug.txt +148 -0
- data/doc/tutorial.txt +136 -0
- data/doc/ui.txt +766 -0
- data/installer/EnvVarUpdate.nsh +328 -0
- data/installer/README.html +81 -0
- data/installer/RHOSYNC-LICENSE.txt +675 -0
- data/installer/icon.ico +0 -0
- data/installer/instant-rhodes.nsi +427 -0
- data/lib/build/jake.rb +15 -1
- data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/imageprovider.cpp +1 -1
- data/lib/extensions/barcode/ext/barcode/platform/bb/Barcode6.files +45 -0
- data/lib/extensions/barcode/ext/barcode/platform/bb/Rakefile +6 -0
- data/lib/extensions/barcode/ext/barcode/platform/bb/barcode6.jdp +92 -0
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Barcode.xcodeproj/project.pbxproj +7 -4
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Rakefile +2 -1
- data/lib/extensions/barcode/ext/barcode/platform/wm/src/wm_imageprovider.cpp +1 -1
- data/lib/extensions/digest-sha1/ext/build.bat +1 -0
- data/lib/extensions/digest-sha1/ext/digest-sha1.vcproj +335 -0
- data/lib/extensions/esri/ext/build +17 -0
- data/lib/extensions/esri/ext/build.bat +29 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.h +7 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.mm +58 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactoryRegister.mm +22 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.h +21 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.mm +32 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/InitESRI.c +5 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.h +143 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.m +919 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/ESRI.xcodeproj/project.pbxproj +320 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/ESRI_Prefix.pch +7 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Rakefile +76 -0
- data/lib/extensions/esri/ext.yml +3 -0
- data/lib/extensions/net-http/monitor.rb +265 -0
- data/lib/extensions/net-http/net/ftp.rb +981 -0
- data/lib/extensions/net-http/thread.rb +367 -0
- data/lib/extensions/rhocgi/cgi.rb +16 -0
- data/lib/extensions/rhospec/rhospec.rb +118 -0
- data/lib/framework/base64.rb +91 -0
- data/lib/framework/builtinME.rb +13 -10
- data/lib/framework/ostruct.rb +145 -0
- data/lib/framework/res/back_btn.wm.png +0 -0
- data/lib/framework/res/blue_pushpin.wm.png +0 -0
- data/lib/framework/res/blue_pushpin_small.wm.png +0 -0
- data/lib/framework/res/callout.wm.png +0 -0
- data/lib/framework/res/callout_link.wm.png +0 -0
- data/lib/framework/res/forward_btn.wm.png +0 -0
- data/lib/framework/res/home_btn.wm.png +0 -0
- data/lib/framework/res/options_btn.wm.png +0 -0
- data/lib/framework/res/refresh_btn.wm.png +0 -0
- data/lib/framework/rho/render.rb +5 -2
- data/lib/framework/rho/rho.rb +320 -50
- data/lib/framework/rho/rhoapplication.rb +48 -10
- data/lib/framework/rho/rhonativeviewmanager.rb +73 -0
- data/lib/framework/rho/rhosupport.rb +15 -1
- data/lib/framework/rho/rhotabbar.rb +29 -0
- data/lib/framework/rho/rhotoolbar.rb +17 -0
- data/lib/framework/rho/rhoutils.rb +22 -6
- data/lib/framework/rhodes.rb +1 -1
- data/lib/framework/rholang/rhomsg_de.rb +4 -3
- data/lib/framework/rholang/rhomsg_en.rb +1 -0
- data/lib/framework/rholang/rhomsg_es.rb +1 -0
- data/lib/framework/rholang/rhomsg_it.rb +1 -0
- data/lib/framework/rhom/rhom.rb +31 -10
- data/lib/framework/rhom/rhom_db_adapter.rb +33 -23
- data/lib/framework/rhom/rhom_object_factory.rb +465 -249
- data/lib/framework/rhom/rhom_source.rb +22 -7
- data/lib/framework/version.rb +1 -1
- data/lib/rhodes.rb +1 -1
- data/platform/android/Rhodes/AndroidManifest.xml +83 -20
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java +5 -0
- data/platform/android/Rhodes/jni/include/rhodes/RhoClassFactory.h +2 -0
- data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc +9 -5
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesAppOptions.h +53 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +46 -56
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_SplashScreen.h +10 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_mapview_MapView.h +93 -0
- data/platform/android/Rhodes/jni/include/rhodes/rhocryptimpl.h +38 -0
- data/platform/android/Rhodes/jni/include/rhodes.h +64 -8
- data/platform/android/Rhodes/jni/src/RhoClassFactory.cpp +6 -0
- data/platform/android/Rhodes/jni/src/alert.cpp +5 -11
- data/platform/android/Rhodes/jni/src/bluetooth.cpp +66 -29
- data/platform/android/Rhodes/jni/src/callbacks.cpp +24 -21
- data/platform/android/Rhodes/jni/src/camera.cpp +2 -6
- data/platform/android/Rhodes/jni/src/datetimepicker.cpp +13 -11
- data/platform/android/Rhodes/jni/src/event.cpp +9 -15
- data/platform/android/Rhodes/jni/src/fileapi.cpp +13 -27
- data/platform/android/Rhodes/jni/src/logconf.cpp +3 -3
- data/platform/android/Rhodes/jni/src/mapview.cpp +696 -16
- data/platform/android/Rhodes/jni/src/menu.cpp +3 -3
- data/platform/android/Rhodes/jni/src/nativebar.cpp +55 -4
- data/platform/android/Rhodes/jni/src/nativeview.cpp +33 -0
- data/platform/android/Rhodes/jni/src/phonebook.cpp +6 -11
- data/platform/android/Rhodes/jni/src/rhoconf.cpp +4 -4
- data/platform/android/Rhodes/jni/src/rhocryptimpl.cpp +87 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +55 -34
- data/platform/android/Rhodes/jni/src/ringtones.cpp +2 -3
- data/platform/android/Rhodes/jni/src/signature.cpp +3 -5
- data/platform/android/Rhodes/jni/src/splashscreen.cpp +7 -0
- data/platform/android/Rhodes/jni/src/sslimpl.cpp +17 -20
- data/platform/android/Rhodes/jni/src/webview.cpp +13 -12
- data/platform/android/Rhodes/res/drawable/callout.png +0 -0
- data/platform/android/Rhodes/res/drawable/callout_link.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_cancel.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_clear.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_ok.png +0 -0
- data/platform/android/Rhodes/res/layout/datetime.xml +4 -0
- data/platform/android/Rhodes/res/layout/signature.xml +24 -17
- data/platform/android/Rhodes/res/layout/status_bar_ongoing_event_progress_bar.xml +102 -0
- data/platform/android/Rhodes/res/values/strings.xml +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Base64.java +575 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java +83 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +21 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +23 -15
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java +151 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +372 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java +11 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +58 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +705 -523
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java +167 -85
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java +36 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +4 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +33 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java +2 -6
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java +2 -24
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java +106 -36
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java +15 -58
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java +0 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +6 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java +4 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +91 -27
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java +6 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java +275 -42
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +1 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +120 -43
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +518 -28
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java +434 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapTouch.java +20 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +296 -336
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java +111 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java +77 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java +10 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +0 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java +6 -11
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +6 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java +0 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java +9 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java +8 -8
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java +11 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +3 -5
- data/platform/android/build/RhodesSRC_build.files +32 -23
- data/platform/android/build/android.rake +28 -11
- data/platform/android/build/androidcommon.rb +2 -0
- data/platform/android/build/librhocommon_build.files +9 -5
- data/platform/android/build/librhodes_build.files +1 -0
- data/platform/android/build/libruby_build.files +1 -0
- data/platform/bb/Hsqldb/Hsqldb.jdp +0 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +10 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +37 -5
- data/platform/bb/Hsqldb/src/org/hsqldb/Column.java +5 -5
- data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/Function.java +73 -78
- data/platform/bb/Hsqldb/src/org/hsqldb/Library.java +288 -8
- data/platform/bb/RubyVM/RubyVM.jdp +3 -0
- data/platform/bb/RubyVM/src/com/rho/FilePath.java +13 -1
- data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +2 -2
- data/platform/bb/RubyVM/src/com/rho/RhoAppAdapter.java +12 -0
- data/platform/bb/RubyVM/src/com/rho/RhoClassFactory.java +18 -1
- data/platform/bb/RubyVM/src/com/rho/RhoConf.java +128 -108
- data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java +9 -10
- data/platform/bb/RubyVM/src/com/rho/RhoLogger.java +16 -1
- data/platform/bb/RubyVM/src/com/rho/RhoProfiler.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +20 -0
- data/platform/bb/RubyVM/src/com/rho/RhodesApp.java +5 -2
- data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +65 -46
- data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +192 -50
- data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java +8 -114
- data/platform/bb/RubyVM/src/com/rho/db/DBException.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBCallback.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBResult.java +5 -3
- data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java +5 -1
- data/platform/bb/RubyVM/src/com/rho/file/FileAccessBB.java +109 -0
- data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java +85 -0
- data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +12 -4
- data/platform/bb/RubyVM/src/com/rho/net/NetResponse.java +5 -0
- data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +37 -23
- data/platform/bb/RubyVM/src/com/rho/net/URI.java +84 -0
- data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +119 -61
- data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +61 -24
- data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +108 -54
- data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +121 -163
- data/platform/bb/RubyVM/src/com/xruby/GeneratedMethods/RubyString_Methods.java +23 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyMutex.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRange.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRegexp.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyString.java +208 -25
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RhoSupport.java +5 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyAPI.java +12 -5
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyID.java +1 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule.java +16 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule_Methods.java +5 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyValue.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/stdlib/RubyStringIO.java +4 -1
- data/platform/bb/{Hsqldb → RubyVM}/src/j2me/math/Number.java +33 -0
- data/platform/bb/build/RubyVM_build.files +3 -0
- data/platform/bb/build/bb.rake +140 -62
- data/platform/bb/build/hsqldb_build.files +0 -2
- data/platform/bb/build/rhodes_build.files +5 -0
- data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +43 -7
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +23 -2
- data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +5 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteCopyResult.java +143 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteResult.java +269 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java +446 -0
- data/platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java +3 -0
- data/platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java +12 -2
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteCopyResult.java +2 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteResult.java +2 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteStorage.java +2 -0
- data/platform/bb/rhodes/resources/mappin.png +0 -0
- data/platform/bb/rhodes/rhodes.jdp +3 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +21 -18
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +150 -0
- data/platform/bb/rhodes/src/com/rho/IBrowserAdapter.java +1 -0
- data/platform/bb/rhodes/src/com/rho/RhoMainScreen.java +63 -4
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +6 -5
- data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +242 -2
- data/platform/bb/rhodes/src/com/rho/db/SqliteCopyResult.java +143 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteResult.java +269 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteStorage.java +446 -0
- data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java +1 -1
- data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +71 -14
- data/platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java +4 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java +28 -12
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +100 -4
- data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +3 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java +1 -1
- data/platform/bb/rhodes/src/rhomobile/NativeBar.java +32 -0
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +9 -2
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +174 -41
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimePicker.java +52 -3
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java +33 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/Annotation.java +2 -14
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java +686 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java +14 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java +13 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java +174 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java +104 -330
- data/platform/bb/rhodes/src/rhomobile/mapview/MapTools.java +79 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java +35 -12
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewParent.java +2 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java +336 -44
- data/platform/bb/rhodes/src/rhomobile/mapview/RhoMapField.java +3 -6
- data/platform/iphone/Classes/AppManager/AppManager.m +19 -4
- data/platform/iphone/Classes/DateTime.h +4 -0
- data/platform/iphone/Classes/DateTime.m +1 -1
- data/platform/iphone/Classes/DateTimePicker.m +8 -1
- data/platform/iphone/Classes/DateTimePickerDelegate.m +7 -1
- data/platform/iphone/Classes/Event/Event.m +2 -2
- data/platform/iphone/Classes/MapView/MapViewController.h +4 -1
- data/platform/iphone/Classes/MapView/MapViewController.m +6 -46
- data/platform/iphone/Classes/MapView/MapViewManager.h +26 -0
- data/platform/iphone/Classes/MapView/MapViewManager.m +172 -0
- data/platform/iphone/Classes/NativeBar.h +34 -0
- data/platform/iphone/Classes/NativeBar.m +131 -26
- data/platform/iphone/Classes/NativeView/NVDelegate.h +26 -0
- data/platform/iphone/Classes/NativeView/NVDelegate.m +40 -0
- data/platform/iphone/Classes/NativeView/NVViewController.h +24 -0
- data/platform/iphone/Classes/NativeView/NVViewController.m +90 -0
- data/platform/iphone/Classes/NativeView/RhoNativeViewManager.mm +449 -0
- data/platform/iphone/Classes/{RhoNativeViewManagerOC.h → NativeView/RhoNativeViewManagerOC.h} +15 -0
- data/platform/iphone/Classes/RhoAlert.m +3 -3
- data/platform/iphone/Classes/RhoMainView.h +3 -0
- data/platform/iphone/Classes/Rhodes.h +6 -2
- data/platform/iphone/Classes/Rhodes.m +47 -79
- data/platform/iphone/Classes/Signature/SignatureViewController.m +1 -0
- data/platform/iphone/Classes/SimpleMainView.h +18 -1
- data/platform/iphone/Classes/SimpleMainView.m +180 -35
- data/platform/iphone/Classes/SplitView/LeftViewController.h +1 -1
- data/platform/iphone/Classes/SplitView/LeftViewController.m +13 -7
- data/platform/iphone/Classes/SplitView/RightViewController.h +1 -1
- data/platform/iphone/Classes/SplitView/RightViewController.m +26 -11
- data/platform/iphone/Classes/SplitView/SplittedMainView.h +1 -6
- data/platform/iphone/Classes/SplitView/SplittedMainView.m +14 -52
- data/platform/iphone/Classes/TabbedMainView.h +25 -3
- data/platform/iphone/Classes/TabbedMainView.m +340 -14
- data/platform/iphone/ESRI/BluePushpin.png +0 -0
- data/platform/iphone/ESRI/BluePushpin@2x.png +0 -0
- data/platform/iphone/ESRI/esri.png +0 -0
- data/platform/iphone/ESRI/esri@2x.png +0 -0
- data/platform/iphone/Info.plist +1 -1
- data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +26 -3
- data/platform/iphone/rbuild/iphone.rake +100 -4
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +12 -0
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +116 -12
- data/platform/shared/SyncClient/SyncClient.cpp +29 -3
- data/platform/shared/SyncClient/SyncClient.h +2 -1
- data/platform/shared/common/IRhoClassFactory.h +3 -0
- data/platform/shared/common/IRhoCrypt.h +16 -0
- data/platform/shared/common/IRhoThreadImpl.h +1 -0
- data/platform/shared/common/RhoAppAdapter.h +2 -0
- data/platform/shared/common/RhoConf.cpp +97 -46
- data/platform/shared/common/RhoConf.h +14 -13
- data/platform/shared/common/RhoFile.cpp +10 -0
- data/platform/shared/common/RhoFile.h +1 -0
- data/platform/shared/common/RhoMath.cpp +43 -0
- data/platform/shared/common/RhoMath.h +27 -0
- data/platform/shared/common/RhoNativeViewManager.h +27 -1
- data/platform/shared/common/RhoPort.h +11 -0
- data/platform/shared/common/RhoStd.h +5 -0
- data/platform/shared/common/RhoThread.cpp +1 -1
- data/platform/shared/common/RhoThread.h +1 -1
- data/platform/shared/common/RhodesApp.cpp +381 -139
- data/platform/shared/common/RhodesApp.h +24 -10
- data/platform/shared/common/RhodesAppBase.cpp +72 -1
- data/platform/shared/common/RhodesAppBase.h +5 -1
- data/platform/shared/common/SplashScreen.h +4 -4
- data/platform/shared/common/ThreadQueue.cpp +44 -17
- data/platform/shared/common/ThreadQueue.h +4 -0
- data/platform/shared/common/app_build_configs.c +0 -1
- data/platform/shared/common/iphone/RhoClassfactory.h +6 -0
- data/platform/shared/common/iphone/RhoCryptImpl.h +47 -0
- data/platform/shared/common/iphone/RhoCryptImpl.mm +286 -0
- data/platform/shared/common/map/ESRIMapEngine.cpp +921 -0
- data/platform/shared/common/map/ESRIMapEngine.h +255 -0
- data/platform/shared/common/map/GoogleMapEngine.cpp +160 -0
- data/platform/shared/common/map/GoogleMapEngine.h +52 -0
- data/platform/shared/common/map/MapEngine.cpp +304 -0
- data/platform/shared/common/map/MapEngine.h +214 -0
- data/platform/shared/db/DBAdapter.cpp +147 -18
- data/platform/shared/db/DBAdapter.h +38 -12
- data/platform/shared/db/DBAttrManager.cpp +4 -3
- data/platform/shared/db/DBAttrManager.h +7 -7
- data/platform/shared/db/res/db/syncdb.triggers +0 -5
- data/platform/shared/db/res/db/syncdb_java.triggers +21 -0
- data/platform/shared/json/JSONIterator.cpp +11 -1
- data/platform/shared/json/JSONIterator.h +1 -0
- data/platform/shared/logging/RhoLogConf.cpp +29 -12
- data/platform/shared/net/CURLNetRequest.cpp +80 -25
- data/platform/shared/net/CURLNetRequest.h +6 -2
- data/platform/shared/net/HttpServer.cpp +12 -6
- data/platform/shared/net/HttpServer.h +2 -1
- data/platform/shared/net/INetRequest.h +1 -0
- data/platform/shared/ruby/ext/alert/alert.i +5 -0
- data/platform/shared/ruby/ext/alert/alert_wrap.c +439 -108
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker.i +42 -0
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +521 -120
- data/platform/shared/ruby/ext/nativebar/nativebar.i +16 -0
- data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +623 -128
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager.i +18 -0
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c +2321 -0
- data/platform/shared/ruby/ext/rho/extensions.c +0 -1
- data/platform/shared/ruby/ext/rho/rhoruby.c +53 -0
- data/platform/shared/ruby/ext/rho/rhoruby.h +6 -0
- data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +6 -3
- data/platform/shared/ruby/ext/syncengine/syncengine.i +9 -1
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +61 -0
- data/platform/shared/ruby/ext/system/system.i +4 -0
- data/platform/shared/ruby/ext/system/system_wrap.c +33 -5
- data/platform/shared/rubyext/RhoAppAdapter.cpp +11 -1
- data/platform/shared/rubyext/System.cpp +9 -0
- data/platform/shared/rubyext/WebView.h +1 -0
- data/platform/shared/sqlite/crypto.c +907 -0
- data/platform/shared/sqlite/sqlite3.c +6 -0
- data/platform/shared/sync/SyncEngine.cpp +49 -19
- data/platform/shared/sync/SyncEngine.h +0 -1
- data/platform/shared/sync/SyncNotify.cpp +14 -5
- data/platform/shared/sync/SyncNotify.h +2 -2
- data/platform/shared/sync/SyncSource.cpp +79 -33
- data/platform/shared/sync/SyncSource.h +1 -0
- data/platform/shared/sync/SyncThread.cpp +26 -11
- data/platform/shared/xruby/src/com/xruby/compiler/codedom/StringExpression.java +4 -2
- data/platform/wm/RhoLib/RhoLib.vcproj +108 -72
- data/platform/wm/build/wm.rake +6 -0
- data/platform/wm/rhodes/Alert.cpp +4 -3
- data/platform/wm/rhodes/Alert.h +1 -1
- data/platform/wm/rhodes/DateTimePicker.cpp +30 -3
- data/platform/wm/rhodes/DateTimePicker.h +9 -1
- data/platform/wm/rhodes/MainWindow.cpp +121 -61
- data/platform/wm/rhodes/MainWindow.h +29 -4
- data/platform/wm/rhodes/MapView/Graphics.cpp +547 -0
- data/platform/wm/rhodes/MapView/Graphics.h +136 -0
- data/platform/wm/rhodes/MapView/MapViewManager.cpp +391 -0
- data/platform/wm/rhodes/MapView/MapViewManager.h +158 -0
- data/platform/wm/rhodes/RhoCryptImpl.cpp +248 -0
- data/platform/wm/rhodes/RhoCryptImpl.h +51 -0
- data/platform/wm/rhodes/RhoNativeViewManager.cpp +208 -0
- data/platform/wm/rhodes/Rhodes.cpp +94 -102
- data/platform/wm/rhodes/Rhodes.rc +27 -0
- data/platform/wm/rhodes/SyncStatusDlg.cpp +1 -0
- data/platform/wm/rhodes/SyncStatusDlg.h +2 -1
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +7 -4
- data/platform/wm/rhodes/camera/Camera.cpp +36 -15
- data/platform/wm/rhodes/camera/Camera.h +0 -4
- data/platform/wm/rhodes/resource.h +10 -2
- data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +7 -0
- data/platform/wm/rhodes/rho/common/RhoClassFactory.h +1 -0
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +10 -2
- data/platform/wm/rhodes/rho/net/NetRequestImpl.h +10 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +513 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.h +74 -0
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +22 -10
- data/platform/wm/rhodes/rho/rubyext/WebView.cpp +5 -0
- data/platform/wm/rhodes/rhodes.vcproj +38 -2
- data/platform/wm/rhodes/stdafx.h +2 -1
- data/platform/wm/rubylib/rubylib.vcproj +12 -0
- data/rakefile.rb +85 -80
- data/res/build-tools/iphonesim/Source/iPhoneSimulator.m +14 -3
- data/res/build-tools/iphonesim/build/Release/iphonesim +0 -0
- data/res/build-tools/iphonesim/iphonesim.xcodeproj/project.pbxproj +2 -0
- data/res/build-tools/xruby-0.3.3.jar +0 -0
- data/res/generators/templates/application/app/application.rb +2 -2
- data/res/generators/templates/application/app/helpers/application_helper.rb +1 -1
- data/res/generators/templates/application/public/css/android.css +1 -0
- data/res/generators/templates/application/public/jqtouch/jquery.1.3.2.min.js +1 -1
- data/res/generators/templates/application/rhoconfig.txt +66 -14
- data/rhodes.gemspec +3 -3
- data/spec/framework_spec/app/spec/core/file/expand_path_spec.rb +7 -3
- data/spec/framework_spec/build.yml +1 -1
- data/spec/phone_spec/Rakefile +1 -0
- data/spec/phone_spec/app/Account/account.rb +2 -0
- data/spec/phone_spec/app/Account_s/account_s.rb +7 -0
- data/spec/phone_spec/app/spec/{fixtures → array/fixtures}/classes.rb +0 -0
- data/spec/phone_spec/app/spec/{array_pack_spec.rb → array/pack_spec.rb} +2 -1
- data/spec/phone_spec/app/spec/bulksync_spec.rb +1 -0
- data/spec/phone_spec/app/spec/contacts_spec.rb +2 -0
- data/spec/phone_spec/app/spec/rho_spec.rb +34 -233
- data/spec/phone_spec/app/spec/rhom_object_spec.rb +396 -87
- data/spec/phone_spec/app/spec/string/element_set_spec.rb +251 -0
- data/spec/phone_spec/app/spec/string/end_with_spec.rb +49 -0
- data/spec/phone_spec/app/spec/string/fixtures/classes.rb +27 -0
- data/spec/phone_spec/app/spec/{lstrip_spec.rb → string/lstrip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/string/replace_spec.rb +52 -0
- data/spec/phone_spec/app/spec/{rstrip_spec.rb → string/rstrip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/string/slice_spec.rb +473 -0
- data/spec/phone_spec/app/spec/string/split_spec.rb +302 -0
- data/spec/phone_spec/app/spec/string/start_with_spec.rb +48 -0
- data/spec/phone_spec/app/spec/{strip_spec.rb → string/strip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/syncengine_spec.rb +30 -1
- data/spec/phone_spec/app/spec_runner.rb +15 -7
- data/spec/phone_spec/build.yml +2 -2
- metadata +154 -25
- data/README.textile +0 -45
- data/platform/android/Rhodes/AndroidManifest.full.xml +0 -62
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/Manifest.java +0 -14
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoActivity.java +0 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +0 -193
- data/platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java +0 -25
- data/platform/bb/RubyVM/src/com/rho/AppBuildConfig.java +0 -22
- data/platform/bb/RubyVM/src/com/rho/Capabilities.java +0 -6
- data/platform/bb/RubyVM/src/com/rho/Extensions.java +0 -11
- data/platform/iphone/Classes/RhoNativeViewManager.mm +0 -226
@@ -0,0 +1,434 @@
|
|
1
|
+
package com.rhomobile.rhodes.mapview;
|
2
|
+
|
3
|
+
import java.io.IOException;
|
4
|
+
import java.util.List;
|
5
|
+
import java.util.Map;
|
6
|
+
import java.util.Vector;
|
7
|
+
|
8
|
+
import android.content.ComponentName;
|
9
|
+
import android.content.Context;
|
10
|
+
import android.content.Intent;
|
11
|
+
import android.content.ServiceConnection;
|
12
|
+
import android.graphics.drawable.Drawable;
|
13
|
+
import android.location.Address;
|
14
|
+
import android.location.Geocoder;
|
15
|
+
import android.os.Bundle;
|
16
|
+
import android.os.IBinder;
|
17
|
+
import android.view.ViewGroup.LayoutParams;
|
18
|
+
import android.widget.RelativeLayout;
|
19
|
+
|
20
|
+
import com.google.android.maps.GeoPoint;
|
21
|
+
import com.google.android.maps.MapActivity;
|
22
|
+
import com.google.android.maps.MapController;
|
23
|
+
import com.rhomobile.rhodes.AndroidR;
|
24
|
+
import com.rhomobile.rhodes.Logger;
|
25
|
+
import com.rhomobile.rhodes.RhodesActivity;
|
26
|
+
import com.rhomobile.rhodes.RhodesService;
|
27
|
+
import com.rhomobile.rhodes.util.PerformOnUiThread;
|
28
|
+
|
29
|
+
public class GoogleMapView extends MapActivity {
|
30
|
+
|
31
|
+
private static final String TAG = "GoogleMapView";
|
32
|
+
|
33
|
+
private static final String SETTINGS_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "settings.";
|
34
|
+
private static final String ANNOTATIONS_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "annotations.";
|
35
|
+
|
36
|
+
private static GoogleMapView mc = null;
|
37
|
+
|
38
|
+
private ServiceConnection mServiceConnection = null;
|
39
|
+
|
40
|
+
private com.google.android.maps.MapView view;
|
41
|
+
private AnnotationsOverlay annOverlay;
|
42
|
+
|
43
|
+
private double spanLat = 0;
|
44
|
+
private double spanLon = 0;
|
45
|
+
|
46
|
+
private String apiKey;
|
47
|
+
|
48
|
+
private Vector<Annotation> annotations;
|
49
|
+
|
50
|
+
private static class Coordinates {
|
51
|
+
public double latitude;
|
52
|
+
public double longitude;
|
53
|
+
|
54
|
+
public Coordinates() {
|
55
|
+
latitude = 0;
|
56
|
+
longitude = 0;
|
57
|
+
}
|
58
|
+
};
|
59
|
+
|
60
|
+
private Coordinates center = new Coordinates();
|
61
|
+
|
62
|
+
private static void reportFail(String name, Exception e) {
|
63
|
+
Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
|
64
|
+
}
|
65
|
+
|
66
|
+
@Override
|
67
|
+
public void onDestroy() {
|
68
|
+
if (mServiceConnection != null) {
|
69
|
+
unbindService(mServiceConnection);
|
70
|
+
mServiceConnection = null;
|
71
|
+
}
|
72
|
+
super.onDestroy();
|
73
|
+
}
|
74
|
+
|
75
|
+
@Override
|
76
|
+
public void onCreate(Bundle icicle) {
|
77
|
+
super.onCreate(icicle);
|
78
|
+
|
79
|
+
Intent intent = new Intent(this, RhodesService.class);
|
80
|
+
mServiceConnection = new ServiceConnection() {
|
81
|
+
@Override
|
82
|
+
public void onServiceDisconnected(ComponentName name) {}
|
83
|
+
@Override
|
84
|
+
public void onServiceConnected(ComponentName name, IBinder service) {}
|
85
|
+
};
|
86
|
+
bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);
|
87
|
+
|
88
|
+
mc = this;
|
89
|
+
|
90
|
+
getWindow().setFlags(RhodesService.WINDOW_FLAGS, RhodesService.WINDOW_MASK);
|
91
|
+
|
92
|
+
RelativeLayout layout = new RelativeLayout(this);
|
93
|
+
setContentView(layout, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
|
94
|
+
|
95
|
+
// Extrace parameters
|
96
|
+
Bundle extras = getIntent().getExtras();
|
97
|
+
apiKey = extras.getString(SETTINGS_PREFIX + "api_key");
|
98
|
+
|
99
|
+
// Extract settings
|
100
|
+
String map_type = extras.getString(SETTINGS_PREFIX + "map_type");
|
101
|
+
if (map_type == null)
|
102
|
+
map_type = "roadmap";
|
103
|
+
|
104
|
+
boolean zoom_enabled = extras.getBoolean(SETTINGS_PREFIX + "zoom_enabled");
|
105
|
+
//boolean scroll_enabled = extras.getBoolean(SETTINGS_PREFIX + "scroll_enabled");
|
106
|
+
//boolean shows_user_location = extras.getBoolean(SETTINGS_PREFIX + "shows_user_location");
|
107
|
+
|
108
|
+
// Extract annotations
|
109
|
+
int size = extras.getInt(ANNOTATIONS_PREFIX + "size") + 1;
|
110
|
+
annotations = new Vector<Annotation>(size);
|
111
|
+
for (int i = 0; i < size; ++i) {
|
112
|
+
Annotation ann = new Annotation();
|
113
|
+
String prefix = ANNOTATIONS_PREFIX + Integer.toString(i) + ".";
|
114
|
+
|
115
|
+
ann.latitude = 10000;
|
116
|
+
ann.longitude = 10000;
|
117
|
+
|
118
|
+
String lat = extras.getString(prefix + "latitude");
|
119
|
+
if (lat != null) {
|
120
|
+
try {
|
121
|
+
ann.latitude = Double.parseDouble(lat);
|
122
|
+
}
|
123
|
+
catch (NumberFormatException e) {}
|
124
|
+
}
|
125
|
+
|
126
|
+
String lon = extras.getString(prefix + "longitude");
|
127
|
+
if (lon != null) {
|
128
|
+
try {
|
129
|
+
ann.longitude = Double.parseDouble(lon);
|
130
|
+
}
|
131
|
+
catch (NumberFormatException e) {}
|
132
|
+
}
|
133
|
+
|
134
|
+
ann.type = "ann";
|
135
|
+
ann.address = extras.getString(prefix + "address");
|
136
|
+
ann.title = extras.getString(prefix + "title");
|
137
|
+
ann.subtitle = extras.getString(prefix + "subtitle");
|
138
|
+
ann.url = extras.getString(prefix + "url");
|
139
|
+
if (ann.url != null)
|
140
|
+
ann.url = RhodesService.getInstance().normalizeUrl(ann.url);
|
141
|
+
annotations.addElement(ann);
|
142
|
+
}
|
143
|
+
|
144
|
+
// Create view
|
145
|
+
view = new com.google.android.maps.MapView(this, apiKey);
|
146
|
+
view.setClickable(true);
|
147
|
+
layout.addView(view);
|
148
|
+
|
149
|
+
Drawable marker = getResources().getDrawable(AndroidR.drawable.marker);
|
150
|
+
marker.setBounds(0, 0, marker.getIntrinsicWidth(), marker.getIntrinsicHeight());
|
151
|
+
annOverlay = new AnnotationsOverlay(this, marker);
|
152
|
+
view.getOverlays().add(annOverlay);
|
153
|
+
|
154
|
+
// Apply extracted parameters
|
155
|
+
view.setBuiltInZoomControls(zoom_enabled);
|
156
|
+
view.setSatellite(map_type.equals("hybrid") || map_type.equals("satellite"));
|
157
|
+
view.setTraffic(false);
|
158
|
+
|
159
|
+
MapController controller = view.getController();
|
160
|
+
String type = extras.getString(SETTINGS_PREFIX + "region");
|
161
|
+
if (type.equals("square")) {
|
162
|
+
String latitude = extras.getString(SETTINGS_PREFIX + "region.latitude");
|
163
|
+
String longitude = extras.getString(SETTINGS_PREFIX + "region.longitude");
|
164
|
+
if (latitude != null && longitude != null) {
|
165
|
+
try {
|
166
|
+
double lat = Double.parseDouble(latitude);
|
167
|
+
double lon = Double.parseDouble(longitude);
|
168
|
+
center.latitude = lat;
|
169
|
+
center.longitude = lon;
|
170
|
+
controller.setCenter(new GeoPoint((int)(lat*1000000), (int)(lon*1000000)));
|
171
|
+
}
|
172
|
+
catch (NumberFormatException e) {
|
173
|
+
Logger.E(TAG, "Wrong region center: " + e.getMessage());
|
174
|
+
}
|
175
|
+
}
|
176
|
+
|
177
|
+
String latSpan = extras.getString(SETTINGS_PREFIX + "region.latSpan");
|
178
|
+
String lonSpan = extras.getString(SETTINGS_PREFIX + "region.lonSpan");
|
179
|
+
if (latSpan != null && lonSpan != null) {
|
180
|
+
try {
|
181
|
+
double lat = Double.parseDouble(latSpan);
|
182
|
+
double lon = Double.parseDouble(lonSpan);
|
183
|
+
controller.zoomToSpan((int)(lat*1000000), (int)(lon*1000000));
|
184
|
+
}
|
185
|
+
catch (NumberFormatException e) {
|
186
|
+
Logger.E(TAG, "Wrong region span: " + e.getMessage());
|
187
|
+
}
|
188
|
+
}
|
189
|
+
}
|
190
|
+
else if (type.equals("circle")) {
|
191
|
+
String center = extras.getString(SETTINGS_PREFIX + "region.center");
|
192
|
+
String radius = extras.getString(SETTINGS_PREFIX + "region.radius");
|
193
|
+
if (center != null && radius != null) {
|
194
|
+
try {
|
195
|
+
double span = Double.parseDouble(radius);
|
196
|
+
spanLat = spanLon = span;
|
197
|
+
Annotation ann = new Annotation();
|
198
|
+
ann.type = "center";
|
199
|
+
ann.latitude = ann.longitude = 10000;
|
200
|
+
ann.address = center;
|
201
|
+
annotations.insertElementAt(ann, 0);
|
202
|
+
}
|
203
|
+
catch (NumberFormatException e) {
|
204
|
+
Logger.E(TAG, "Wrong region radius: " + e.getMessage());
|
205
|
+
}
|
206
|
+
}
|
207
|
+
}
|
208
|
+
|
209
|
+
view.preLoad();
|
210
|
+
|
211
|
+
Thread geocoding = new Thread(new Runnable() {
|
212
|
+
public void run() {
|
213
|
+
doGeocoding();
|
214
|
+
}
|
215
|
+
});
|
216
|
+
geocoding.start();
|
217
|
+
}
|
218
|
+
|
219
|
+
@Override
|
220
|
+
protected void onStart() {
|
221
|
+
super.onStart();
|
222
|
+
RhodesService.activityStarted();
|
223
|
+
}
|
224
|
+
|
225
|
+
@Override
|
226
|
+
protected void onStop() {
|
227
|
+
RhodesService.activityStopped();
|
228
|
+
super.onStop();
|
229
|
+
}
|
230
|
+
|
231
|
+
private void doGeocoding() {
|
232
|
+
Context context = RhodesActivity.getContext();
|
233
|
+
|
234
|
+
for (int i = 0, lim = annotations.size(); i < lim; ++i) {
|
235
|
+
Annotation ann = annotations.elementAt(i);
|
236
|
+
if (ann.latitude == 10000 || ann.longitude == 10000)
|
237
|
+
continue;
|
238
|
+
annOverlay.addAnnotation(ann);
|
239
|
+
}
|
240
|
+
|
241
|
+
for (int i = 0, lim = annotations.size(); i < lim; ++i) {
|
242
|
+
Annotation ann = annotations.elementAt(i);
|
243
|
+
if (ann.latitude != 10000 && ann.longitude != 10000)
|
244
|
+
continue;
|
245
|
+
if (ann.address == null)
|
246
|
+
continue;
|
247
|
+
|
248
|
+
Geocoder gc = new Geocoder(context);
|
249
|
+
try {
|
250
|
+
List<Address> addrs = gc.getFromLocationName(ann.address, 1);
|
251
|
+
if (addrs.size() == 0)
|
252
|
+
continue;
|
253
|
+
|
254
|
+
Address addr = addrs.get(0);
|
255
|
+
|
256
|
+
ann.latitude = addr.getLatitude();
|
257
|
+
ann.longitude = addr.getLongitude();
|
258
|
+
if (ann.type.equals("center")) {
|
259
|
+
MapController controller = view.getController();
|
260
|
+
center.latitude = ann.latitude;
|
261
|
+
center.longitude = ann.longitude;
|
262
|
+
controller.setCenter(new GeoPoint((int)(ann.latitude*1000000), (int)(ann.longitude*1000000)));
|
263
|
+
controller.zoomToSpan((int)(spanLat*1000000), (int)(spanLon*1000000));
|
264
|
+
}
|
265
|
+
else
|
266
|
+
annOverlay.addAnnotation(ann);
|
267
|
+
} catch (IOException e) {
|
268
|
+
Logger.E(TAG, "GeoCoding request failed: " + e.getMessage());
|
269
|
+
}
|
270
|
+
|
271
|
+
PerformOnUiThread.exec(new Runnable() {
|
272
|
+
public void run() {
|
273
|
+
view.invalidate();
|
274
|
+
}
|
275
|
+
}, false);
|
276
|
+
}
|
277
|
+
}
|
278
|
+
|
279
|
+
@Override
|
280
|
+
protected boolean isRouteDisplayed() {
|
281
|
+
return false;
|
282
|
+
}
|
283
|
+
|
284
|
+
@SuppressWarnings("unchecked")
|
285
|
+
public static void create(String gapiKey, Map<String, Object> params) {
|
286
|
+
try {
|
287
|
+
Intent intent = new Intent(RhodesActivity.getContext(), GoogleMapView.class);
|
288
|
+
intent.putExtra(SETTINGS_PREFIX + "api_key", gapiKey);
|
289
|
+
|
290
|
+
Object settings = params.get("settings");
|
291
|
+
if (settings != null && (settings instanceof Map<?,?>)) {
|
292
|
+
Map<Object, Object> hash = (Map<Object, Object>)settings;
|
293
|
+
Object map_type = hash.get("map_type");
|
294
|
+
if (map_type != null && (map_type instanceof String))
|
295
|
+
intent.putExtra(SETTINGS_PREFIX + "map_type", (String)map_type);
|
296
|
+
|
297
|
+
Object zoom_enabled = hash.get("zoom_enabled");
|
298
|
+
if (zoom_enabled != null && (zoom_enabled instanceof String))
|
299
|
+
intent.putExtra(SETTINGS_PREFIX + "zoom_enabled", ((String)zoom_enabled).equalsIgnoreCase("true"));
|
300
|
+
|
301
|
+
Object scroll_enabled = hash.get("scroll_enabled");
|
302
|
+
if (scroll_enabled != null && (scroll_enabled instanceof String))
|
303
|
+
intent.putExtra(SETTINGS_PREFIX + "scroll_enabled", ((String)scroll_enabled).equalsIgnoreCase("true"));
|
304
|
+
|
305
|
+
Object shows_user_location = hash.get("shows_user_location");
|
306
|
+
if (shows_user_location != null && (shows_user_location instanceof String))
|
307
|
+
intent.putExtra(SETTINGS_PREFIX + "shows_user_location", ((String)shows_user_location).equalsIgnoreCase("true"));
|
308
|
+
|
309
|
+
Object region = hash.get("region");
|
310
|
+
if (region != null) {
|
311
|
+
if (region instanceof Vector<?>) {
|
312
|
+
Vector<String> reg = (Vector<String>)region;
|
313
|
+
if (reg.size() == 4) {
|
314
|
+
intent.putExtra(SETTINGS_PREFIX + "region", "square");
|
315
|
+
intent.putExtra(SETTINGS_PREFIX + "region.latitude", reg.elementAt(0));
|
316
|
+
intent.putExtra(SETTINGS_PREFIX + "region.longitude", reg.elementAt(1));
|
317
|
+
intent.putExtra(SETTINGS_PREFIX + "region.latSpan", reg.elementAt(2));
|
318
|
+
intent.putExtra(SETTINGS_PREFIX + "region.lonSpan", reg.elementAt(3));
|
319
|
+
}
|
320
|
+
}
|
321
|
+
else if (region instanceof Map<?,?>) {
|
322
|
+
Map<Object, Object> reg = (Map<Object,Object>)region;
|
323
|
+
String center = null;
|
324
|
+
String radius = null;
|
325
|
+
|
326
|
+
Object centerObj = reg.get("center");
|
327
|
+
if (centerObj != null && (centerObj instanceof String))
|
328
|
+
center = (String)centerObj;
|
329
|
+
|
330
|
+
Object radiusObj = reg.get("radius");
|
331
|
+
if (radiusObj != null && (radiusObj instanceof String))
|
332
|
+
radius = (String)radiusObj;
|
333
|
+
|
334
|
+
if (center != null && radius != null) {
|
335
|
+
intent.putExtra(SETTINGS_PREFIX + "region", "circle");
|
336
|
+
intent.putExtra(SETTINGS_PREFIX + "region.center", center);
|
337
|
+
intent.putExtra(SETTINGS_PREFIX + "region.radius", radius);
|
338
|
+
}
|
339
|
+
}
|
340
|
+
}
|
341
|
+
}
|
342
|
+
|
343
|
+
Object annotations = params.get("annotations");
|
344
|
+
if (annotations != null && (annotations instanceof Vector<?>)) {
|
345
|
+
Vector<Object> arr = (Vector<Object>)annotations;
|
346
|
+
|
347
|
+
intent.putExtra(ANNOTATIONS_PREFIX + "size", arr.size());
|
348
|
+
|
349
|
+
for (int i = 0, lim = arr.size(); i < lim; ++i) {
|
350
|
+
Object annObj = arr.elementAt(i);
|
351
|
+
if (annObj == null || !(annObj instanceof Map<?, ?>))
|
352
|
+
continue;
|
353
|
+
|
354
|
+
Map<Object, Object> ann = (Map<Object, Object>)annObj;
|
355
|
+
|
356
|
+
String prefix = ANNOTATIONS_PREFIX + Integer.toString(i) + ".";
|
357
|
+
|
358
|
+
Object latitude = ann.get("latitude");
|
359
|
+
if (latitude != null && (latitude instanceof String))
|
360
|
+
intent.putExtra(prefix + "latitude", (String)latitude);
|
361
|
+
|
362
|
+
Object longitude = ann.get("longitude");
|
363
|
+
if (longitude != null && (longitude instanceof String))
|
364
|
+
intent.putExtra(prefix + "longitude", (String)longitude);
|
365
|
+
|
366
|
+
Object address = ann.get("street_address");
|
367
|
+
if (address != null && (address instanceof String))
|
368
|
+
intent.putExtra(prefix + "address", (String)address);
|
369
|
+
|
370
|
+
Object title = ann.get("title");
|
371
|
+
if (title != null && (title instanceof String))
|
372
|
+
intent.putExtra(prefix + "title", (String)title);
|
373
|
+
|
374
|
+
Object subtitle = ann.get("subtitle");
|
375
|
+
if (subtitle != null && (subtitle instanceof String))
|
376
|
+
intent.putExtra(prefix + "subtitle", (String)subtitle);
|
377
|
+
|
378
|
+
Object url = ann.get("url");
|
379
|
+
if (url != null && (url instanceof String))
|
380
|
+
intent.putExtra(prefix + "url", (String)url);
|
381
|
+
}
|
382
|
+
}
|
383
|
+
|
384
|
+
RhodesService.getInstance().startActivity(intent);
|
385
|
+
}
|
386
|
+
catch (Exception e) {
|
387
|
+
reportFail("create", e);
|
388
|
+
}
|
389
|
+
}
|
390
|
+
|
391
|
+
public static void close() {
|
392
|
+
try {
|
393
|
+
PerformOnUiThread.exec(new Runnable() {
|
394
|
+
public void run() {
|
395
|
+
if (mc != null) {
|
396
|
+
mc.finish();
|
397
|
+
mc = null;
|
398
|
+
}
|
399
|
+
}
|
400
|
+
}, false);
|
401
|
+
}
|
402
|
+
catch (Exception e) {
|
403
|
+
reportFail("close", e);
|
404
|
+
}
|
405
|
+
}
|
406
|
+
|
407
|
+
public static boolean isStarted() {
|
408
|
+
return mc != null;
|
409
|
+
}
|
410
|
+
|
411
|
+
public static double getCenterLatitude() {
|
412
|
+
try {
|
413
|
+
if (mc == null)
|
414
|
+
return 0;
|
415
|
+
return mc.center.latitude;
|
416
|
+
}
|
417
|
+
catch (Exception e) {
|
418
|
+
reportFail("getCenterLatitude", e);
|
419
|
+
return 0;
|
420
|
+
}
|
421
|
+
}
|
422
|
+
|
423
|
+
public static double getCenterLongitude() {
|
424
|
+
try {
|
425
|
+
if (mc == null)
|
426
|
+
return 0;
|
427
|
+
return mc.center.longitude;
|
428
|
+
}
|
429
|
+
catch (Exception e) {
|
430
|
+
reportFail("getCenterLongitude", e);
|
431
|
+
return 0;
|
432
|
+
}
|
433
|
+
}
|
434
|
+
}
|
@@ -0,0 +1,20 @@
|
|
1
|
+
package com.rhomobile.rhodes.mapview;
|
2
|
+
|
3
|
+
public interface MapTouch {
|
4
|
+
|
5
|
+
public static class Touch {
|
6
|
+
public float x;
|
7
|
+
public float y;
|
8
|
+
|
9
|
+
public Touch(float x, float y) {
|
10
|
+
this.x = x;
|
11
|
+
this.y = y;
|
12
|
+
}
|
13
|
+
};
|
14
|
+
|
15
|
+
public void touchDown(Touch first, Touch second);
|
16
|
+
public void touchUp(Touch first, Touch second);
|
17
|
+
public void touchMove(Touch first, Touch second);
|
18
|
+
public void touchClick(Touch touch);
|
19
|
+
|
20
|
+
}
|