show和hide方法重命名

Doikki · Doikki · commit 41d06597cd39 · 2019-12-02T22:59:26.000+08:00
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/BaseVideoController.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/BaseVideoController.java
@@ -197,7 +197,7 @@ public void setDismissTimeout(int timeout) {
      * 隐藏播放视图
      */
     @Override
-    public void hideInner() {
+    public void hide() {
         if (mShowing) {
             stopFadeOut();
             handleVisibilityChanged(false, mHideAnim);
@@ -209,7 +209,7 @@ public void hideInner() {
      * 显示播放视图
      */
     @Override
-    public void showInner() {
+    public void show() {
         if (!mShowing) {
             handleVisibilityChanged(true, mShowAnim);
             startFadeOut();
@@ -246,7 +246,7 @@ public void stopFadeOut() {
     public final Runnable mFadeOut = new Runnable() {
         @Override
         public void run() {
-            hideInner();
+            hide();
         }
     };
 
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/ControlWrapper.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/ControlWrapper.java
@@ -230,13 +230,13 @@ public void stopProgress() {
     }
 
     @Override
-    public void hideInner() {
-        mController.hideInner();
+    public void hide() {
+        mController.hide();
     }
 
     @Override
-    public void showInner() {
-        mController.showInner();
+    public void show() {
+        mController.show();
     }
 
     @Override
@@ -262,9 +262,9 @@ public void toggleLockState() {
      */
     public void toggleShowState() {
         if (isShowing()) {
-            hideInner();
+            hide();
         } else {
-            showInner();
+            show();
         }
     }
 }
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/IVideoController.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/IVideoController.java
@@ -41,12 +41,12 @@ public interface IVideoController {
     /**
      * 显示控制视图
      */
-    void hideInner();
+    void hide();
 
     /**
      * 隐藏控制视图
      */
-    void showInner();
+    void show();
 
     /**
      * 是否需要适配刘海
diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/extend/PadActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/extend/PadActivity.java
@@ -54,7 +54,7 @@ public void onClick(View v) {
     @Override
     public void onBackPressed() {
         if (mController.isLocked()) {
-            mController.showInner();
+            mController.show();
             Toast.makeText(this, R.string.dkplayer_lock_tip, Toast.LENGTH_SHORT).show();
             return;
         }
diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/component/DefinitionControlView.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/component/DefinitionControlView.java
@@ -141,7 +141,7 @@ public void onClick(View v) {
     };
 
     private void switchDefinition(String s) {
-        mControlWrapper.hideInner();
+        mControlWrapper.hide();
         mControlWrapper.stopProgress();
         String url = mMultiRateData.get(s);
         if (mOnRateSwitchListener != null)
diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/PortraitWhenFullScreenController.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/PortraitWhenFullScreenController.java
@@ -82,7 +82,7 @@ protected void onPlayerStateChanged(int playerState) {
         if (playerState == VideoView.PLAYER_FULL_SCREEN) {
             mFullScreen.setSelected(false);
         } else {
-            hideInner();
+            hide();
         }
 
         adjustView();
diff --git a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/StandardVideoController.java b/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/StandardVideoController.java
@@ -210,7 +210,7 @@ protected void onPlayStateChanged(int playState) {
     @Override
     public boolean onBackPressed() {
         if (isLocked()) {
-            showInner();
+            show();
             Toast.makeText(getContext(), R.string.dkplayer_lock_tip, Toast.LENGTH_SHORT).show();
             return true;
         }
diff --git a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/component/GestureView.java b/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/component/GestureView.java
@@ -40,7 +40,7 @@ public GestureView(@NonNull Context context, @Nullable AttributeSet attrs, int d
         super(context, attrs, defStyleAttr);
     }
 
-    private ControlWrapper mMediaPlayer;
+    private ControlWrapper mControlWrapper;
 
     private ImageView mIcon;
     private ProgressBar mProgressPercent;
@@ -60,7 +60,7 @@ public GestureView(@NonNull Context context, @Nullable AttributeSet attrs, int d
 
     @Override
     public void attach(@NonNull ControlWrapper controlWrapper) {
-        mMediaPlayer = controlWrapper;
+        mControlWrapper = controlWrapper;
     }
 
     @Override
@@ -80,7 +80,7 @@ public void onPlayerStateChanged(int playerState) {
 
     @Override
     public void onStartSlide() {
-        mMediaPlayer.hideInner();
+        mControlWrapper.hide();
         mCenterContainer.setVisibility(VISIBLE);
         mCenterContainer.setAlpha(1f);
     }

Original file line number	Diff line number	Diff line change
`@@ -230,13 +230,13 @@ public void stopProgress() {`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`@Override`
`233`		`- public void hideInner() {`
`234`		`- mController.hideInner();`
	`233`	`+ public void hide() {`
	`234`	`+ mController.hide();`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`@Override`
`238`		`- public void showInner() {`
`239`		`- mController.showInner();`
	`238`	`+ public void show() {`
	`239`	`+ mController.show();`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`@Override`
`@@ -262,9 +262,9 @@ public void toggleLockState() {`
`262`	`262`	`*/`
`263`	`263`	`public void toggleShowState() {`
`264`	`264`	`if (isShowing()) {`
`265`		`- hideInner();`
	`265`	`+ hide();`
`266`	`266`	`} else {`
`267`		`- showInner();`
	`267`	`+ show();`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void onClick(View v) {`
`54`	`54`	`@Override`
`55`	`55`	`public void onBackPressed() {`
`56`	`56`	`if (mController.isLocked()) {`
`57`		`- mController.showInner();`
	`57`	`+ mController.show();`
`58`	`58`	`Toast.makeText(this, R.string.dkplayer_lock_tip, Toast.LENGTH_SHORT).show();`
`59`	`59`	`return;`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ protected void onPlayerStateChanged(int playerState) {`
`82`	`82`	`if (playerState == VideoView.PLAYER_FULL_SCREEN) {`
`83`	`83`	`mFullScreen.setSelected(false);`
`84`	`84`	`} else {`
`85`		`- hideInner();`
	`85`	`+ hide();`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`adjustView();`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ protected void onPlayStateChanged(int playState) {`
`210`	`210`	`@Override`
`211`	`211`	`public boolean onBackPressed() {`
`212`	`212`	`if (isLocked()) {`
`213`		`- showInner();`
	`213`	`+ show();`
`214`	`214`	`Toast.makeText(getContext(), R.string.dkplayer_lock_tip, Toast.LENGTH_SHORT).show();`
`215`	`215`	`return true;`
`216`	`216`	`}`