Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp

陈硕
2 parents ded909ab 9ccd584b
Showing 7 changed files with 185 additions and 21 deletions
app/src/main/assets/cnlive_logo.png
app/src/main/java/com/cnlive/gundam/main/ui/activity/MainActivity.java
app/src/main/java/com/cnlive/gundam/main/utils/AccelerometerSensor.java
app/src/main/java/com/cnlive/gundam/stream/ui/activity/BaseStreamActivity.java
app/src/main/java/com/cnlive/gundam/stream/ui/activity/StreamActivity.java
app/src/main/java/com/cnlive/gundam/stream/util/FileUtil.java
app/src/main/java/com/cnlive/gundam/user/fragment/LoginFragment.java
@@ -20,6 +20,7 @@ import com.cnlive.gundam.main.ui.widget.FragmentTabHost;
 import com.cnlive.gundam.main.utils.SharedPreferencesHelper;
 import com.cnlive.gundam.stream.model.ChannelInfoModel;
 import com.cnlive.gundam.stream.ui.activity.StreamActivity;
+import com.cnlive.gundam.stream.util.FileUtil;
 import com.cnlive.gundam.user.activity.LoginActivity;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.model.User;
@@ -51,6 +52,9 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
         ));
         mAnchorInfoPresenter = new AnchorInfoPresenter(this);
+
+        //加载水印图片
+        FileUtil.copyFile(this, "cnlive_logo.png");
     }
     @Override
@@ -106,6 +110,7 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
     /**
      * 开启直播推流页面
+     *
      * @param info 主播信息
      */
     private void startStreamActivity(ChannelInfoModel info) {
@@ -113,7 +118,7 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
         String channelId = info.getData().getChannelId();
         String channelName = info.getData().getChannelName();
         String coverImgUrl = info.getData().getCoverImgUrl();
-        StreamActivity.start(this, activityId, channelId, channelName, coverImgUrl, false);
+        StreamActivity.start(this, activityId, channelId, channelName, coverImgUrl);
     }
     /**
+package com.cnlive.gundam.main.utils;
+
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+
+/**
+ * Created by xiansong on 2017/6/30.
+ */
+
+public class AccelerometerSensor {
+
+    private static final int ORIENTATION_LANDSCAPE = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+    private static final int ORIENTATION_PORTRAIT = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+    private static final int ORIENTATION_REVERSE_LANDSCAPE = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
+
+    private Context context;
+    private SensorManager mSensorManager = null;
+    private ScreenOrientationListener listener;
+
+    private int orientation = -1;
+    private double boundaryValue;
+
+    public interface ScreenOrientationListener {
+        void onOrientationChange(int orientation);
+    }
+
+    public AccelerometerSensor(Context context) {
+        this.context = context;
+    }
+
+    public void unregister() {
+        mSensorManager.unregisterListener(lsn);
+    }
+
+    public void register() {
+        boundaryValue = 8.5d;
+        mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+        Sensor mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+        mSensorManager.registerListener(lsn, mSensor, SensorManager.SENSOR_DELAY_UI);
+    }
+
+    private SensorEventListener lsn = new SensorEventListener() {
+
+        @SuppressWarnings("deprecation")
+        @Override
+        public void onSensorChanged(SensorEvent event) {
+            double x = event.values[SensorManager.DATA_X];
+            double y = event.values[SensorManager.DATA_Y];
+            if (x > boundaryValue && orientation != ORIENTATION_LANDSCAPE) {
+                orientation_change(orientation = ORIENTATION_LANDSCAPE);
+            } else if (y > boundaryValue && orientation != ORIENTATION_PORTRAIT) {
+                orientation_change(orientation = ORIENTATION_PORTRAIT);
+            } else if (x < (-boundaryValue) && orientation != ORIENTATION_REVERSE_LANDSCAPE) {
+                orientation_change(orientation = ORIENTATION_REVERSE_LANDSCAPE);
+            }
+        }
+
+        @Override
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
+
+        }
+    };
+
+    public int getOrientation() {
+        return orientation;
+    }
+
+    public void setScreenOrientationListener(ScreenOrientationListener listener) {
+        this.listener = listener;
+    }
+
+    private void orientation_change(int orientation) {
+        if (listener != null) listener.onOrientationChange(orientation);
+    }
+
+}
@@ -48,6 +48,8 @@ public class BaseStreamActivity extends AppCompatActivity implements Handler.Cal
     private final static int PERMISSION_REQUEST_CAMERA_AUDIOREC = 1;
+    private final static String path = Environment.getExternalStorageDirectory() + File.separator + "cnlive_logo.png";
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -55,10 +57,7 @@ public class BaseStreamActivity extends AppCompatActivity implements Handler.Cal
         mHandler = new Handler(this);
     }
-    protected void initStreamer(boolean landScape, GLSurfaceView glSurfaceView) {
-        setRequestedOrientation(landScape ?
-                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE :
-                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+    protected void initStreamer(GLSurfaceView glSurfaceView) {
         mStreamer = new Streamer(this);
         //设置预览编码帧率
         mStreamer.setPreviewFps(15);
@@ -75,19 +74,13 @@ public class BaseStreamActivity extends AppCompatActivity implements Handler.Cal
         //设置编码模式
         mStreamer.setEncodeMethod(IStreamer.ENCODE_METHOD_SOFTWARE_COMPAT);
         //设置横竖屏方向
-        mStreamer.setRotateDegrees(landScape ? 90 : 0);
-        if (landScape) {
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);//横屏
-        } else {
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
-        }
+        mStreamer.setRotateDegrees(getOrientationAngle());
         //设置预览view
         mStreamer.setDisplayPreview(glSurfaceView);
         //设置前置摄像头镜像
         mStreamer.setFrontCameraMirror(true);
         //设置水印
-        String path = Environment.getExternalStorageDirectory() + File.separator + "cnlive_logo.png";
-        mStreamer.showWaterMarkLogo(path, 0.03f, 0.02f, landScape ? 0.0911f : 0.15f, landScape ? 0.0545f : 0.033f, 1f);
+        mStreamer.showWaterMarkLogo(path, 0.03f, 0.02f, isLandscape() ? 0.0911f : 0.15f, isLandscape() ? 0.0545f : 0.033f, 1f);
         //设置视频编码是的帧间隔，默认3秒
         mStreamer.setIFrameInterval(2);
         //设置音频通道
@@ -100,6 +93,32 @@ public class BaseStreamActivity extends AppCompatActivity implements Handler.Cal
         mStreamer.setOnErrorListener(mErrorListener);
     }
+    protected int getOrientationAngle() {
+        switch (getRequestedOrientation()) {
+            case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT:
+                return 0;
+            case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:
+                return 90;
+            case ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE:
+                return 270;
+            default:
+                return 0;
+        }
+    }
+
+    protected boolean isLandscape() {
+        int angle = getOrientationAngle();
+        return angle == 90 || angle == 270;
+    }
+
+    protected void orientationChange() {
+        //设置横竖屏方向
+        mStreamer.setRotateDegrees(getOrientationAngle());
+        //水印重绘
+        mStreamer.hideWaterMarkLogo();
+        mStreamer.showWaterMarkLogo(path, 0.03f, 0.02f, isLandscape() ? 0.0911f : 0.15f, isLandscape() ? 0.0545f : 0.033f, 1f);
+    }
+
     protected void switchCamera() {
         mStreamer.switchCamera();
     }
@@ -5,6 +5,7 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.os.Handler;
@@ -21,6 +22,7 @@ import android.widget.TextView;
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.ActivityStreamPortraitBinding;
+import com.cnlive.gundam.main.utils.AccelerometerSensor;
 import com.cnlive.gundam.stream.model.ChatItem;
 import com.cnlive.gundam.stream.model.ExtensionModel;
 import com.cnlive.gundam.stream.model.ShowView;
@@ -41,7 +43,8 @@ import com.google.gson.Gson;
 import java.util.ArrayList;
 import java.util.List;
-public class StreamActivity extends BaseStreamActivity implements ChatConnect.ChatCallback, TimerUtil.TimerListener {
+public class StreamActivity extends BaseStreamActivity implements ChatConnect.ChatCallback,
+        TimerUtil.TimerListener, AccelerometerSensor.ScreenOrientationListener {
     private boolean isFace = false;
     private boolean isFlash = false;
@@ -54,7 +57,6 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
     private String channelId;
     private String channelName;
     private String coverImgUrl;
-    private boolean isLandscape = false;
     private Dialog endDialog;
     private ActivityStreamPortraitBinding binding;
@@ -70,13 +72,14 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
     private TimerUtil timerUtil;
     private String extensions;
-    public static void start(Context context, String activityId, String channelId, String channelName, String coverImgUrl, boolean landscage) {
+    private AccelerometerSensor accelerometerSensor;
+
+    public static void start(Context context, String activityId, String channelId, String channelName, String coverImgUrl) {
         Intent intent = new Intent(context, StreamActivity.class);
         intent.putExtra("activityId", activityId);
         intent.putExtra("channelId", channelId);
         intent.putExtra("channelName", channelName);
         intent.putExtra("coverImgUrl", coverImgUrl);
-        intent.putExtra("landscape", landscage);
         context.startActivity(intent);
     }
@@ -91,7 +94,7 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
         initData();
         binding = DataBindingUtil.setContentView(this, R.layout.activity_stream_portrait);
-        initStreamer(isLandscape, binding.cameraPreview);
+        initStreamer(binding.cameraPreview);
         showView.setStartBtn(true);
         showView.setRetryLayout(false);
         showView.setEndLayout(false);
@@ -103,6 +106,21 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
         chatItemList = new ArrayList<>();
         initChatRoomRecycel();
         timerUtil = new TimerUtil(this);
+
+        accelerometerSensor = new AccelerometerSensor(this);
+        accelerometerSensor.setScreenOrientationListener(this);
+    }
+
+
+    @Override
+    public void onOrientationChange(int orientation) {
+        setRequestedOrientation(orientation);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        orientationChange();
     }
     private void initChatRoomRecycel() {
@@ -117,7 +135,6 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
         channelId = getIntent().getStringExtra("channelId");
         channelName = getIntent().getStringExtra("channelName");
         coverImgUrl = getIntent().getStringExtra("coverImgUrl");
-        isLandscape = getIntent().getBooleanExtra("landscape", false);
         ExtensionModel extensionModel = new ExtensionModel(channelName, coverImgUrl);
         extensions = new Gson().toJson(extensionModel);
@@ -280,7 +297,7 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
         @Override
         public int getIsHorizontalScreen() {
-            return isLandscape ? 1 : 0;
+            return isLandscape() ? 1 : 0;
         }
         @Override
@@ -319,12 +336,14 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
         super.onPause();
         if (endDialog != null) endDialog.dismiss();
         if (timerUtil != null) timerUtil.cancelTimer();
+        if (accelerometerSensor != null) accelerometerSensor.unregister();
     }
     @Override
     protected void onResume() {
         super.onResume();
         if (timerUtil != null) timerUtil.startTimer(0, TimerUtil.UPDATE_ONLINE_PERSON);
+        if (accelerometerSensor != null) accelerometerSensor.register();
     }
     @Override
+package com.cnlive.gundam.stream.util;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.os.Environment;
+import android.util.Log;
+
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Created by xiansong on 2017/6/30.
+ */
+
+public class FileUtil {
+    public static void copyFile(Context context, String filename) {
+        AssetManager assetManager = context.getAssets();
+
+        InputStream in = null;
+        OutputStream out = null;
+        try {
+            in = assetManager.open(filename);
+            String newFileName = Environment.getExternalStorageDirectory() + java.io.File.separator + filename;
+            out = new FileOutputStream(newFileName);
+
+            byte[] buffer = new byte[1024];
+            int read;
+            while ((read = in.read(buffer)) != -1) {
+                out.write(buffer, 0, read);
+            }
+            in.close();
+            in = null;
+            out.flush();
+            out.close();
+            out = null;
+        } catch (Exception e) {
+            Log.e("tag", e.getMessage());
+        }
+    }
+}
@@ -158,7 +158,7 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
                     UserService userService = UserService.getInstance(getActivity());
                     userService.setUserInfo(account,data);
                     //userService.isAutoLogin();
-                    userService.autoLogin(binding.edtLoginNumber.toString(), binding.edtInputPassward.getText().toString(), data);
+                    userService.autoLogin(binding.edtLoginNumber.getText().toString(), binding.edtInputPassward.getText().toString(), data);
                     if (null != data.toString()) {
                         //getFragmentManager().popBackStack();