소스 검색

[수정사항]
1. proguard 적용
2. 메인화면 새로고침 시 index error 버그 수정

aaron 9 년 전
부모
커밋
1783cb628b

+ 4 - 1
kneet_v3/build.gradle

@@ -13,7 +13,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 22
         multiDexEnabled true
-        versionCode 6
+        versionCode 8
         versionName "0.1.3"
     }
 
@@ -60,12 +60,15 @@ android {
     buildTypes {
         debug {
             debuggable true
+//            minifyEnabled true
+//            proguardFiles 'proguard-rules.pro'
         }
         release {
             signingConfig signingConfigs.release
             debuggable false
             minifyEnabled true
             proguardFiles 'proguard-rules.pro'
+//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
     packagingOptions {

+ 23 - 8
kneet_v3/proguard-rules.pro

@@ -78,26 +78,41 @@
     @android.support.annotation.Keep <init>(...);
 }
 
+-keep class android.support.v4.app.** { *; }
+-keep interface android.support.v4.app.** { *; }
+-keep class android.support.v7.app.** { *; }
+-keep interface android.support.v7.app.** { *; }
+
+-keepattributes SourceFile, LineNumberTable
+
 -dontwarn com.squareup.picasso.**
 
 # Jackson이 참조하는 다른 라이브러리(joda-time 등) 없다는 경고 제거
 -dontwarn org.codehaus.jackson.**
 
--keep class com.android.volley.**
+-keep class com.android.volley.** { *; }
+
+-keep class com.koushikdutta.async.** { *; }
+
+-keep class com.google.android.** { *; }
+
+-keep class com.tsengvn.typekit.** { *; }
 
--keep class com.koushikdutta.async.**
+-keep class com.squareup.picasso.** { *; }
 
--keep class com.google.android.**
+-keep class jp.wasabeef.recyclerview.** { *; }
 
--keep class com.tsengvn.typekit.**
+-keep class org.codehaus.jackson.** { *; }
 
--keep class com.squareup.picasso.**
+-keep class javax.jmdns.** { *; }
 
--keep class jp.wasabeef.recyclerview.**
+-keep class com.nable.** { *; }
 
--keep class org.codehaus.jackson.**
+-keep class com.ntels.kneet.v3.common.util.** { *; }
 
--keep class javax.jmdns.**
+#-keepclassmembers class com.nable.nme.** { *; }
+#
+#-keepnames class com.nable.nme.** { *; }
 
 # java.lang.NoSuchFieldError: PUBLIC_ONLY 에러 제거
 -keepnames class org.codehaus.jackson.** { *; }

+ 8 - 0
kneet_v3/src/main/java/com/ntels/kneet/v3/common/util/Dlog.java

@@ -77,6 +77,10 @@ public class Dlog {
 
         StackTraceElement ste = Thread.currentThread().getStackTrace()[4];
 
+        if (ste == null) {
+            return "";
+        }
+
         StringBuilder sb = new StringBuilder();
 
         sb.append("[");
@@ -93,6 +97,10 @@ public class Dlog {
 
         StackTraceElement ste = Thread.currentThread().getStackTrace()[4];
 
+        if (ste == null) {
+            return "";
+        }
+
         StringBuilder sb = new StringBuilder();
 
         sb.append("[");

+ 1 - 1
kneet_v3/src/main/java/com/ntels/kneet/v3/common/util/LogUtil.java

@@ -7,7 +7,7 @@ import com.ntels.kneet.v3.BuildConfig;
 /**
  * 1. ClassName :   LogUtil
  * 2. FileName  :   LogUtil.java
- * 3. Package   :   com.android.doubleplace.util
+ * 3. Package   :   com.ntels.kneet.v3.common.util
  * 4. Date      :   2015-12-28
  * 5. Author    :   aaron
  * 6. Comment   :   Initialize

+ 2 - 0
kneet_v3/src/main/java/com/ntels/kneet/v3/common/websocket/WebSocketService.java

@@ -6,6 +6,7 @@ import android.os.Binder;
 import android.os.IBinder;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.AsyncHttpClient;
@@ -232,6 +233,7 @@ public class WebSocketService extends Service {
      */
     public boolean isWebSocketConnected() {
         if ( webSocket != null ) {
+            LogUtil.i(TAG, "webSocket.isOpen() : " + webSocket.isOpen());
             return webSocket.isOpen();
         }
         return false;

+ 10 - 10
kneet_v3/src/main/java/com/ntels/kneet/v3/view/things/Fragment_Things.java

@@ -497,16 +497,6 @@ public class Fragment_Things extends Fragment implements View.OnClickListener,
                 }
             }
         });
-        swipeRefreshLayout.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                LogUtil.i(TAG, "swipeRefreshLayout onTouch!!");
-                if ( swipeRefreshLayout.isRefreshing() ) {
-                    return true;
-                }
-                return false;
-            }
-        });
         setRefresh(true);
 
         bListFooter = true;
@@ -516,6 +506,16 @@ public class Fragment_Things extends Fragment implements View.OnClickListener,
         dataAdapter.setFooterVisible(bListFooterVisible);
 
         rcvList = (RecyclerView) getView().findViewById(R.id.rcvList);
+        rcvList.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                LogUtil.i(TAG, "rcvList onTouch!!");
+                if ( swipeRefreshLayout.isRefreshing() ) {
+                    return true;
+                }
+                return false;
+            }
+        });
         rcvList.setHasFixedSize(true);
         iListColumnsCnt = 2;
         if ( iListColumnsCnt == 1 ) {