Skip to content

Commit 8a425e4

Browse files
androidmalinandroidmalin
committed
fix one bug when running on 6.0.1
1 parent 557670d commit 8a425e4

16 files changed

+435
-7
lines changed

‎app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies {
3939
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
4040
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
4141

42-
42+
compile 'com.android.support:design:23.2.1'
4343
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
4444
compile 'com.jakewharton.scalpel:scalpel:1.1.2'
4545
compile 'com.android.support:appcompat-v7:23.1.1'

‎app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,20 @@
1010
android:icon="@mipmap/malin"
1111
android:label="@string/app_name"
1212
android:supportsRtl="true"
13-
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
13+
android:theme="@style/AppTheme"
1414
>
15+
<!--android:theme="@style/ThemeOverlay.AppCompat.Dark"-->
1516
<activity
1617
android:name=".activity.MainActivity"
17-
android:theme="@style/ThemeOverlay.AppCompat.Dark"
18-
android:screenOrientation="portrait"
19-
>
18+
android:screenOrientation="portrait">
2019
<intent-filter>
2120
<action android:name="android.intent.action.MAIN" />
2221

2322
<category android:name="android.intent.category.LAUNCHER" />
2423
</intent-filter>
2524
</activity>
25+
26+
<activity android:name=".activity.MainTabActivity"/>
2627
</application>
2728

2829
</manifest>

‎app/src/main/java/com/malin/rengwuxianrxjava/activity/MainActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ protected void onCreate(Bundle savedInstanceState) {
126126
this.requestWindowFeature(Window.FEATURE_NO_TITLE);//去掉标题栏
127127
this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);//去掉信息栏
128128
getWindow().addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);//硬件加速
129+
129130
setContentViewLayout(true);
130131
initializeLogAndDeviceInfo();
131132
initView();

‎app/src/main/java/com/malin/rengwuxianrxjava/activity/MainTabActivity.java

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
package com.malin.rengwuxianrxjava.activity;
2+
3+
import android.os.Bundle;
4+
import android.support.design.widget.TabLayout;
5+
import android.support.v4.app.FragmentManager;
6+
import android.support.v4.app.FragmentPagerAdapter;
7+
import android.support.v4.view.ViewPager;
8+
import android.support.v7.app.AppCompatActivity;
9+
import android.support.v7.widget.Toolbar;
10+
11+
import com.malin.rengwuxianrxjava.R;
12+
import com.malin.rengwuxianrxjava.fragment.FragmentFour;
13+
import com.malin.rengwuxianrxjava.fragment.FragmentOne;
14+
import com.malin.rengwuxianrxjava.fragment.FragmentThree;
15+
import com.malin.rengwuxianrxjava.fragment.FragmentTwo;
16+
17+
/**
18+
* 类描述:
19+
* 创建人:malin
20+
* 创建时间:2016 16-4-8 17:36
21+
* 备注:{@link }
22+
* 修改人:
23+
* 修改时间:
24+
* 修改备注:
25+
*/
26+
public class MainTabActivity extends AppCompatActivity {
27+
28+
private Toolbar mToolBar;
29+
private TabLayout mTabLayout;
30+
private ViewPager mViewPager;
31+
private TabFragmentPagerAdapter mAdapter;
32+
33+
@Override
34+
protected void onCreate(Bundle savedInstanceState) {
35+
super.onCreate(savedInstanceState);
36+
setContentView(R.layout.activity_main_tab);
37+
38+
mToolBar = (Toolbar) findViewById(R.id.toolBar);
39+
mTabLayout = (TabLayout) findViewById(android.R.id.tabs);
40+
mViewPager = (ViewPager) findViewById(R.id.viewPager);
41+
setSupportActionBar(mToolBar);
42+
mAdapter = new TabFragmentPagerAdapter(getSupportFragmentManager());
43+
mViewPager.setAdapter(mAdapter);
44+
45+
mTabLayout.setupWithViewPager(mViewPager);
46+
}
47+
48+
49+
private static class TabFragmentPagerAdapter extends FragmentPagerAdapter {
50+
51+
52+
public TabFragmentPagerAdapter(FragmentManager fm) {
53+
super(fm);
54+
}
55+
56+
@Override
57+
public android.support.v4.app.Fragment getItem(int position) {
58+
switch (position) {
59+
case 0: {
60+
return FragmentOne.newInstance(0);
61+
}
62+
case 1: {
63+
return FragmentTwo.newInstance(1);
64+
}
65+
case 2: {
66+
return FragmentThree.newInstance(2);
67+
}
68+
case 3: {
69+
return FragmentFour.newInstance(3);
70+
}
71+
72+
default: {
73+
return FragmentOne.newInstance(0);
74+
}
75+
}
76+
}
77+
78+
@Override
79+
public int getCount() {
80+
return 4;
81+
}
82+
83+
84+
@Override
85+
public CharSequence getPageTitle(int position) {
86+
switch (position) {
87+
case 0: {
88+
return "0";
89+
}
90+
case 1: {
91+
return "1";
92+
}
93+
case 2: {
94+
return "2";
95+
}
96+
case 3: {
97+
return "3";
98+
}
99+
100+
default: {
101+
return "0";
102+
}
103+
}
104+
}
105+
}
106+
}

‎app/src/main/java/com/malin/rengwuxianrxjava/application/RxJavaApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class RxJavaApplication extends Application {
4848
@Override
4949
public void onCreate() {
5050
super.onCreate();
51-
LeakCanary.install(this);
51+
//LeakCanary.install(this);
5252

5353
//init ImageLoder
5454
initImageLoader(getApplicationContext());

‎app/src/main/java/com/malin/rengwuxianrxjava/fragment/FragmentFour.java

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package com.malin.rengwuxianrxjava.fragment;
2+
3+
import android.support.v4.app.Fragment;
4+
import android.os.Bundle;
5+
import android.support.annotation.Nullable;
6+
import android.view.LayoutInflater;
7+
import android.view.View;
8+
import android.view.ViewGroup;
9+
10+
import com.malin.rengwuxianrxjava.R;
11+
12+
/**
13+
* 类描述:
14+
* 创建人:lin.ma@renren-inc.com
15+
* 创建时间:2016 16-4-8 18:34
16+
* 备注:{@link }
17+
* 修改人:
18+
* 修改时间:
19+
* 修改备注:
20+
*/
21+
public class FragmentFour extends Fragment {
22+
23+
24+
private static final String ARGS_INSTANCE = FragmentFour.class.getSimpleName();
25+
int mInt;
26+
27+
public static FragmentFour newInstance(int instance) {
28+
Bundle args = new Bundle();
29+
args.putInt(ARGS_INSTANCE, instance);
30+
FragmentFour fragment = new FragmentFour();
31+
fragment.setArguments(args);
32+
return fragment;
33+
}
34+
35+
36+
@Nullable
37+
@Override
38+
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
39+
View view = inflater.inflate(R.layout.fragment_four_layout, container, false);
40+
return view;
41+
}
42+
43+
@Override
44+
public void onCreate(Bundle savedInstanceState) {
45+
super.onCreate(savedInstanceState);
46+
Bundle args = getArguments();
47+
if (args != null) {
48+
mInt = args.getInt(ARGS_INSTANCE);
49+
}
50+
}
51+
}

‎app/src/main/java/com/malin/rengwuxianrxjava/fragment/FragmentOne.java

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package com.malin.rengwuxianrxjava.fragment;
2+
3+
import android.support.v4.app.Fragment;
4+
import android.os.Bundle;
5+
import android.support.annotation.Nullable;
6+
import android.view.LayoutInflater;
7+
import android.view.View;
8+
import android.view.ViewGroup;
9+
10+
import com.malin.rengwuxianrxjava.R;
11+
12+
/**
13+
* 类描述:
14+
* 创建人:lin.ma@renren-inc.com
15+
* 创建时间:2016 16-4-8 18:34
16+
* 备注:{@link }
17+
* 修改人:
18+
* 修改时间:
19+
* 修改备注:
20+
*/
21+
public class FragmentOne extends Fragment {
22+
23+
24+
private static final String ARGS_INSTANCE = FragmentOne.class.getSimpleName();
25+
int mInt;
26+
27+
public static FragmentOne newInstance(int instance) {
28+
Bundle args = new Bundle();
29+
args.putInt(ARGS_INSTANCE, instance);
30+
FragmentOne fragment = new FragmentOne();
31+
fragment.setArguments(args);
32+
return fragment;
33+
}
34+
35+
36+
@Nullable
37+
@Override
38+
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
39+
View view = inflater.inflate(R.layout.fragment_one_layout, container, false);
40+
return view;
41+
}
42+
43+
@Override
44+
public void onCreate(Bundle savedInstanceState) {
45+
super.onCreate(savedInstanceState);
46+
Bundle args = getArguments();
47+
if (args != null) {
48+
mInt = args.getInt(ARGS_INSTANCE);
49+
}
50+
}
51+
}

‎app/src/main/java/com/malin/rengwuxianrxjava/fragment/FragmentThree.java

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package com.malin.rengwuxianrxjava.fragment;
2+
3+
import android.support.v4.app.Fragment;
4+
import android.os.Bundle;
5+
import android.support.annotation.Nullable;
6+
import android.view.LayoutInflater;
7+
import android.view.View;
8+
import android.view.ViewGroup;
9+
10+
import com.malin.rengwuxianrxjava.R;
11+
12+
/**
13+
* 类描述:
14+
* 创建人:lin.ma@renren-inc.com
15+
* 创建时间:2016 16-4-8 18:34
16+
* 备注:{@link }
17+
* 修改人:
18+
* 修改时间:
19+
* 修改备注:
20+
*/
21+
public class FragmentThree extends Fragment {
22+
23+
24+
private static final String ARGS_INSTANCE = FragmentThree.class.getSimpleName();
25+
int mInt;
26+
27+
public static FragmentThree newInstance(int instance) {
28+
Bundle args = new Bundle();
29+
args.putInt(ARGS_INSTANCE, instance);
30+
FragmentThree fragment = new FragmentThree();
31+
fragment.setArguments(args);
32+
return fragment;
33+
}
34+
35+
36+
@Nullable
37+
@Override
38+
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
39+
View view = inflater.inflate(R.layout.fragment_three_layout, container, false);
40+
return view;
41+
}
42+
43+
@Override
44+
public void onCreate(Bundle savedInstanceState) {
45+
super.onCreate(savedInstanceState);
46+
Bundle args = getArguments();
47+
if (args != null) {
48+
mInt = args.getInt(ARGS_INSTANCE);
49+
}
50+
}
51+
}

‎app/src/main/java/com/malin/rengwuxianrxjava/fragment/FragmentTwo.java

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package com.malin.rengwuxianrxjava.fragment;
2+
3+
import android.support.v4.app.Fragment;
4+
import android.os.Bundle;
5+
import android.support.annotation.Nullable;
6+
import android.view.LayoutInflater;
7+
import android.view.View;
8+
import android.view.ViewGroup;
9+
10+
import com.malin.rengwuxianrxjava.R;
11+
12+
/**
13+
* 类描述:
14+
* 创建人:lin.ma@renren-inc.com
15+
* 创建时间:2016 16-4-8 18:34
16+
* 备注:{@link }
17+
* 修改人:
18+
* 修改时间:
19+
* 修改备注:
20+
*/
21+
public class FragmentTwo extends Fragment {
22+
23+
24+
private static final String ARGS_INSTANCE = FragmentTwo.class.getSimpleName();
25+
int mInt;
26+
27+
public static FragmentTwo newInstance(int instance) {
28+
Bundle args = new Bundle();
29+
args.putInt(ARGS_INSTANCE, instance);
30+
FragmentTwo fragment = new FragmentTwo();
31+
fragment.setArguments(args);
32+
return fragment;
33+
}
34+
35+
36+
@Nullable
37+
@Override
38+
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
39+
View view = inflater.inflate(R.layout.fragment_two_layout, container, false);
40+
return view;
41+
}
42+
43+
@Override
44+
public void onCreate(Bundle savedInstanceState) {
45+
super.onCreate(savedInstanceState);
46+
Bundle args = getArguments();
47+
if (args != null) {
48+
mInt = args.getInt(ARGS_INSTANCE);
49+
}
50+
}
51+
}

‎app/src/main/res/layout/activity_main.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,8 @@
5757
android:layout_height="wrap_content" />
5858

5959

60+
61+
62+
63+
6064
</RelativeLayout>

0 commit comments

Comments
 (0)