Prechádzať zdrojové kódy

[주모]
- UI 오류 수정
- 광고SDK 관련 수정
- 배포버젼 업데이트 4.0.0.128

yeongyun 6 rokov pred
rodič
commit
3480280b79

+ 1 - 1
app/build.gradle

@@ -39,7 +39,7 @@ android {
         minSdkVersion 19    // 4.4
         targetSdkVersion 27
         versionCode 169
-        versionName "4.0.0.127"
+        versionName "4.0.0.128"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true

+ 8 - 0
app/proguard-rules.pro

@@ -19,3 +19,11 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+-keep class org.apache.http.** { *; }
+-keep class org.apache.commons.codec.** { *; }
+-keep class org.apache.commons.logging.** { *; }
+-keep class android.net.compatibility.** { *; }
+-keep class android.net.http.** { *; }
+-keep class com.android.internal.http.multipart.** { *; }
+-dontwarn org.apache.http.**
+-dontwarn android.webkit.**

+ 7 - 1
app/src/main/AndroidManifest.xml

@@ -239,10 +239,16 @@
     <meta-data
       android:name="com.kakao.sdk.AppKey"
       android:value="@string/kakao_app_key"/>
+
     <meta-data
       android:name="com.facebook.sdk.ApplicationId"
       android:value="@string/facebook_app_id"/>
 
+    <!-- TNK Setting -->
+    <meta-data
+        android:name="tnkad_app_id"
+        android:value="@string/tnk_app_id" />
+
     <!-- Widget -->
     <receiver android:name=".lifeplus.view.widget.LifeplusWidgetProvider">
       <intent-filter>
@@ -299,7 +305,6 @@
         android:theme="@style/AppThemeZumo"/>
     <!-- Kakao theme Setting -->
 
-    <!-- Install referrer Setting -->
     <receiver
         android:name="kr.co.zumo.app.lifeplus.InstallReferrerReceiver"
         android:exported="true"
@@ -312,6 +317,7 @@
       <meta-data
           android:name="com.nasmob.nswitch.sdk.AppId"
           android:value="@string/nswitch_app_id_manifest"/>
+
     </receiver>
     <!-- Install referrer Setting -->
 

+ 75 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/activity/SplashActivity.java

@@ -3,13 +3,31 @@ package kr.co.zumo.app.lifeplus.activity;
 import android.content.Intent;
 import android.widget.FrameLayout;
 
+import com.buzzvil.buzzad.analytics.BATracker;
+import com.nasmob.nswitch.sdk.NSWTrackManager;
+import com.nasmob.nswitch.sdk.NSWTracker;
+import com.tnkfactory.ad.TnkSession;
+
+import kr.co.cashslide.Cashslide;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.application.App;
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
+import kr.co.zumo.app.lifeplus.helper.GoogleAnalyticsHelper;
 import kr.co.zumo.app.lifeplus.helper.ScreenChangerHelper;
 import kr.co.zumo.app.lifeplus.model.SuperModelInit;
+import kr.co.zumo.app.lifeplus.model.module.APIError;
+import kr.co.zumo.app.lifeplus.model.module.APIModuleListener;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.custom.FullScreenWithKeyBoardLayout;
+import kr.co.zumo.app.lifeplus.zumo.bean.api.CookieOvenPostBackRequestBean;
+import kr.co.zumo.app.lifeplus.zumo.bean.api.GetCookieOvenRequestBean;
+import kr.co.zumo.app.lifeplus.zumo.bean.api.GetCookieOvenResultBean;
+import kr.co.zumo.app.lifeplus.zumo.model.module.APICookieOvenPostBackModule;
+import kr.co.zumo.app.lifeplus.zumo.model.module.APIGetCookieOvenModule;
+
+import static kr.co.zumo.app.lifeplus.util.ResourceUtil.getString;
 
 /**
  * Splash 화면
@@ -45,6 +63,9 @@ public class SplashActivity extends ActivityBase {
     frameLayout.setPadding(0, 0, 0, ResourceUtil.getStatusBarHeightManual());
 
     launchScreen(ScreenID.SPLASH);
+
+    callAD();
+//    cookieOvenTest();
   }
 
   protected boolean hasLayout() {
@@ -65,5 +86,58 @@ public class SplashActivity extends ActivityBase {
   protected void onAfterNewIntent(Intent intent) {
 
   }
-}
 
+  /**
+   * CPE, CPA 광고상품 호출
+   */
+  public void callAD() {
+    //Cash slide Ad
+    Cashslide cashslide = new Cashslide(this, getString(R.string.cashslide_api_key));
+    cashslide.appFirstLaunched();
+
+    //TNK Ad
+    TnkSession.actionCompleted(this);
+
+    //NSwitch Ad
+    NSWTracker nswTracker = NSWTrackManager.getInstance().getTracker(this, getString(R.string.nswitch_app_id));
+    nswTracker.setTestMode(false);
+    nswTracker.track();
+    nswTracker.trackConversion("NSW_CONVERSION");
+
+    //Buzz Ad: CPE
+    BATracker.actionCompleted(this);
+  }
+
+  private void cookieOvenTest() {
+    GetCookieOvenRequestBean cookieOvenRequestBean = new GetCookieOvenRequestBean();
+    cookieOvenRequestBean.setKey("ed971dd1-8852-421b-b962-72c30c0ad9c8");
+    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) {
+        // 응답 확인 하지 않음
+      }
+    });
+  }
+}

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/zumo/activity/SignUpActivity.java

@@ -69,10 +69,10 @@ public class SignUpActivity extends AppCompatActivity implements ISignUpProcessL
     public void onProcessChange(int step) {
         if(step == ISignUpProcessListener.REQUIRED_INFO) {  // 회원가입 화면 재호출
             getSupportFragmentManager().popBackStack();
-            getSupportActionBar().setTitle(getString(R.string.title_require_info));
+            ((TextView) findViewById(R.id.action_bar_title)).setText(getString(R.string.title_require_info));
             setProgressBar(33);
         } else if(step == ISignUpProcessListener.ADDTIONAL_INFO){   // 프로필 추가 정보 입력 화면 호출
-            getSupportActionBar().setTitle(getString(R.string.title_additional_info));
+            ((TextView) findViewById(R.id.action_bar_title)).setText(getString(R.string.title_additional_info));
             getSupportFragmentManager().beginTransaction().setCustomAnimations(R.anim.enter, R.anim.exit, R.anim.back_enter, R.anim.back_exit)
                     .add(R.id.container, SignUpInfoFragment.newInstance()).addToBackStack(null).commit();
             setProgressBar(66);

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/zumo/screen/FindPWPresenter.java

@@ -72,14 +72,14 @@ public class FindPWPresenter extends BasePresenter<SignUpModel, FindPWView> {
     }
 
     /**
-     * 데이터 단순 유효성 검증
+     * 데이터 유효성 검증
      */
     public void possibleToNext() {
         String errorEmail = getValidationEmail();
 
         view.possibleToNext(!StringUtil.isEmpty(tempUserInfo.getName())
                 && !StringUtil.isEmpty(tempUserInfo.getEmail())
-                /*&& !StringUtil.isEmpty(errorEmail) == false*/);
+                && !StringUtil.isEmpty(errorEmail) == false);
     }
 
     /**

+ 1 - 1
app/src/main/res/layout/signup_info_fragment.xml

@@ -179,7 +179,7 @@
             android:background="@drawable/rectangle_button_background_selector"
             android:enabled="false"
             android:stateListAnimator="@null"
-            android:text="@string/confirm"
+            android:text="@string/complete"
             android:textColor="@color/button_text_color_selector"
             android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="parent"