xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wds
2021-05-26 18:47:39 +08:00
parent 26d444cbf8 9bbe6ead62
commit 80893ca08f
33 changed files with 249 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/com/example/myapplication/activity/HomeActivity.java
View File

@@ -1,34 +1,33 @@
package com.example.myapplication.activity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.TableLayout;
import android.widget.TextView;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentPagerAdapter;
import android.os.Bundle;
import com.example.myapplication.base.BaseActivity;
import com.example.myapplication.R;
import com.example.myapplication.fragment.FindFragment;
import com.example.myapplication.fragment.MineFragment;
import com.example.myapplication.fragment.RecordFragment;
import com.example.myapplication.fragment.TreasureFragment;
import com.example.myapplication.util.NoSlideViewPager;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentPagerAdapter;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.example.myapplication.R;
import com.google.android.material.tabs.TabLayout;
import com.gyf.immersionbar.ImmersionBar;
import java.util.ArrayList;
/**
* 创建首页布局展示
*/
public class HomeActivity extends BaseActivity {
public class HomeActivity extends BaseActivity{
private NoSlideViewPager mViewPager;
private TabLayout mTab;
private final String[] name = {"寻宝", "记录", "发现", "我的"};
@@ -102,9 +101,4 @@ public class HomeActivity extends BaseActivity {
img_title.setImageResource(image);
return view;
}
@Override
protected void initData() {
super.initData();
}
}

2
app/src/main/java/com/example/myapplication/activity/LoginActivity.java
View File

@@ -9,7 +9,7 @@ import com.example.myapplication.base.BaseActivity;
public class LoginActivity extends BaseActivity {
@Override
protected int getLayout() {
return R.layout.login_activity;
return R.layout.activity_login;
}
@Override

20
app/src/main/java/com/example/myapplication/activity/MainActivity.java
View File

@@ -4,17 +4,10 @@ package com.example.myapplication.activity;
import androidx.core.app.ActivityCompat;
import android.Manifest;
import android.content.Intent;
import android.os.CountDownTimer;
import com.example.myapplication.R;
import com.example.myapplication.base.BaseActivity;
/**
* 启动页
*/
public class MainActivity extends BaseActivity {
@Override
@@ -25,19 +18,6 @@ public class MainActivity extends BaseActivity {
@Override
protected void initData() {
super.initData();
new CountDownTimer(3000, 1000) {
@Override
public void onTick(long l) {
}
@Override
public void onFinish() {
Intent intent = new Intent(MainActivity.this, HomeActivity.class);
startActivity(intent);
finish();
}
}.start();
}
private void initPermission() {
String[] pers = {

5
app/src/main/java/com/example/myapplication/base/BaseActivity.java
View File

@@ -44,10 +44,10 @@ public abstract class BaseActivity extends AppCompatActivity {
alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable());
alertDialog.setCancelable(false);
alertDialog.setOnKeyListener((dialog, keyCode, event) -> {
if (keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK)
if (keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK)
return true;
return false;
});
});
//loading样式
//View view = LayoutInflater.from(this).inflate(R.layout.loading_alert, null);
//alertDialog.setView(view);
@@ -96,4 +96,5 @@ public abstract class BaseActivity extends AppCompatActivity {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
}
}
}

4
app/src/main/java/com/example/myapplication/base/BaseFragment.java
View File

@@ -40,10 +40,11 @@ public abstract class BaseFragment extends Fragment {
alertDialog = new AlertDialog.Builder(getActivity()).create();
alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable());
alertDialog.setCancelable(false);
alertDialog.setOnKeyListener((dialog, keyCode, event) -> {
alertDialog.setOnKeyListener((dialog, keyCode, event) -> {
if (keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK)
return true;
return false;
});
//loading样式
//View view = LayoutInflater.from(this).inflate(R.layout.loading, null);
@@ -74,5 +75,6 @@ public abstract class BaseFragment extends Fragment {
@Override
public void onDestroyView() {
super.onDestroyView();
}
}

5
app/src/main/java/com/example/myapplication/fragment/FindFragment.java
View File

@@ -4,11 +4,16 @@ import android.content.Intent;
import android.view.View;
import android.widget.LinearLayout;
import com.example.myapplication.R;
import com.example.myapplication.activity.ManagementFragment;
import com.example.myapplication.base.BaseFragment;
import com.gyf.immersionbar.ImmersionBar;
import presenter.CapacityEvaluationPresenter;
/**
* 发现的Fragment
* 2021-5-25