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

app/src/main/java/kr/co/zumo/app/lifeplus/activity/SplashActivity.java

@@ -38,9 +38,6 @@ public class SplashActivity extends ActivityBase {
 
     SuperModelInit.instant(App.getInstance().getContext());
 
-    //Buzz Ad: CPE
-    BATracker.actionCompleted(this);
-
     // screen changer
     ScreenChangerHelper helper = getHelper(ScreenChangerHelper.class);
     helper.setFragmentActivity(this);

app/src/main/java/kr/co/zumo/app/lifeplus/zumo/activity/SignInActivity.java

@@ -54,8 +54,6 @@ public class SignInActivity extends AppCompatActivity {
             signInFragment = SignInFragment.newInstance();
             getSupportFragmentManager().beginTransaction().replace(R.id.container, signInFragment).commitNow();
         }
-
-        test();
     }
 
     @Override
@@ -84,51 +82,4 @@ public class SignInActivity extends AppCompatActivity {
         super.finish();
         overridePendingTransition(R.anim.activity_slide_in_enter, R.anim.activity_slide_out_exit);
     }
-
-    private void test() {
-        // 레퍼러 클릭키 확인해서 서버에 요청
-        GetCookieOvenRequestBean cookieOvenRequestBean = new GetCookieOvenRequestBean();
-        cookieOvenRequestBean.setKey("test_click_key");
-        new APIGetCookieOvenModule().call(cookieOvenRequestBean, new APIModuleListener<GetCookieOvenResultBean>() {
-
-            @Override
-            public void onApiSuccess(GetCookieOvenResultBean resultBean) {
-                if(resultBean != null && StringUtil.isFull(resultBean.getClickKey())) {
-
-                    // 해당 클릭 키 쿠키오븐서버에 확인 콜백
-                    CookieOvenPostBackRequestBean cookieOvenPostBackRequestBean = new CookieOvenPostBackRequestBean();
-                    cookieOvenPostBackRequestBean.setClick_key(resultBean.getClickKey());
-                    new APICookieOvenPostBackModule().call(cookieOvenPostBackRequestBean, new APIModuleListener<LifeplusAPIBean>() {
-                        @Override
-                        public void onApiSuccess(LifeplusAPIBean resultBean) {
-
-                        }
-
-                        @Override
-                        public void onApiError(String errorMessage, APIError error) {
-
-                        }
-                    });
-                }
-            }
-
-            @Override
-            public void onApiError(String errorMessage, APIError error) {
-                // 해당 클릭 키 쿠키오븐서버에 확인 콜백
-                CookieOvenPostBackRequestBean cookieOvenPostBackRequestBean = new CookieOvenPostBackRequestBean();
-                cookieOvenPostBackRequestBean.setClick_key("test");
-                new APICookieOvenPostBackModule().call(cookieOvenPostBackRequestBean, new APIModuleListener<LifeplusAPIBean>() {
-                    @Override
-                    public void onApiSuccess(LifeplusAPIBean resultBean) {
-                        Log.i("TAG", "TAG");
-                    }
-
-                    @Override
-                    public void onApiError(String errorMessage, APIError error) {
-                        Log.i("TAG", "TAG");
-                    }
-                });
-            }
-        });
-    }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/zumo/screen/SignUpInfoPresenter.java

@@ -3,6 +3,7 @@ package kr.co.zumo.app.lifeplus.zumo.screen;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import com.buzzvil.buzzad.analytics.BATracker;
 import com.nasmob.nswitch.sdk.NSWTrackManager;
 import com.nasmob.nswitch.sdk.NSWTracker;
 import com.tnkfactory.ad.TnkSession;
@@ -165,6 +166,9 @@ public class SignUpInfoPresenter extends BasePresenter<SignUpModel, SignUpInfoVi
         nswTracker.setTestMode(false);
         nswTracker.trackConversion("NSW_CONVERSION");
 
+        //Buzz Ad: CPE
+        BATracker.actionCompleted(view.getActivity());
+
         //Google Ad
         firebaseAnalyticsHelper.logSignUp(userNo);
     }

app/src/main/res/layout/fragment_add_my_bucket_list.xml

@@ -11,16 +11,25 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <ImageView
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:background="@color/CF6F6F6"
+      android:scaleType="center"
+      android:src="@drawable/image_loading_common"
+      />
+
     <ImageView
       android:id="@+id/image_background2"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="@color/CFFFFFF"
+      android:background="@color/CF6F6F6"
       android:scaleType="centerCrop"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"/>
+      app:layout_constraintTop_toTopOf="parent"
+      tools:visibility="gone"/>
 
 
     <ImageView
@@ -28,12 +37,13 @@
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:background="@color/CF6F6F6"
-      android:scaleType="center"
+      android:scaleType="centerCrop"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      tools:src="@drawable/img_bestbucket_1"/>
+      tools:src="@drawable/img_bestbucket_1"
+      tools:visibility="gone"/>
 
 
   </FrameLayout>