修改水印图片不显示问题

王琳
1 parent 6f8847bd
Showing 6 changed files with 12 additions and 61 deletions
.idea/misc.xml
.idea/modules.xml
app/build.gradle
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/demo/stream/StreamActivity.java
app/src/main/res/layout/activity_stream.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -3,10 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/CNStreamDemo.iml" filepath="$PROJECT_DIR$/CNStreamDemo.iml" />
-      <module fileurl="file://$PROJECT_DIR$/CNStreamDemo.iml" filepath="$PROJECT_DIR$/CNStreamDemo.iml" />
       <module fileurl="file://$PROJECT_DIR$/StreamDemo.iml" filepath="$PROJECT_DIR$/StreamDemo.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
 </project>
 \ No newline at end of file
 apply plugin: 'com.android.application'
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion '24.0.3'
     defaultConfig {
         applicationId "com.cnlive.demo.stream"
@@ -6,12 +6,14 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_SINTERNETWIFI_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
-    <uses-permission android:name="android.permission.VIBRATE" />
+
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
@@ -61,8 +61,6 @@ public class StreamActivity extends Activity {
     private CheckBox mMuteCheckBox;
     private CheckBox mAudioOnlyCheckBox;
     private CheckBox mFrontMirrorCheckBox;
-    private TextView mUrlTextView;
-    private TextView mDebugInfoTextView;
     private ButtonObserver mObserverButton;
     private CheckBoxObserver mCheckBoxObserver;
@@ -72,12 +70,10 @@ public class StreamActivity extends Activity {
     private Timer mTimer;
     private boolean mIsLandscape;
-    private boolean mPrintDebugInfo = false;
     private boolean mRecording = false;
     private boolean isFlashOpened = false;
-    private String mDebugInfo = "";
     private String mBgmPath = "/sdcard/test.mp3";
-    private String mLogoPath = "file:///sdcard/test.png";
+    private String mLogoPath = "file:///sdcard/cnlive_logo.png";
     private String activityId;
     private String channelId;
@@ -132,9 +128,7 @@ public class StreamActivity extends Activity {
         mCameraHintView = (CameraHintView) findViewById(R.id.camera_hint);
         mCameraPreviewView = (GLSurfaceView) findViewById(R.id.camera_preview);
-        mUrlTextView = (TextView) findViewById(R.id.url);
         mChronometer = (Chronometer) findViewById(R.id.chronometer);
-        mDebugInfoTextView = (TextView) findViewById(R.id.debuginfo);
         mObserverButton = new ButtonObserver();
         mShootingText = (TextView) findViewById(R.id.click_to_shoot);
@@ -198,8 +192,6 @@ public class StreamActivity extends Activity {
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
                 isHorizontalScreen = 0;
             }
-
-            mPrintDebugInfo = bundle.getBoolean(SHOW_DEBUGINFO, false);
         }
         mStreamer.setDisplayPreview(mCameraPreviewView);
@@ -290,24 +282,6 @@ public class StreamActivity extends Activity {
         mRecording = false;
     }
-    private void beginInfoUploadTimer() {
-        if (mPrintDebugInfo && mTimer == null) {
-            mTimer = new Timer();
-            mTimer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            mDebugInfoTextView.setText(mDebugInfo);
-                        }
-                    });
-                }
-            }, 100, 1000);
-        }
-    }
-
-
     private class ButtonObserver implements View.OnClickListener {
         @Override
         public void onClick(View view) {
@@ -530,16 +504,11 @@ public class StreamActivity extends Activity {
             switch (what) {
                 case IStreamer.cnstream_camera_init_done:
                     Log.d(TAG, "cnstream_camera_init_done");
-                    //TODO setCameraAntiBanding50Hz();
-//                    if (mAutoStart) {
-//                        startStream();
-//                    }
                     break;
                 case IStreamer.cnstream_open_stream_succ:
                     Log.d(TAG, "cnstream_open_stream_success");
                     mChronometer.setBase(SystemClock.elapsedRealtime());
                     mChronometer.start();
-                    beginInfoUploadTimer();
                     break;
                 case IStreamer.cnstream_frame_send_slow:
                     Log.d(TAG, "cnstream_frame_send_slow");
@@ -3,7 +3,7 @@
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#00000000" >
+    android:background="#00000000">
     <android.opengl.GLSurfaceView
         android:id="@+id/camera_preview"
@@ -21,34 +21,16 @@
     <include
         android:id="@+id/actionbar"
+        layout="@layout/titlebar"
         android:layout_width="match_parent"
         android:layout_height="46dip"
-        android:layout_gravity="top"
-        layout="@layout/titlebar" />
-
-    <TextView
-        android:id="@+id/url"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/actionbar"
-        android:gravity="center"
-        android:textColor="#368ca8"
-        android:textSize="19sp" />
-
-    <TextView
-        android:id="@+id/debuginfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/url"
-        android:gravity="left"
-        android:textColor="#ae4ce6"
-        android:textSize="11sp" />
+        android:layout_gravity="top" />
     <include
         android:id="@+id/bar_bottom"
+        layout="@layout/bottombar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        layout="@layout/bottombar" />
+        android:layout_alignParentBottom="true" />
 </RelativeLayout>
 \ No newline at end of file