CNLive Android Team / CNLiveApp · Commits

Commit 576a7725cdd18bb9614862c57db4e942660a265e

Authored by 谷俊
1 parent bebbeaf2

合并

Inline Side-by-side
Showing 5 changed files with 4 additions and 9 deletions
app/src/main/java/com/cnlive/gundam/main/ui/activity/BackBaseActivity.java
  View file @576a772
@@ -22,7 +22,7 @@ public class BackBaseActivity extends AppCompatActivity { @@ -22,7 +22,7 @@ public class BackBaseActivity extends AppCompatActivity {
22 TextView toolbarTitle = (TextView) findViewById(R.id.toolbarTitle); 22 TextView toolbarTitle = (TextView) findViewById(R.id.toolbarTitle);
23 toolbarTitle.setText(title); 23 toolbarTitle.setText(title);
24 toolbar.setVisibility(View.VISIBLE); 24 toolbar.setVisibility(View.VISIBLE);
25 - toolbar.setNavigationIcon(R.drawable.ic_close); 25 + toolbar.setNavigationIcon(R.drawable.btn_cancel);
26 setSupportActionBar(toolbar); 26 setSupportActionBar(toolbar);
27 27
28 } 28 }
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
  View file @576a772
@@ -57,9 +57,6 @@ public class ConfigFragment extends Fragment implements View.OnClickListener { @@ -57,9 +57,6 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
57 switch (view.getId()) { 57 switch (view.getId()) {
58 case R.id.config_header: 58 case R.id.config_header:
59 int uid = UserService.getInstance(getActivity()).getActiveAccountInfo().getUid(); 59 int uid = UserService.getInstance(getActivity()).getActiveAccountInfo().getUid();
60 - if (uid != 0)  
61 - startActivity(new Intent(getActivity(), UserPersonalActivity.class));  
62 - else  
63 if (uid != 0) { 60 if (uid != 0) {
64 //进入个人中心页面 61 //进入个人中心页面
65 Intent intent = new Intent(getActivity(), UserPersonalActivity.class); 62 Intent intent = new Intent(getActivity(), UserPersonalActivity.class);
@@ -68,6 +65,7 @@ public class ConfigFragment extends Fragment implements View.OnClickListener { @@ -68,6 +65,7 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
68 } else { 65 } else {
69 //进入登录页面 66 //进入登录页面
70 startActivity(new Intent(getActivity(), LoginActivity.class)); 67 startActivity(new Intent(getActivity(), LoginActivity.class));
  68 + }
71 break; 69 break;
72 70
73 case R.id.message: 71 case R.id.message:
app/src/main/res/layout/layout_actionbar_back.xml
  View file @576a772
@@ -6,7 +6,6 @@ @@ -6,7 +6,6 @@
6 xmlns:tools="http://schemas.android.com/tools" 6 xmlns:tools="http://schemas.android.com/tools"
7 android:layout_width="match_parent" 7 android:layout_width="match_parent"
8 android:layout_height="?attr/actionBarSize" 8 android:layout_height="?attr/actionBarSize"
9 - android:background="@drawable/toolbar_bg"  
10 android:theme="@style/ThemeOverlay.AppCompat.Light" 9 android:theme="@style/ThemeOverlay.AppCompat.Light"
11 app:contentInsetEnd="?attr/actionBarSize" 10 app:contentInsetEnd="?attr/actionBarSize"
12 android:visibility="gone" 11 android:visibility="gone"
app/src/main/res/layout/layout_personal_header_item.xml
  View file @576a772
@@ -54,8 +54,7 @@ @@ -54,8 +54,7 @@
54 android:layout_width="wrap_content" 54 android:layout_width="wrap_content"
55 android:layout_height="wrap_content" 55 android:layout_height="wrap_content"
56 android:layout_alignParentRight="true" 56 android:layout_alignParentRight="true"
57 - android:layout_centerVertical="true"  
58 - android:src="@drawable/ic_close" /> 57 + android:layout_centerVertical="true"/>
59 58
60 </RelativeLayout> 59 </RelativeLayout>
61 60
app/src/main/res/layout/layout_personal_item.xml
  View file @576a772
@@ -56,8 +56,7 @@ @@ -56,8 +56,7 @@
56 android:layout_width="wrap_content" 56 android:layout_width="wrap_content"
57 android:layout_height="wrap_content" 57 android:layout_height="wrap_content"
58 android:layout_alignParentRight="true" 58 android:layout_alignParentRight="true"
59 - android:layout_centerVertical="true"  
60 - android:src="@drawable/ic_close" /> 59 + android:layout_centerVertical="true"/>
61 60
62 </RelativeLayout> 61 </RelativeLayout>
63 62