更新静态对象，代码整理

朱显松
1 parent e3c2f052
Showing 24 changed files with 38 additions and 53 deletions
.idea/inspectionProfiles/Project_Default.xml
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/gundam/main/application/CNLiveApplication.java → app/src/main/java/com/cnlive/gundam/application/CNLiveApplication.java
app/src/main/java/com/cnlive/gundam/main/network/ApiService.java → app/src/main/java/com/cnlive/gundam/data/network/ApiService.java
app/src/main/java/com/cnlive/gundam/main/network/RetrofitUtil.java → app/src/main/java/com/cnlive/gundam/data/network/RetrofitUtil.java
app/src/main/java/com/cnlive/gundam/main/network/util/SHA1.java → app/src/main/java/com/cnlive/gundam/data/network/util/SHA1.java
app/src/main/java/com/cnlive/gundam/main/network/util/SignUtil.java → app/src/main/java/com/cnlive/gundam/data/network/util/SignUtil.java
app/src/main/java/com/cnlive/gundam/main/presenter/AnchorInfoPresenter.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/HomeFragment.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/UGCListFragment.java
app/src/main/java/com/cnlive/gundam/main/ui/widget/FragmentTabHost.java
app/src/main/java/com/cnlive/gundam/main/utils/ActivityJumpUtil.java
app/src/main/java/com/cnlive/gundam/main/utils/SharedPreferencesHelper.java
app/src/main/java/com/cnlive/gundam/user/fragment/LoginFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/QuickLoginFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/RegisterFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/UserFindPasswardFragment.java
app/src/main/java/com/cnlive/gundam/user/util/DevilUtil.java
app/src/main/java/com/cnlive/gundam/user/util/DownTimer.java
app/src/main/java/com/cnlive/gundam/user/util/ToastUtil.java
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="AndroidLintNewApi" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="AndroidLintSetTextI18n" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
       <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
@@ -33,7 +33,7 @@
         tools:ignore="ProtectedPermissions" />
  
     <application
-        android:name=".main.application.CNLiveApplication"
+        android:name=".application.CNLiveApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-package com.cnlive.gundam.main.application;
+package com.cnlive.gundam.application;
  
 import android.app.Application;
  
-package com.cnlive.gundam.main.network;
+package com.cnlive.gundam.data.network;
  
 import com.cnlive.gundam.main.model.ActiveListModel;
 import com.cnlive.gundam.main.model.ActivePlayInfo;
-package com.cnlive.gundam.main.network;
+package com.cnlive.gundam.data.network;
  
  
 import com.cnlive.libs.util.Config;
-package com.cnlive.gundam.main.network.util;
+package com.cnlive.gundam.data.network.util;
  
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
-package com.cnlive.gundam.main.network.util;
+package com.cnlive.gundam.data.network.util;
  
 import android.content.Context;
 import android.util.Log;
@@ -2,8 +2,8 @@ package com.cnlive.gundam.main.presenter;
  
 import android.content.Context;
  
-import com.cnlive.gundam.main.network.RetrofitUtil;
-import com.cnlive.gundam.main.network.util.SignUtil;
+import com.cnlive.gundam.data.network.RetrofitUtil;
+import com.cnlive.gundam.data.network.util.SignUtil;
 import com.cnlive.gundam.main.presenter.view.AnchorInfoView;
 import com.cnlive.gundam.stream.model.ChannelInfoModel;
 import com.cnlive.libs.util.Config;
@@ -16,8 +16,8 @@ import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.FragmentActiveListBinding;
 import com.cnlive.gundam.main.model.VideoListProgram;
 import com.cnlive.gundam.main.model.VodListPage;
-import com.cnlive.gundam.main.network.RetrofitUtil;
-import com.cnlive.gundam.main.network.util.SignUtil;
+import com.cnlive.gundam.data.network.RetrofitUtil;
+import com.cnlive.gundam.data.network.util.SignUtil;
 import com.cnlive.gundam.main.ui.adapter.DataBindingAdapter;
 import com.cnlive.gundam.main.utils.ActivityJumpUtil;
 import com.cnlive.libs.util.Config;
@@ -16,8 +16,8 @@ import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.FragmentActiveListBinding;
 import com.cnlive.gundam.main.model.ActiveInfo;
 import com.cnlive.gundam.main.model.ActiveListModel;
-import com.cnlive.gundam.main.network.RetrofitUtil;
-import com.cnlive.gundam.main.network.util.SignUtil;
+import com.cnlive.gundam.data.network.RetrofitUtil;
+import com.cnlive.gundam.data.network.util.SignUtil;
 import com.cnlive.gundam.main.ui.adapter.DataBindingAdapter;
 import com.cnlive.gundam.main.utils.ActivityJumpUtil;
 import com.cnlive.libs.util.Config;
@@ -242,7 +242,7 @@ public class FragmentTabHost extends TabHost
  
     private void ensureContent() {
         if (mRealTabContent == null) {
-            mRealTabContent = (FrameLayout) findViewById(mContainerId);
+            mRealTabContent = findViewById(mContainerId);
             if (mRealTabContent == null) {
                 throw new IllegalStateException(
                         "No tab content FrameLayout found for id " + mContainerId);
@@ -8,8 +8,8 @@ import com.cnlive.gundam.R;
 import com.cnlive.gundam.main.model.ActiveInfo;
 import com.cnlive.gundam.main.model.ActivePlayInfo;
 import com.cnlive.gundam.main.model.VideoListProgram;
-import com.cnlive.gundam.main.network.RetrofitUtil;
-import com.cnlive.gundam.main.network.util.SignUtil;
+import com.cnlive.gundam.data.network.RetrofitUtil;
+import com.cnlive.gundam.data.network.util.SignUtil;
 import com.cnlive.gundam.video.activity.PlayerActivity;
 import com.cnlive.gundam.video.view.VideoView;
 import com.cnlive.libs.util.Config;
@@ -9,14 +9,11 @@ import java.util.Set;
 public class SharedPreferencesHelper {
  
     private static final String APP_NAME = "com.cnlive.granzon";
-    public static SharedPreferencesHelper instance;
-    protected Context mContext;
-    protected SharedPreferences sharedPreferences;
-
+    private static SharedPreferencesHelper instance;
+    private SharedPreferences sharedPreferences;
  
     private SharedPreferencesHelper(Context context) {
-        mContext = context;
-        sharedPreferences = mContext.getSharedPreferences(APP_NAME, 0);
+        sharedPreferences = context.getSharedPreferences(APP_NAME, 0);
     }
  
     /**
@@ -43,8 +40,8 @@ public class SharedPreferencesHelper {
         return sharedPreferences.getBoolean(key, defaultValue);
     }
  
-    public Long getLong(String key){
-        return sharedPreferences.getLong(key,0);
+    public Long getLong(String key) {
+        return sharedPreferences.getLong(key, 0);
     }
  
     public int getIntValue(String key) {
@@ -95,7 +92,7 @@ public class SharedPreferencesHelper {
         return sharedPreferences.getAll().keySet();
     }
  
-    public boolean contains(String key){
+    public boolean contains(String key) {
         return sharedPreferences.contains(key);
     }
 }
@@ -31,7 +31,7 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
     private FragmentLoginBinding binding;
  
     //用户数据信息
-    public static DataEntity data;
+    public DataEntity data;
  
     private Account account;//密码登录的account
  
@@ -33,7 +33,7 @@ public class QuickLoginFragment extends Fragment implements View.OnClickListener
     private FragmentQuickLoginBinding binding;
  
     //用户数据信息
-    public static DataEntity data;
+    public DataEntity data;
  
     //跳转页面的对话框
     private ProgressDialog dialog;
@@ -34,7 +34,7 @@ public class RegisterFragment extends Fragment implements View.OnClickListener {
     private UserFragmentRegisterBinding binding;
  
     //用户数据信息
-    public static DataEntity data;
+    public DataEntity data;
  
     //跳转页面的对话框
     private ProgressDialog dialog;
@@ -17,7 +17,6 @@ import com.cnlive.gundam.user.util.SystemTools;
 import com.cnlive.gundam.user.util.ToastUtil;
 import com.cnlive.libs.user.IUserService;
 import com.cnlive.libs.user.UserUtil;
-import com.cnlive.libs.user.model.DataEntity;
 import com.cnlive.libs.util.data.network.Callback;
  
  
@@ -28,9 +27,6 @@ import com.cnlive.libs.util.data.network.Callback;
 public class UserFindPasswardFragment extends Fragment implements View.OnClickListener{
     private UserFragmentFindPasswordBinding binding;
  
-    //用户数据信息
-    public static DataEntity data;
-
     //跳转页面的对话框
     private ProgressDialog dialog;
  
@@ -24,14 +24,8 @@ public class DevilUtil {
             v.getLocationInWindow(l);
             int left=l[0],top=l[1],bottom=top+v.getHeight(),right=left
             +v.getWidth();
-            if(event.getX()>left&&event.getX()<right
-            &&event.getY()>top&&event.getY()<bottom){
-                // 点击EditText的事件，忽略它。
-                return false;
-                }else{
-                // hideSoftInput(v.getWindowToken());
-                return true;
-                }
+            return !(event.getX() > left && event.getX() < right
+                    && event.getY() > top && event.getY() < bottom);
             }
         // 如果焦点不是EditText则忽略，这个发生在视图刚绘制完，第一个焦点不在EditView上，和用户用轨迹球选择其他的焦点
         return false;
@@ -132,9 +132,9 @@ public class DownTimer {
     }
  
     public interface TimeListener {
-        public void onFinish();
+        void onFinish();
  
-        public void onInterval(long remainTime);
+        void onInterval(long remainTime);
     }
  
     public void setTimerLiener(TimeListener listener) {
@@ -39,8 +39,8 @@ public class ToastUtil {
             show_msg = msg;
             toast = new Toast(context);
             View view = LayoutInflater.from(context).inflate(TOAST_LAYOUT_ID, null, false);
-            ImageView imageView = (ImageView) view.findViewById(R.id.image);
-            TextView textView = (TextView) view.findViewById(R.id.text);
+            ImageView imageView = view.findViewById(R.id.image);
+            TextView textView = view.findViewById(R.id.text);
             imageView.setVisibility(View.GONE);
  
             textView.setText(msg);
@@ -17,7 +17,7 @@ import org.greenrobot.eventbus.EventBus;
 public class NetworkChangeReceive extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        ConnectivityManager manager = (ConnectivityManager) context.getSystemService(context.CONNECTIVITY_SERVICE);
+        ConnectivityManager manager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = manager.getActiveNetworkInfo();
         if (networkInfo != null && networkInfo.isAvailable()) {
             NetworkInfo.State mobile = manager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState();
@@ -23,7 +23,7 @@ public class PlayerAccelerometerSensor {
     private double boundaryValue;
  
     public interface ScreenOrientationListener {
-        public void onOrientationChange(int orientation);
+        void onOrientationChange(int orientation);
     }
  
     public PlayerAccelerometerSensor(Context context) {
@@ -61,7 +61,7 @@ public class PlayerInfoView extends RelativeLayout {
     //记录当前视频是否是ugc
     private boolean isUgc = false;
  
-    private static VideoInfoListener l;
+    private VideoInfoListener l;
  
     public PlayerInfoView(Context context) {
         this(context, null);
@@ -50,13 +50,13 @@ public class VideoView extends BaseVideoView implements PlayerTouchView.VideoTou
     //拖动结束或拖拽进度条时需要seekTo的位置
     private long touchSeekToPosition = 0;
     //记录当前是否是竖屏
-    private static ObservableBoolean observableIsPortrait;
+    private ObservableBoolean observableIsPortrait;
     //记录当前是否是ugc节目
-    private static ObservableBoolean observableIsUgc;
+    private ObservableBoolean observableIsUgc;
     //记录当前视频高度
-    private static ObservableInt observableVideoHeight;
+    private ObservableInt observableVideoHeight;
     //记录当前视频宽度
-    private static ObservableInt observableVideoWidth;
+    private ObservableInt observableVideoWidth;
     //记录当前视频是否已经onError
     private boolean isPlayerError = false;
     //设置touchView 是否拦截touch事件
@@ -343,7 +343,7 @@ public class VideoView extends BaseVideoView implements PlayerTouchView.VideoTou
  
     @Override
     public boolean canTouch() {
-        return videoInfoViewIsShow() ? false : canTouch;
+        return !videoInfoViewIsShow() && canTouch;
     }
 //    --------------------- touch 相关回调 end-------------------------