混淆冲突的类文件代码层处理 - ImageGestureListener

nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java

@@ -27,7 +27,6 @@ import com.netease.nim.uikit.common.activity.ToolBarOptions;
 import com.netease.nim.uikit.common.activity.UI;
 import com.netease.nim.uikit.common.ui.dialog.CustomAlertDialog;
 import com.netease.nim.uikit.common.ui.imageview.BaseZoomableImageView;
-import com.netease.nim.uikit.common.ui.imageview.ImageGestureListener;
 import com.netease.nim.uikit.common.util.media.BitmapDecoder;
 import com.netease.nim.uikit.common.util.media.ImageUtil;
 import com.netease.nim.uikit.common.util.sys.TimeUtil;
@@ -503,7 +502,7 @@ public class WatchMessagePictureActivity extends UI {
 
     // 设置图片点击事件
     protected void onImageViewFound(BaseZoomableImageView imageView) {
-        imageView.setImageGestureListener(new ImageGestureListener() {
+        imageView.setImageGestureListener(new BaseZoomableImageView.ImageGestureListener() {
 
             @Override
             public void onImageGestureSingleTapConfirmed() {

nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/BaseZoomableImageView.java

@@ -715,4 +715,13 @@ public abstract class BaseZoomableImageView extends View {
         return null;
     }
 
+    public interface ImageGestureListener {
+
+        void onImageGestureSingleTapConfirmed();
+
+        void onImageGestureLongPress();
+
+        void onImageGestureFlingDown();
+    }
+
 }

nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/ImageGestureListener.java

@@ -1,26 +0,0 @@
-package com.netease.nim.uikit.common.ui.imageview;
-
-/*
- * Copyright 2012 Laurence Dawson
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public interface ImageGestureListener {
-
-    void onImageGestureSingleTapConfirmed();
-
-    void onImageGestureLongPress();
-
-    void onImageGestureFlingDown();
-}