Commit 6fe9a9af669fe8a578532e7f70cbad58a324d789

Authored by 朱显松
1 parent 55ec7b42

更新图标

app/src/main/java/com/cnlive/gundam/main/ui/activity/MainActivity.java
1 package com.cnlive.gundam.main.ui.activity; 1 package com.cnlive.gundam.main.ui.activity;
2 2
3 -import android.content.Intent;  
4 import android.databinding.DataBindingUtil; 3 import android.databinding.DataBindingUtil;
5 import android.os.Bundle; 4 import android.os.Bundle;
6 import android.support.v7.app.AppCompatActivity; 5 import android.support.v7.app.AppCompatActivity;
@@ -12,7 +11,6 @@ import com.cnlive.gundam.main.ui.fragment.HomeFragment; @@ -12,7 +11,6 @@ import com.cnlive.gundam.main.ui.fragment.HomeFragment;
12 import com.cnlive.gundam.main.ui.fragment.LiveFragment; 11 import com.cnlive.gundam.main.ui.fragment.LiveFragment;
13 import com.cnlive.gundam.main.ui.fragment.UGCListFragment; 12 import com.cnlive.gundam.main.ui.fragment.UGCListFragment;
14 import com.cnlive.gundam.main.ui.widget.FragmentTabHost; 13 import com.cnlive.gundam.main.ui.widget.FragmentTabHost;
15 -import com.cnlive.gundam.stream.ui.activity.StreamActivity;  
16 14
17 import java.util.Arrays; 15 import java.util.Arrays;
18 16
@@ -41,16 +39,14 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O @@ -41,16 +39,14 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
41 public boolean onSetCurrentTab(String tag) { 39 public boolean onSetCurrentTab(String tag) {
42 switch (tag) { 40 switch (tag) {
43 case "stream": 41 case "stream":
44 - Intent intent = new Intent(this, StreamActivity.class);  
45 - intent.putExtra("activityId", ""+System.currentTimeMillis());  
46 - intent.putExtra("channelId", "androidtest");  
47 - intent.putExtra("channelName", "androidTest");  
48 - intent.putExtra("coverImgUrl", "");  
49 - intent.putExtra("landscape", false);  
50 - startActivity(intent); 42 + onSetStreamTab();
51 return true; 43 return true;
52 } 44 }
53 return false; 45 return false;
54 } 46 }
55 47
  48 + private void onSetStreamTab(){
  49 +
  50 + }
  51 +
56 } 52 }
57 \ No newline at end of file 53 \ No newline at end of file
app/src/main/java/com/cnlive/gundam/stream/ui/activity/StreamActivity.java
@@ -2,7 +2,9 @@ package com.cnlive.gundam.stream.ui.activity; @@ -2,7 +2,9 @@ package com.cnlive.gundam.stream.ui.activity;
2 2
3 import android.app.AlertDialog; 3 import android.app.AlertDialog;
4 import android.app.Dialog; 4 import android.app.Dialog;
  5 +import android.content.Context;
5 import android.content.DialogInterface; 6 import android.content.DialogInterface;
  7 +import android.content.Intent;
6 import android.databinding.DataBindingUtil; 8 import android.databinding.DataBindingUtil;
7 import android.os.Bundle; 9 import android.os.Bundle;
8 import android.os.Handler; 10 import android.os.Handler;
@@ -70,6 +72,16 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch @@ -70,6 +72,16 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
70 private TimerUtil timerUtil; 72 private TimerUtil timerUtil;
71 private String extensions; 73 private String extensions;
72 74
  75 + public static void start(Context context, String activityId, String channelId, String channelName, String coverImgUrl, boolean landscage) {
  76 + Intent intent = new Intent(context, StreamActivity.class);
  77 + intent.putExtra("activityId", activityId);
  78 + intent.putExtra("channelId", channelId);
  79 + intent.putExtra("channelName", channelName);
  80 + intent.putExtra("coverImgUrl", coverImgUrl);
  81 + intent.putExtra("landscape", landscage);
  82 + context.startActivity(intent);
  83 + }
  84 +
73 @Override 85 @Override
74 protected void onCreate(Bundle savedInstanceState) { 86 protected void onCreate(Bundle savedInstanceState) {
75 super.onCreate(savedInstanceState); 87 super.onCreate(savedInstanceState);
app/src/main/res/drawable-hdpi/ic_meiyan.png 0 → 100644

4.49 KB

app/src/main/res/drawable-hdpi/ic_meiyan_on.png 0 → 100644

5.06 KB

app/src/main/res/drawable-hdpi/ic_meiyan_on_sel.png 0 → 100644

4.42 KB

app/src/main/res/drawable-hdpi/ic_meiyan_sel.png 0 → 100644

4.09 KB

app/src/main/res/drawable-mdpi/ic_meiyan.png 0 → 100644

2.45 KB

app/src/main/res/drawable-mdpi/ic_meiyan_on.png 0 → 100644

2.8 KB

app/src/main/res/drawable-mdpi/ic_meiyan_on_sel.png 0 → 100644

2.45 KB

app/src/main/res/drawable-mdpi/ic_meiyan_sel.png 0 → 100644

2.26 KB

app/src/main/res/drawable-xhdpi/ic_meiyan.png 0 → 100644

6.04 KB

app/src/main/res/drawable-xhdpi/ic_meiyan_on.png 0 → 100644

6.82 KB

app/src/main/res/drawable-xhdpi/ic_meiyan_on_sel.png 0 → 100644

6.03 KB

app/src/main/res/drawable-xhdpi/ic_meiyan_sel.png 0 → 100644

5.55 KB

app/src/main/res/drawable-xxhdpi/ic_meiyan.png 0 → 100644

11.1 KB

app/src/main/res/drawable-xxhdpi/ic_meiyan_on.png 0 → 100644

12.5 KB

app/src/main/res/drawable-xxhdpi/ic_meiyan_on_sel.png 0 → 100644

11.1 KB

app/src/main/res/drawable-xxhdpi/ic_meiyan_sel.png 0 → 100644

10.1 KB

app/src/main/res/drawable-xxhdpi/icon_record_meiyan_off.png deleted 100644 → 0

4.48 KB

app/src/main/res/drawable-xxhdpi/icon_record_meiyan_on.png deleted 100644 → 0

6.14 KB

app/src/main/res/drawable-xxxhdpi/ic_meiyan.png 0 → 100644

15.7 KB

app/src/main/res/drawable-xxxhdpi/ic_meiyan_on.png 0 → 100644

17.7 KB

app/src/main/res/drawable-xxxhdpi/ic_meiyan_on_sel.png 0 → 100644

15.8 KB

app/src/main/res/drawable-xxxhdpi/ic_meiyan_sel.png 0 → 100644

14.4 KB

app/src/main/res/drawable/icon_record_meiyan.xml 0 → 100644
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <item android:drawable="@drawable/ic_meiyan_sel" android:state_pressed="true" />
  4 + <item android:drawable="@drawable/ic_meiyan" android:state_pressed="false" />
  5 +</selector>
0 \ No newline at end of file 6 \ No newline at end of file
app/src/main/res/drawable/icon_record_meiyan_on.xml 0 → 100644
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <item android:drawable="@drawable/ic_meiyan_on_sel" android:state_pressed="true" />
  4 + <item android:drawable="@drawable/ic_meiyan_on" android:state_pressed="false" />
  5 +</selector>
0 \ No newline at end of file 6 \ No newline at end of file
app/src/main/res/layout/activity_stream_portrait.xml
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 android:onClick="onClick" 162 android:onClick="onClick"
163 android:padding="5dp" 163 android:padding="5dp"
164 android:scaleType="fitCenter" 164 android:scaleType="fitCenter"
165 - android:src="@{isShow.beautifulBtn ? @drawable/icon_record_meiyan_on : @drawable/icon_record_meiyan_off}" /> 165 + android:src="@{isShow.beautifulBtn ? @drawable/icon_record_meiyan_on : @drawable/icon_record_meiyan}" />
166 166
167 <ImageButton 167 <ImageButton
168 android:id="@+id/btn_flip" 168 android:id="@+id/btn_flip"