[TBT][Non-ACR][All][Changes done in script and code]

Change-Id: I07f47c0cf2f6d73c9ed9c2856bdfc2579eed96e0
Signed-off-by: nibha2 <nibha.sharma@samsung.com>

diff --git a/release/binary-armv7l/install.sh b/release/binary-armv7l/install.sh
index 3a6c164f7468fefca9d1b0645ecd4cbb883e7893..fdef26a949861eae9a8fd526fef0a4dc582978b2 100755 (executable)
--- a/release/binary-armv7l/install.sh
+++ b/release/binary-armv7l/install.sh
@@ -24,6 +24,7 @@
 # you can change user name to install specific path
 
 EXECUTION_USER=owner
+MOD_NAME=tbtcoreapp
 
 sdb root on
 
@@ -39,6 +40,8 @@ sdb push org.tizen.tbt_pushtestapp-1.0.0-arm.tpk /tmp
 sdb push org.tizen.tbt_ui_viewmgr-1.0.0-arm.tpk /tmp
 sdb push org.example.multiclass-1.0.0-arm.tpk /tmp
 sdb push org.example.widget-1.0.0-arm.tpk /tmp
+sdb push org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk /tmp
+sdb push org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk /tmp
 
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_dataprovider-1.0.0-arm.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_serviceapp-1.0.0-arm.tpk" $EXECUTION_USER
@@ -52,20 +55,20 @@ sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_pushtestapp-1.0.0-arm.tp
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_ui_viewmgr-1.0.0-arm.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.multiclass-1.0.0-arm.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-arm.tpk" $EXECUTION_USER
+sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk" $EXECUTION_USER
+sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk" $EXECUTION_USER
 
 sdb push dog_1024_960.gif /home/$EXECUTION_USER/media/Images
 sdb push SampleMP3.mp3 /home/$EXECUTION_USER/media/Sounds
 sdb push sampleH263.3gp /home/$EXECUTION_USER/media/Videos
 sdb push tbt_push_auth.xml /home/$EXECUTION_USER/media/Others
-sdb push iotcon-test-svr-db-client.dat /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/
-sdb push iotcon-test-svr-db-server.dat /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/
+sdb push iotcon-test-svr-db-client.dat /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data
+sdb push iotcon-test-svr-db-server.dat /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data
 
 sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Images/dog_1024_960.gif
 sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Sounds/SampleMP3.mp3
 sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Videos/sampleH263.3gp
 sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Others/tbt_push_auth.xml
-#sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Others/iotcon-test-svr-db-client.dat
-#sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Others/iotcon-test-svr-db-server.dat
 sdb shell chown $EXECUTION_USER:5000 /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-client.dat
 sdb shell chown $EXECUTION_USER:5000 /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-server.dat
 sdb shell chmod 777 /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-client.dat

diff --git a/release/binary-armv7l/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk
index 0b8fb3b703efffbed8aa8c71feae3809e4d858bc..9419c7dbefdb4ec508618e2466c7389cd21282a1 100755 (executable)
Binary files a/release/binary-armv7l/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk differ

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk
index d1fae714c32cea66884c8997800e6e765b644b3d..9fcee520105fd2965e0d9cdc2c82d988d57009d4 100755 (executable)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/install.sh b/release/binary-x86/install.sh
index b34042210872fa9d5be8fbddec680fb8b0865c34..14fec385ebe60c5cfed1246f519b91ed9371688d 100755 (executable)
--- a/release/binary-x86/install.sh
+++ b/release/binary-x86/install.sh
@@ -22,8 +22,11 @@
  # @author     nazib ullah(nazib.ullah@samsung.com), nazmus saqib(saqib.nzms@samsung.com)
  # @date       October, 2014
 
- #
+
 EXECUTION_USER=owner
+MOD_NAME=tbtcoreapp
+
+sdb root on
 
 sdb push org.tizen.coretbt_dataprovider-1.0.0-x86.tpk /tmp
 sdb push org.tizen.coretbt_serviceapp-1.0.0-x86.tpk /tmp
@@ -37,6 +40,8 @@ sdb push org.tizen.tbt_pushtestapp-1.0.0-x86.tpk /tmp
 sdb push org.tizen.tbt_ui_viewmgr-1.0.0-x86.tpk /tmp
 sdb push org.example.widget-1.0.0-x86.tpk /tmp
 sdb push org.example.multiclass-1.0.0-x86.tpk /tmp
+sdb push org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk /tmp
+sdb push org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk /tmp
 
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_dataprovider-1.0.0-x86.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_serviceapp-1.0.0-x86.tpk" $EXECUTION_USER
@@ -50,17 +55,29 @@ sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_pushtestapp-1.0.0-x86.tp
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_ui_viewmgr-1.0.0-x86.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-x86.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.multiclass-1.0.0-x86.tpk" $EXECUTION_USER
-
-sdb root on
+sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk" $EXECUTION_USER
+sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk" $EXECUTION_USER
 
 sdb push dog_1024_960.gif /home/$EXECUTION_USER/media/Images
 sdb push SampleMP3.mp3 /home/$EXECUTION_USER/media/Sounds
 sdb push sampleH263.3gp /home/$EXECUTION_USER/media/Videos
 sdb push tbt_push_auth.xml /home/$EXECUTION_USER/media/Others
+sdb push iotcon-test-svr-db-client.dat /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data
+sdb push iotcon-test-svr-db-server.dat /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data
 
 sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Images/dog_1024_960.gif
 sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Sounds/SampleMP3.mp3
 sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Videos/sampleH263.3gp
 sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Others/tbt_push_auth.xml
+sdb shell chown $EXECUTION_USER:5000 /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-client.dat
+sdb shell chown $EXECUTION_USER:5000 /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-server.dat
+sdb shell chmod 777 /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-client.dat
+sdb shell chmod 777 /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-server.dat
+sdb shell chsmack -a "User::App::Shared" /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data
+sdb shell chsmack -e "User::App::Shared" /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data
+sdb shell chsmack -a "User::App::Shared" /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-client.dat
+sdb shell chsmack -a "User::App::Shared" /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-server.dat
+sdb shell chsmack -e "User::App::Shared" /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-client.dat
+sdb shell chsmack -e "User::App::Shared" /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-server.dat
 
 sdb root off

diff --git a/release/binary-x86/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk b/release/binary-x86/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk
index 14d53df832af2744b52eb728e528a228753b8079..ab8012657e84fc31f080aa2c8c95920a5ff46624 100755 (executable)
Binary files a/release/binary-x86/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk
index 81c409ac3cf1bb203963ec68cec2d277ba3cdf75..1c3671c682987fde0acbaccebb6ce4bc6814d671 100755 (executable)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk differ

diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh
index 673c1eb6387f6283a9be77d45c47b0200107654e..93b464ef1ea1e2a544e5f992a0eaa9cb4c9252e0 100755 (executable)
--- a/scripts_tpk/tpkbuild.sh
+++ b/scripts_tpk/tpkbuild.sh
@@ -205,14 +205,15 @@ modulearray=(org.tizen.coretbt_dataprovider org.tizen.coretbt_serviceapp org.tiz
        sdb push $PWD/release/binary-$ARCH/SampleMP3.mp3 /home/$EXECUTION_USER/media/Sounds
        sdb push $PWD/release/binary-$ARCH/sampleH263.3gp /home/$EXECUTION_USER/media/Videos
        sdb push $PWD/release/binary-$ARCH/tbt_push_auth.xml /home/$EXECUTION_USER/media/Others
-       sdb push $PWD/release/binary-$ARCH/iotcon-test-svr-db-client.dat /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/
-       sdb push $PWD/release/binary-$ARCH/iotcon-test-svr-db-server.dat /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/
        sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Images/dog_1024_960.gif
        sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Sounds/SampleMP3.mp3
        sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Videos/sampleH263.3gp
        sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Others/tbt_push_auth.xml
-#      sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Others/iotcon-test-svr-db-client.dat
-#      sdb shell chown $EXECUTION_USER:priv_mediastorage /home/$EXECUTION_USER/media/Others/iotcon-test-svr-db-server.dat
+
+       echo $yellow"Pushing iotcon db files"
+       sdb push $PWD/release/binary-$ARCH/iotcon-test-svr-db-client.dat /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/
+       sdb push $PWD/release/binary-$ARCH/iotcon-test-svr-db-server.dat /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/
+
        sdb shell chown $EXECUTION_USER:5000 /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-client.dat
        sdb shell chown $EXECUTION_USER:5000 /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-server.dat
        sdb shell chmod 777 /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-client.dat
@@ -223,6 +224,7 @@ modulearray=(org.tizen.coretbt_dataprovider org.tizen.coretbt_serviceapp org.tiz
        sdb shell chsmack -a "User::App::Shared" /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-server.dat
        sdb shell chsmack -e "User::App::Shared" /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-client.dat
        sdb shell chsmack -e "User::App::Shared" /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-server.dat
+
        echo ""$reset
        sdb root off
 }

diff --git a/tbtcoreapp-widget-new-dali/src/view/tbt-dali-widget-custom-view.cpp b/tbtcoreapp-widget-new-dali/src/view/tbt-dali-widget-custom-view.cpp
index 1e4af2d4d6ee922b45799c5ec3ca79b7887bf99b..cc0f50fbbe723ae7e3c98292e2893a87d85ee4f5 100644 (file)
--- a/tbtcoreapp-widget-new-dali/src/view/tbt-dali-widget-custom-view.cpp
+++ b/tbtcoreapp-widget-new-dali/src/view/tbt-dali-widget-custom-view.cpp
@@ -75,6 +75,7 @@ bool WidgetViewApplicationController::OnWidgetAdded(Toolkit::Button button )
 
 bool WidgetViewApplicationController::OnWidgetDeleted(Toolkit::Button button )
 {
+  DBG("WidgetViewApplicationController::OnWidgetDeleted");
   if(mWidgetView)
   {
     mWidgetView.TerminateWidget();

diff --git a/tbtcoreapp/src/view/tbt-iotcon-view.c b/tbtcoreapp/src/view/tbt-iotcon-view.c
index 34a3c0d0c04763dc7c326a6e29b33a0d4ce81607..aea103e37ef41b7c56c54a131a815e870e40edec 100644 (file)
--- a/tbtcoreapp/src/view/tbt-iotcon-view.c
+++ b/tbtcoreapp/src/view/tbt-iotcon-view.c
@@ -30,7 +30,7 @@
 #include <Elementary.h>
 #include <iotcon.h>
 #include <glib.h>
-
+#include <app_control.h>
 #include "utils/logger.h"
 #include "utils/config.h"
 #include "utils/ui-utils.h"
@@ -228,7 +228,18 @@ iotcon_view *iotcon_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_I
 #endif
        evas_object_show(this->info_list);
 
-       char db_file_path[256]={'\0',};
+       char db_file_path_server[256]={'\0',};
+       char db_file_path_client[256]={'\0',};
+       char* pPath = NULL;
+       pPath = app_get_data_path();
+       DBG("pPath %s",pPath);
+       if(!pPath)
+               return NULL;
+       snprintf(db_file_path_server, sizeof(db_file_path_server), "%s%s",pPath,"iotcon-test-svr-db-server.dat");
+       DBG("db_file_path_server file set = %s", db_file_path_server);
+       snprintf(db_file_path_client, sizeof(db_file_path_client), "%s%s",pPath,"iotcon-test-svr-db-client.dat");
+       DBG("db_file_path_client file set = %s", db_file_path_client);
+       free(pPath);
 
        if(this->view->tbt_info->apptype == TBT_APP_IOTCON_BASIC_SERVER)
        {
@@ -239,10 +250,7 @@ iotcon_view *iotcon_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_I
 
                int ret;
 
-           snprintf(db_file_path, sizeof(db_file_path), "%s/%s","/opt/usr/home/owner/apps_rw/org.tizen.tbtcoreapp/data","iotcon-test-svr-db-server.dat");
-           DBG("db_file_path file set = %s", db_file_path);
-
-               ret = iotcon_initialize(db_file_path);
+               ret = iotcon_initialize(db_file_path_server);
                RETVM_IF(ret != IOTCON_ERROR_NONE, NULL, "iotcon_initialize error %s", get_iotcon_error(ret));
 
                ret = iotcon_set_device_name("iotcon-test-basic-server");
@@ -267,11 +275,8 @@ iotcon_view *iotcon_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_I
                Evas_Object *control = add_control_layout(this, this->view->layout);
                elm_object_part_content_set(this->view->layout, "iotcon_btn", control);
 
-           snprintf(db_file_path, sizeof(db_file_path), "%s/%s","/opt/usr/home/owner/apps_rw/org.tizen.tbtcoreapp/data","iotcon-test-svr-db-client.dat");
-           DBG("db_file_path file set = %s", db_file_path);
-
                int ret;
-               ret = iotcon_initialize(db_file_path);
+               ret = iotcon_initialize(db_file_path_client);
                RETVM_IF(ret != IOTCON_ERROR_NONE, NULL, "iotcon_initialize error %s", get_iotcon_error(ret));
 
                ret = iotcon_query_create(&this->query);