浏览代码

[공통][Common] 코드 analysis 적용후 반영

Hasemi 6 年之前
父节点
当前提交
3e71204415

+ 3 - 1
app/src/common/java/kr/co/zumo/app/lifeplus/network/NetworkWatcher.java

@@ -28,6 +28,8 @@ import kr.co.zumo.app.lifeplus.util.NetworkUtil;
  */
 public class NetworkWatcher {
 
+  private Observable<Boolean> watcher;
+
   /**
    * 네트워크 장치 연결과 인터넷 연결이 됐는지 확인한다.
    * - Single 을 반환하므로 subscribe 하여 boolean 값을 참고하여 진행한다.
@@ -103,7 +105,7 @@ public class NetworkWatcher {
     /**
      * 두 객체의 결과를 조합하여 변화가 있을 때만 발행함.
      */
-    Observable<Boolean> watcher = Observable.combineLatest(network, internet, (isConnectedNetwork, isConnectedInternet) -> {
+    watcher = Observable.combineLatest(network, internet, (isConnectedNetwork, isConnectedInternet) -> {
       Log.d("APP# NetworkWatcher | watchNetwork", "|" + " isConnected-Network: " + isConnectedNetwork);
       Log.d("APP# NetworkWatcher | watchNetwork", "|" + " isConnected-Internet: " + isConnectedInternet);
       return isConnectedNetwork && isConnectedInternet;

+ 3 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/tool/GuestContentsShowCounter.java

@@ -23,6 +23,8 @@ import kr.co.zumo.app.lifeplus.util.StringUtil;
  */
 public class GuestContentsShowCounter extends ReviewCounter {
 
+  private String[] dates;
+
   /**
    * 7일 이내 35번 이상 조회시
    */
@@ -56,7 +58,7 @@ public class GuestContentsShowCounter extends ReviewCounter {
       return 0;
     }
 
-    String[] dates = dateString.split(SEPARATOR);
+    dates = dateString.split(SEPARATOR);
     return dates.length;
   }
 

+ 1 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/AddRegistrationDialog.java

@@ -41,8 +41,7 @@ public class AddRegistrationDialog extends DialogBase<ICustomDialogListener<AddR
   @Nullable
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    View view = inflater.inflate(R.layout.add_registration_dialog, container, false);
-    return view;
+    return inflater.inflate(R.layout.add_registration_dialog, container, false);
   }
 
   @Override

+ 1 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/FragmentBase.java

@@ -298,7 +298,6 @@ public abstract class FragmentBase<P extends Presenter> extends Fragment impleme
   @Override
   public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
     Log.i("APP# FragmentBase | onCreateAnimation", "| " + this.getClass().getSimpleName() + " ********" + ", transit: " + transit + ", enter: " + enter + ", nextAnim: 0x" + Integer.toString(nextAnim, 16));
-    Animation result = super.onCreateAnimation(transit, enter, nextAnim);
 //    if (enter) {
 //      result = AnimationUtils.loadAnimation(getContext(), R.anim.enter);
 //    }
@@ -317,7 +316,7 @@ public abstract class FragmentBase<P extends Presenter> extends Fragment impleme
 //      public void onAnimationRepeat(Animation animation) {}
 //    });
 
-    return result;
+    return super.onCreateAnimation(transit, enter, nextAnim);
   }
 
   /***********************************

+ 1 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/common/ServiceCheckModel.java

@@ -104,9 +104,7 @@ public class ServiceCheckModel extends Model {
     builder.append("HH:mm ");
     String to = Formatter.format(toMillis, builder.toString());
 
-    String contents = ResourceUtil.getString(R.string.menu_check_date, from, to) + "\n" + getSystemPopupBean().getContents();
-
     // 일시 : 2018년 5월 27일(일) 04:00~07:00
-    return contents;
+    return ResourceUtil.getString(R.string.menu_check_date, from, to) + "\n" + getSystemPopupBean().getContents();
   }
 }

+ 1 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/entry/EventQuestionModel.java

@@ -311,8 +311,7 @@ public class EventQuestionModel extends CoinModel implements IUriListProvider {
       Log.e("APP#  EventQuestionModel | getFile", "Log.getStackTraceString(e) |" + Log.getStackTraceString(e));
     }
     Log.d("APP# EventQuestionModel | getFile", "|" + "path ===> " + path);
-    File file = new File(path);
-    return file;
+    return new File(path);
   }
 
   private MultipartBody.Part prepareFilePart(String partName, File file) {

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/recommend/EventRecommendTagFragment.java

@@ -162,7 +162,7 @@ public class EventRecommendTagFragment extends FragmentBase<EventRecommendTagPre
         });
 
         layoutTagContents.addView(view);
-        stringBuffer.append(String.format("#%s", bean.getTagName()) + " ");
+        stringBuffer.append(String.format("#%s", bean.getTagName())).append(" ");
       }
 
       Log.e("APP#  EventRecommendTagFragment | drawTag", "| tag" + stringBuffer.toString());

+ 1 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/faq/FAQListFragment.java

@@ -59,8 +59,7 @@ public class FAQListFragment extends Fragment {
   @Nullable
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    View view = inflater.inflate(R.layout.fragment_faq_list, container, false);
-    return view;
+    return inflater.inflate(R.layout.fragment_faq_list, container, false);
   }
 
   @Override

+ 1 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/introduction/LifeplusIntroductionPagerAdapter.java

@@ -41,8 +41,7 @@ public class LifeplusIntroductionPagerAdapter extends FragmentStatePagerAdapter
         guideFragment.setListener(listener);
         return guideFragment;
       case 1:
-        LifeplusBrandFragment lifeplusBrandFragment = new LifeplusBrandFragment();
-        return lifeplusBrandFragment;
+        return new LifeplusBrandFragment();
       default:
         break;
     }

+ 1 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/BestBucketListFragment.java

@@ -40,8 +40,7 @@ public class BestBucketListFragment extends FragmentBase<BestBucketListPresenter
   @Nullable
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    View view = inflater.inflate(R.layout.fragment_bucket_list, container, false);
-    return view;
+    return inflater.inflate(R.layout.fragment_bucket_list, container, false);
   }
 
   @Override

+ 1 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/BucketListDefaultDetailFragment.java

@@ -40,8 +40,7 @@ public class BucketListDefaultDetailFragment extends FragmentBase<BucketListDefa
 
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    View view = inflater.inflate(R.layout.fragment_bucket_list_default_detail, container, false);
-    return view;
+    return inflater.inflate(R.layout.fragment_bucket_list_default_detail, container, false);
   }
 
   @Override

+ 1 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/notification/NotiListFragment.java

@@ -7,7 +7,6 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -63,8 +62,7 @@ public class NotiListFragment extends Fragment {
 
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    View view = inflater.inflate(R.layout.fragment_noti_list, container, false);
-    return view;
+    return inflater.inflate(R.layout.fragment_noti_list, container, false);
   }
 
   @Override