Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

# Conflicts:
#	app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/widget/LifeplusWidget.java

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/widget/LifeplusWidget.java

@@ -3,6 +3,7 @@ package kr.co.zumo.app.lifeplus.view.screen.widget;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
@@ -16,7 +17,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.activity.MainActivity;
+import kr.co.zumo.app.lifeplus.activity.SplashActivity;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
 import kr.co.zumo.app.lifeplus.config.INetworkConfig;
@@ -31,10 +32,13 @@ import kr.co.zumo.app.lifeplus.view.GlideApp;
  */
 public class LifeplusWidget extends AppWidgetProvider {
 
+  private static final String REFRESH_CLICK = "refresh_click";
 
   private static Disposable disposable;
 
+
   static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId) {
+    Log.e("APP#  LifeplusWidget | updateAppWidget", "|" + "updateAppwidget==>");
 
     if (null != disposable) {
       disposable.dispose();
@@ -64,10 +68,9 @@ public class LifeplusWidget extends AppWidgetProvider {
     // Construct the RemoteViews object
     RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.lifeplus_widget);
 
-    Intent mainIntent = new Intent(context, MainActivity.class);
+    Intent mainIntent = new Intent(context, SplashActivity.class);
     views.setOnClickPendingIntent(R.id.image_view_bi, PendingIntent.getActivity(context, 0, mainIntent, 0));
 
-    Log.i("APP# LifeplusWidget | render", "|" + "contentsBean.getTitleWithTrim(): " + contentsBean.getTitleWithTrim());
     views.setTextViewText(R.id.text_view_title, contentsBean.getTitleWithTrim());
     views.setTextViewText(R.id.text_view_sub_title, contentsBean.getSubTitleWithTrim());
 
@@ -85,18 +88,46 @@ public class LifeplusWidget extends AppWidgetProvider {
     } catch (Exception e) {
       e.printStackTrace();
     }
+
+    Intent refreshIntent = new Intent(context, LifeplusWidget.class);
+    refreshIntent.setAction(REFRESH_CLICK);
+    views.setOnClickPendingIntent(R.id.image_view_refresh, PendingIntent.getBroadcast(context, 0, refreshIntent, 0));
+
   }
 
   @Override
   public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
     // There may be multiple widgets active, so update all of them
-
+    Log.e("APP#  LifeplusWidget | onUpdate", "|" + "onUpdate ===>");
     for (int appWidgetId : appWidgetIds) {
       updateAppWidget(context, appWidgetManager, appWidgetId);
     }
 
   }
 
+  @Override
+  public void onReceive(Context context, Intent intent) {
+
+    AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+    ComponentName widget = new ComponentName(context, LifeplusWidget.class);
+    RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.lifeplus_widget);
+
+    super.onReceive(context, intent);
+
+    switch (intent.getAction()) {
+      case REFRESH_CLICK:
+        Log.e("APP#  LifeplusWidget | onReceive", "|" + "refresh click after ===>");
+        views.setTextViewText(R.id.text_view_title, "refresh 클릭함" + (int) (Math.random() * 10));
+        views.setImageViewResource(R.id.image_view_background, R.drawable.banner_bg_1);
+        appWidgetManager.updateAppWidget(widget, views);
+        break;
+      default:
+        break;
+
+    }
+  }
+
+
   @Override
   public void onEnabled(Context context) {
     // Enter relevant functionality for when the first widget is created

app/src/main/res/xml/lifeplus_widget_info.xml

@@ -5,6 +5,6 @@
                     android:minWidth="250dp"
                     android:minHeight="110dp"
                     android:resizeMode="none"
-                    android:updatePeriodMillis="86400000"
+                    android:updatePeriodMillis="1800000"
                     android:widgetCategory="home_screen">
 </appwidget-provider>