diff --git a/app/build.gradle b/app/build.gradle index be255d3..7fbb3ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,6 +64,7 @@ dependencies { //EventBus implementation 'org.greenrobot:eventbus:3.1.1' + /* //加载html implementation 'com.github.sendtion:XRichText:1.9.4'*/ //加载图片的依赖包 diff --git a/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/navinfo/outdoor/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/navinfo/outdoor/ExampleInstrumentedTest.java index 982ba51..fc97111 100644 --- a/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/navinfo/outdoor/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.example.myapplication; +package com.navinfo.outdoor; import android.content.Context; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 39cee8e..1c62a75 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.navinfo.outdoor"> @@ -11,7 +11,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:name=".api.UserApplication" + android:name="com.navinfo.outdoor.api.UserApplication" android:networkSecurityConfig="@xml/network_security_config" android:theme="@style/AppTheme.NoActionBar"> - + - - - - - + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/api/ApiService.java b/app/src/main/java/com/example/myapplication/api/ApiService.java deleted file mode 100644 index 980a3c6..0000000 --- a/app/src/main/java/com/example/myapplication/api/ApiService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.myapplication.api; - -public interface ApiService { -} diff --git a/app/src/main/java/com/example/myapplication/activity/FragmentManagement.java b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java similarity index 92% rename from app/src/main/java/com/example/myapplication/activity/FragmentManagement.java rename to app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java index fb56734..eca5cca 100644 --- a/app/src/main/java/com/example/myapplication/activity/FragmentManagement.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java @@ -1,36 +1,34 @@ -package com.example.myapplication.activity; +package com.navinfo.outdoor.activity; import android.content.Intent; -import android.os.Bundle; -import android.view.KeyEvent; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseActivity; -import com.example.myapplication.fragment.AboutFragment; -import com.example.myapplication.fragment.CapacityEvaluationFragment; -import com.example.myapplication.fragment.CapacityEvaluationFragment2; -import com.example.myapplication.fragment.CapacityMeasurementFragment; -import com.example.myapplication.fragment.ContactFragment; -import com.example.myapplication.fragment.EventPrefectureFragment; -import com.example.myapplication.fragment.FindFragment; -import com.example.myapplication.fragment.ForgetPawFragment; -import com.example.myapplication.fragment.GatheringFragment; -import com.example.myapplication.fragment.GradeFragment; -import com.example.myapplication.fragment.IssueFragment; -import com.example.myapplication.fragment.MapDownloadFragment; -import com.example.myapplication.fragment.MineFragment; -import com.example.myapplication.fragment.PrivilegeFragment; -import com.example.myapplication.fragment.RecordFragment; -import com.example.myapplication.fragment.SetFragment; -import com.example.myapplication.fragment.TaskExWebFragment; -import com.example.myapplication.fragment.TaskExplainFragment; -import com.example.myapplication.fragment.TaskExplainFragment2; -import com.example.myapplication.fragment.TaskPrefectureFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseActivity; +import com.navinfo.outdoor.fragment.AboutFragment; +import com.navinfo.outdoor.fragment.CapacityEvaluationFragment; +import com.navinfo.outdoor.fragment.CapacityEvaluationFragment2; +import com.navinfo.outdoor.fragment.CapacityMeasurementFragment; +import com.navinfo.outdoor.fragment.ContactFragment; +import com.navinfo.outdoor.fragment.EventPrefectureFragment; +import com.navinfo.outdoor.fragment.FindFragment; +import com.navinfo.outdoor.fragment.ForgetPawFragment; +import com.navinfo.outdoor.fragment.GatheringFragment; +import com.navinfo.outdoor.fragment.GradeFragment; +import com.navinfo.outdoor.fragment.IssueFragment; +import com.navinfo.outdoor.fragment.MapDownloadFragment; +import com.navinfo.outdoor.fragment.MineFragment; +import com.navinfo.outdoor.fragment.PrivilegeFragment; +import com.navinfo.outdoor.fragment.RecordFragment; +import com.navinfo.outdoor.fragment.SetFragment; +import com.navinfo.outdoor.fragment.TaskExWebFragment; +import com.navinfo.outdoor.fragment.TaskExplainFragment; +import com.navinfo.outdoor.fragment.TaskExplainFragment2; +import com.navinfo.outdoor.fragment.TaskPrefectureFragment; -import com.example.myapplication.fragment.RegisterFragment; -import com.example.myapplication.fragment.TreasureFragment; -import com.example.myapplication.fragment.UserDataFragment; -import com.example.myapplication.fragment.WithdrawFragment; +import com.navinfo.outdoor.fragment.RegisterFragment; +import com.navinfo.outdoor.fragment.TreasureFragment; +import com.navinfo.outdoor.fragment.UserDataFragment; +import com.navinfo.outdoor.fragment.WithdrawFragment; import com.gyf.immersionbar.ImmersionBar; diff --git a/app/src/main/java/com/example/myapplication/activity/HomeActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java similarity index 83% rename from app/src/main/java/com/example/myapplication/activity/HomeActivity.java rename to app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java index c51fce6..6d936a1 100644 --- a/app/src/main/java/com/example/myapplication/activity/HomeActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java @@ -1,23 +1,19 @@ -package com.example.myapplication.activity; +package com.navinfo.outdoor.activity; + +import com.navinfo.outdoor.base.BaseActivity; +import com.navinfo.outdoor.fragment.FindFragment; +import com.navinfo.outdoor.fragment.MineFragment; +import com.navinfo.outdoor.fragment.RecordFragment; +import com.navinfo.outdoor.fragment.TreasureFragment; +import com.navinfo.outdoor.util.NoSlideViewPager; -import android.os.Bundle; -import com.example.myapplication.base.BaseActivity; -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.navinfo.outdoor.R; import com.google.android.material.tabs.TabLayout; import com.gyf.immersionbar.ImmersionBar; import java.util.ArrayList; diff --git a/app/src/main/java/com/example/myapplication/activity/ImageShowActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/ImageShowActivity.java similarity index 81% rename from app/src/main/java/com/example/myapplication/activity/ImageShowActivity.java rename to app/src/main/java/com/navinfo/outdoor/activity/ImageShowActivity.java index 250ab93..0e6917b 100644 --- a/app/src/main/java/com/example/myapplication/activity/ImageShowActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/ImageShowActivity.java @@ -1,6 +1,5 @@ -package com.example.myapplication.activity; +package com.navinfo.outdoor.activity; -import android.graphics.Bitmap; import android.util.Log; import android.view.View; import android.widget.ImageView; @@ -8,12 +7,9 @@ import android.widget.TextView; import androidx.viewpager.widget.ViewPager; -import com.bumptech.glide.Glide; -import com.example.myapplication.R; -import com.example.myapplication.adapter.ImagePagerAdapter; -import com.example.myapplication.api.UserApplication; -import com.example.myapplication.base.BaseActivity; -import com.kongzue.dialog.v3.MessageDialog; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.adapter.ImagePagerAdapter; +import com.navinfo.outdoor.base.BaseActivity; import java.util.ArrayList; diff --git a/app/src/main/java/com/example/myapplication/activity/LoginActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java similarity index 93% rename from app/src/main/java/com/example/myapplication/activity/LoginActivity.java rename to app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java index 95bd35e..c3e2807 100644 --- a/app/src/main/java/com/example/myapplication/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -1,12 +1,12 @@ -package com.example.myapplication.activity; +package com.navinfo.outdoor.activity; import android.content.Intent; import android.view.View; import android.widget.EditText; import android.widget.TextView; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseActivity; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseActivity; /** * 登录页 diff --git a/app/src/main/java/com/example/myapplication/activity/MainActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java similarity index 92% rename from app/src/main/java/com/example/myapplication/activity/MainActivity.java rename to app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java index d003210..c7540b2 100644 --- a/app/src/main/java/com/example/myapplication/activity/MainActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java @@ -1,4 +1,4 @@ -package com.example.myapplication.activity; +package com.navinfo.outdoor.activity; import androidx.core.app.ActivityCompat; @@ -7,8 +7,8 @@ import android.Manifest; import android.content.Intent; import android.os.CountDownTimer; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseActivity; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseActivity; import com.kongzue.dialog.util.DialogSettings; /** diff --git a/app/src/main/java/com/example/myapplication/activity/WebActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java similarity index 97% rename from app/src/main/java/com/example/myapplication/activity/WebActivity.java rename to app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java index 1b018af..0bb1d06 100644 --- a/app/src/main/java/com/example/myapplication/activity/WebActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java @@ -1,4 +1,4 @@ -package com.example.myapplication.activity; +package com.navinfo.outdoor.activity; import android.content.Context; import android.content.Intent; @@ -11,9 +11,9 @@ import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.ImageView; -import com.example.myapplication.R; -import com.example.myapplication.api.UserApplication; -import com.example.myapplication.base.BaseActivity; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.api.UserApplication; +import com.navinfo.outdoor.base.BaseActivity; import com.gyf.immersionbar.ImmersionBar; import java.util.ArrayList; diff --git a/app/src/main/java/com/example/myapplication/adapter/CapacityEvaluationAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityEvaluationAdapter.java similarity index 95% rename from app/src/main/java/com/example/myapplication/adapter/CapacityEvaluationAdapter.java rename to app/src/main/java/com/navinfo/outdoor/adapter/CapacityEvaluationAdapter.java index 4e7c012..dd9cd9f 100644 --- a/app/src/main/java/com/example/myapplication/adapter/CapacityEvaluationAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityEvaluationAdapter.java @@ -1,4 +1,4 @@ -package com.example.myapplication.adapter; +package com.navinfo.outdoor.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -13,8 +13,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestOptions; -import com.example.myapplication.R; -import com.example.myapplication.bean.CapacityMeasureBean; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.bean.CapacityMeasureBean; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/adapter/CapacityItemAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityItemAdapter.java similarity index 95% rename from app/src/main/java/com/example/myapplication/adapter/CapacityItemAdapter.java rename to app/src/main/java/com/navinfo/outdoor/adapter/CapacityItemAdapter.java index e1d626d..4736416 100644 --- a/app/src/main/java/com/example/myapplication/adapter/CapacityItemAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityItemAdapter.java @@ -1,4 +1,4 @@ -package com.example.myapplication.adapter; +package com.navinfo.outdoor.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -13,8 +13,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestOptions; -import com.example.myapplication.R; -import com.example.myapplication.bean.CapacityMeasureBean; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.bean.CapacityMeasureBean; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/adapter/CapacityMeasureAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityMeasureAdapter.java similarity index 98% rename from app/src/main/java/com/example/myapplication/adapter/CapacityMeasureAdapter.java rename to app/src/main/java/com/navinfo/outdoor/adapter/CapacityMeasureAdapter.java index 4b6cf4b..51ac0c7 100644 --- a/app/src/main/java/com/example/myapplication/adapter/CapacityMeasureAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityMeasureAdapter.java @@ -1,4 +1,4 @@ -package com.example.myapplication.adapter; +package com.navinfo.outdoor.adapter; import android.content.Context; import android.util.Log; @@ -12,14 +12,13 @@ import android.widget.LinearLayout; import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; -import android.widget.Toast; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.example.myapplication.R; -import com.example.myapplication.bean.BolBean; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.bean.BolBean; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/app/src/main/java/com/example/myapplication/adapter/EventPrefectureAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/EventPrefectureAdapter.java similarity index 92% rename from app/src/main/java/com/example/myapplication/adapter/EventPrefectureAdapter.java rename to app/src/main/java/com/navinfo/outdoor/adapter/EventPrefectureAdapter.java index 051e1fb..cb56062 100644 --- a/app/src/main/java/com/example/myapplication/adapter/EventPrefectureAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/EventPrefectureAdapter.java @@ -1,4 +1,4 @@ -package com.example.myapplication.adapter; +package com.navinfo.outdoor.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -9,9 +9,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.example.myapplication.R; -import com.example.myapplication.bean.EventPrefectureBean; -import com.example.myapplication.bean.TaskExplainBean; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.bean.EventPrefectureBean; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/adapter/ImagePagerAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/ImagePagerAdapter.java similarity index 92% rename from app/src/main/java/com/example/myapplication/adapter/ImagePagerAdapter.java rename to app/src/main/java/com/navinfo/outdoor/adapter/ImagePagerAdapter.java index 06fe1f9..27c0fa8 100644 --- a/app/src/main/java/com/example/myapplication/adapter/ImagePagerAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/ImagePagerAdapter.java @@ -1,18 +1,16 @@ -package com.example.myapplication.adapter; +package com.navinfo.outdoor.adapter; import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import android.widget.ProgressBar; -import android.widget.TextView; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; import com.bumptech.glide.Glide; -import com.example.myapplication.R; +import com.navinfo.outdoor.R; import java.util.ArrayList; diff --git a/app/src/main/java/com/example/myapplication/adapter/TaskExplainAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter.java similarity index 94% rename from app/src/main/java/com/example/myapplication/adapter/TaskExplainAdapter.java rename to app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter.java index 23a9ac2..4ec4b74 100644 --- a/app/src/main/java/com/example/myapplication/adapter/TaskExplainAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter.java @@ -1,4 +1,4 @@ -package com.example.myapplication.adapter; +package com.navinfo.outdoor.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -13,8 +13,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestOptions; -import com.example.myapplication.R; -import com.example.myapplication.bean.TaskExplainInfo; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.bean.TaskExplainInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/adapter/TaskExplainAdapter2.java b/app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter2.java similarity index 93% rename from app/src/main/java/com/example/myapplication/adapter/TaskExplainAdapter2.java rename to app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter2.java index b97c6e3..610581a 100644 --- a/app/src/main/java/com/example/myapplication/adapter/TaskExplainAdapter2.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter2.java @@ -1,4 +1,4 @@ -package com.example.myapplication.adapter; +package com.navinfo.outdoor.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -9,8 +9,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.example.myapplication.R; -import com.example.myapplication.bean.TaskExplainInfo; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.bean.TaskExplainInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/adapter/TaskPrefectureAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/TaskPrefectureAdapter.java similarity index 94% rename from app/src/main/java/com/example/myapplication/adapter/TaskPrefectureAdapter.java rename to app/src/main/java/com/navinfo/outdoor/adapter/TaskPrefectureAdapter.java index 686d534..3859968 100644 --- a/app/src/main/java/com/example/myapplication/adapter/TaskPrefectureAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/TaskPrefectureAdapter.java @@ -1,4 +1,4 @@ -package com.example.myapplication.adapter; +package com.navinfo.outdoor.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -9,8 +9,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.example.myapplication.R; -import com.example.myapplication.bean.TaskExplainBean; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.bean.TaskExplainBean; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/navinfo/outdoor/api/ApiService.java b/app/src/main/java/com/navinfo/outdoor/api/ApiService.java new file mode 100644 index 0000000..b9c34e6 --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/api/ApiService.java @@ -0,0 +1,4 @@ +package com.navinfo.outdoor.api; + +public interface ApiService { +} diff --git a/app/src/main/java/com/example/myapplication/api/UserApplication.java b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java similarity index 98% rename from app/src/main/java/com/example/myapplication/api/UserApplication.java rename to app/src/main/java/com/navinfo/outdoor/api/UserApplication.java index ae5af5e..a6513b3 100644 --- a/app/src/main/java/com/example/myapplication/api/UserApplication.java +++ b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java @@ -1,4 +1,4 @@ -package com.example.myapplication.api; +package com.navinfo.outdoor.api; import android.app.Application; diff --git a/app/src/main/java/com/example/myapplication/base/BaseActivity.java b/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java similarity index 97% rename from app/src/main/java/com/example/myapplication/base/BaseActivity.java rename to app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java index 40ac940..0306ee5 100644 --- a/app/src/main/java/com/example/myapplication/base/BaseActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java @@ -1,4 +1,4 @@ -package com.example.myapplication.base; +package com.navinfo.outdoor.base; import android.app.Activity; import android.app.Application; @@ -15,7 +15,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; -import com.example.myapplication.api.UserApplication; +import com.navinfo.outdoor.api.UserApplication; import com.gyf.immersionbar.ImmersionBar; diff --git a/app/src/main/java/com/example/myapplication/base/BaseCallBack.java b/app/src/main/java/com/navinfo/outdoor/base/BaseCallBack.java similarity index 70% rename from app/src/main/java/com/example/myapplication/base/BaseCallBack.java rename to app/src/main/java/com/navinfo/outdoor/base/BaseCallBack.java index d96939e..aa9978a 100644 --- a/app/src/main/java/com/example/myapplication/base/BaseCallBack.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseCallBack.java @@ -1,4 +1,4 @@ -package com.example.myapplication.base; +package com.navinfo.outdoor.base; public interface BaseCallBack { void onSuccess(T t); diff --git a/app/src/main/java/com/example/myapplication/base/BaseFragment.java b/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java similarity index 96% rename from app/src/main/java/com/example/myapplication/base/BaseFragment.java rename to app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java index 8caed70..a216d31 100644 --- a/app/src/main/java/com/example/myapplication/base/BaseFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java @@ -1,4 +1,4 @@ -package com.example.myapplication.base; +package com.navinfo.outdoor.base; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; @@ -14,8 +14,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; -import com.example.myapplication.R; - public abstract class BaseFragment extends Fragment { diff --git a/app/src/main/java/com/example/myapplication/base/BaseMVPActivity.java b/app/src/main/java/com/navinfo/outdoor/base/BaseMVPActivity.java similarity index 91% rename from app/src/main/java/com/example/myapplication/base/BaseMVPActivity.java rename to app/src/main/java/com/navinfo/outdoor/base/BaseMVPActivity.java index 2f6643b..f39ad1e 100644 --- a/app/src/main/java/com/example/myapplication/base/BaseMVPActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseMVPActivity.java @@ -1,4 +1,4 @@ -package com.example.myapplication.base; +package com.navinfo.outdoor.base; public abstract class BaseMVPActivity

extends BaseActivity{ protected P presenter; diff --git a/app/src/main/java/com/example/myapplication/base/BaseMVPFragment.java b/app/src/main/java/com/navinfo/outdoor/base/BaseMVPFragment.java similarity index 91% rename from app/src/main/java/com/example/myapplication/base/BaseMVPFragment.java rename to app/src/main/java/com/navinfo/outdoor/base/BaseMVPFragment.java index c9703cd..af112e7 100644 --- a/app/src/main/java/com/example/myapplication/base/BaseMVPFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseMVPFragment.java @@ -1,4 +1,4 @@ -package com.example.myapplication.base; +package com.navinfo.outdoor.base; public abstract class BaseMVPFragment

extends BaseFragment{ protected P presenter; diff --git a/app/src/main/java/com/example/myapplication/base/BaseModel.java b/app/src/main/java/com/navinfo/outdoor/base/BaseModel.java similarity index 87% rename from app/src/main/java/com/example/myapplication/base/BaseModel.java rename to app/src/main/java/com/navinfo/outdoor/base/BaseModel.java index e7ab463..fcf4ab1 100644 --- a/app/src/main/java/com/example/myapplication/base/BaseModel.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseModel.java @@ -1,4 +1,4 @@ -package com.example.myapplication.base; +package com.navinfo.outdoor.base; import io.reactivex.disposables.CompositeDisposable; diff --git a/app/src/main/java/com/example/myapplication/base/BaseObserver.java b/app/src/main/java/com/navinfo/outdoor/base/BaseObserver.java similarity index 94% rename from app/src/main/java/com/example/myapplication/base/BaseObserver.java rename to app/src/main/java/com/navinfo/outdoor/base/BaseObserver.java index a8f77c2..6e0c640 100644 --- a/app/src/main/java/com/example/myapplication/base/BaseObserver.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseObserver.java @@ -1,10 +1,10 @@ -package com.example.myapplication.base; +package com.navinfo.outdoor.base; import android.net.ParseException; import android.util.Log; import android.widget.Toast; -import com.example.myapplication.api.UserApplication; +import com.navinfo.outdoor.api.UserApplication; import com.google.gson.JsonParseException; import org.json.JSONException; diff --git a/app/src/main/java/com/example/myapplication/base/BasePresenter.java b/app/src/main/java/com/navinfo/outdoor/base/BasePresenter.java similarity index 94% rename from app/src/main/java/com/example/myapplication/base/BasePresenter.java rename to app/src/main/java/com/navinfo/outdoor/base/BasePresenter.java index d06e2b8..235c801 100644 --- a/app/src/main/java/com/example/myapplication/base/BasePresenter.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BasePresenter.java @@ -1,4 +1,4 @@ -package com.example.myapplication.base; +package com.navinfo.outdoor.base; import java.util.ArrayList; diff --git a/app/src/main/java/com/example/myapplication/base/BaseView.java b/app/src/main/java/com/navinfo/outdoor/base/BaseView.java similarity index 69% rename from app/src/main/java/com/example/myapplication/base/BaseView.java rename to app/src/main/java/com/navinfo/outdoor/base/BaseView.java index 0e62e31..9e34ea9 100644 --- a/app/src/main/java/com/example/myapplication/base/BaseView.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseView.java @@ -1,4 +1,4 @@ -package com.example.myapplication.base; +package com.navinfo.outdoor.base; public interface BaseView { void onSuccess(T t); diff --git a/app/src/main/java/com/example/myapplication/base/Collector.java b/app/src/main/java/com/navinfo/outdoor/base/Collector.java similarity index 93% rename from app/src/main/java/com/example/myapplication/base/Collector.java rename to app/src/main/java/com/navinfo/outdoor/base/Collector.java index 61d0798..526a47c 100644 --- a/app/src/main/java/com/example/myapplication/base/Collector.java +++ b/app/src/main/java/com/navinfo/outdoor/base/Collector.java @@ -1,4 +1,4 @@ -package com.example.myapplication.base; +package com.navinfo.outdoor.base; import android.app.Activity; diff --git a/app/src/main/java/com/example/myapplication/bean/BolBean.java b/app/src/main/java/com/navinfo/outdoor/bean/BolBean.java similarity index 95% rename from app/src/main/java/com/example/myapplication/bean/BolBean.java rename to app/src/main/java/com/navinfo/outdoor/bean/BolBean.java index 593b778..eee6356 100644 --- a/app/src/main/java/com/example/myapplication/bean/BolBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/BolBean.java @@ -1,4 +1,4 @@ -package com.example.myapplication.bean; +package com.navinfo.outdoor.bean; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/bean/CapacityMeasureBean.java b/app/src/main/java/com/navinfo/outdoor/bean/CapacityMeasureBean.java similarity index 98% rename from app/src/main/java/com/example/myapplication/bean/CapacityMeasureBean.java rename to app/src/main/java/com/navinfo/outdoor/bean/CapacityMeasureBean.java index e9b780b..1eb23ea 100644 --- a/app/src/main/java/com/example/myapplication/bean/CapacityMeasureBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/CapacityMeasureBean.java @@ -1,4 +1,4 @@ -package com.example.myapplication.bean; +package com.navinfo.outdoor.bean; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/bean/EventPrefectureBean.java b/app/src/main/java/com/navinfo/outdoor/bean/EventPrefectureBean.java similarity index 99% rename from app/src/main/java/com/example/myapplication/bean/EventPrefectureBean.java rename to app/src/main/java/com/navinfo/outdoor/bean/EventPrefectureBean.java index da7b7d2..e522634 100644 --- a/app/src/main/java/com/example/myapplication/bean/EventPrefectureBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/EventPrefectureBean.java @@ -1,4 +1,4 @@ -package com.example.myapplication.bean; +package com.navinfo.outdoor.bean; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/bean/ExamBean.java b/app/src/main/java/com/navinfo/outdoor/bean/ExamBean.java similarity index 91% rename from app/src/main/java/com/example/myapplication/bean/ExamBean.java rename to app/src/main/java/com/navinfo/outdoor/bean/ExamBean.java index d2ff9d2..e2ab06f 100644 --- a/app/src/main/java/com/example/myapplication/bean/ExamBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/ExamBean.java @@ -1,4 +1,4 @@ -package com.example.myapplication.bean; +package com.navinfo.outdoor.bean; public class ExamBean { private String id; diff --git a/app/src/main/java/com/example/myapplication/bean/ExamSubmitBean.java b/app/src/main/java/com/navinfo/outdoor/bean/ExamSubmitBean.java similarity index 96% rename from app/src/main/java/com/example/myapplication/bean/ExamSubmitBean.java rename to app/src/main/java/com/navinfo/outdoor/bean/ExamSubmitBean.java index df2131b..71eeeaa 100644 --- a/app/src/main/java/com/example/myapplication/bean/ExamSubmitBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/ExamSubmitBean.java @@ -1,4 +1,4 @@ -package com.example.myapplication.bean; +package com.navinfo.outdoor.bean; public class ExamSubmitBean { /** diff --git a/app/src/main/java/com/example/myapplication/bean/ListBean.java b/app/src/main/java/com/navinfo/outdoor/bean/ListBean.java similarity index 93% rename from app/src/main/java/com/example/myapplication/bean/ListBean.java rename to app/src/main/java/com/navinfo/outdoor/bean/ListBean.java index cfdf7e7..89fdc3f 100644 --- a/app/src/main/java/com/example/myapplication/bean/ListBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/ListBean.java @@ -1,4 +1,4 @@ -package com.example.myapplication.bean; +package com.navinfo.outdoor.bean; public class ListBean { diff --git a/app/src/main/java/com/example/myapplication/bean/MeasureBean.java b/app/src/main/java/com/navinfo/outdoor/bean/MeasureBean.java similarity index 99% rename from app/src/main/java/com/example/myapplication/bean/MeasureBean.java rename to app/src/main/java/com/navinfo/outdoor/bean/MeasureBean.java index 0f40c5f..42eba63 100644 --- a/app/src/main/java/com/example/myapplication/bean/MeasureBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/MeasureBean.java @@ -1,4 +1,4 @@ -package com.example.myapplication.bean; +package com.navinfo.outdoor.bean; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/bean/TaskExplainBean.java b/app/src/main/java/com/navinfo/outdoor/bean/TaskExplainBean.java similarity index 98% rename from app/src/main/java/com/example/myapplication/bean/TaskExplainBean.java rename to app/src/main/java/com/navinfo/outdoor/bean/TaskExplainBean.java index d485de0..1ecc8a3 100644 --- a/app/src/main/java/com/example/myapplication/bean/TaskExplainBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/TaskExplainBean.java @@ -1,4 +1,4 @@ -package com.example.myapplication.bean; +package com.navinfo.outdoor.bean; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/bean/TaskExplainInfo.java b/app/src/main/java/com/navinfo/outdoor/bean/TaskExplainInfo.java similarity index 98% rename from app/src/main/java/com/example/myapplication/bean/TaskExplainInfo.java rename to app/src/main/java/com/navinfo/outdoor/bean/TaskExplainInfo.java index 2c06f27..e965a85 100644 --- a/app/src/main/java/com/example/myapplication/bean/TaskExplainInfo.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/TaskExplainInfo.java @@ -1,4 +1,4 @@ -package com.example.myapplication.bean; +package com.navinfo.outdoor.bean; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/bean/TaskSpecificationBean.java b/app/src/main/java/com/navinfo/outdoor/bean/TaskSpecificationBean.java similarity index 99% rename from app/src/main/java/com/example/myapplication/bean/TaskSpecificationBean.java rename to app/src/main/java/com/navinfo/outdoor/bean/TaskSpecificationBean.java index f9b70cf..50873bd 100644 --- a/app/src/main/java/com/example/myapplication/bean/TaskSpecificationBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/TaskSpecificationBean.java @@ -1,4 +1,4 @@ -package com.example.myapplication.bean; +package com.navinfo.outdoor.bean; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/fragment/AboutFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java similarity index 72% rename from app/src/main/java/com/example/myapplication/fragment/AboutFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java index 572aadf..3e74e04 100644 --- a/app/src/main/java/com/example/myapplication/fragment/AboutFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java @@ -1,7 +1,7 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 关于页面的fragment diff --git a/app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java similarity index 87% rename from app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java index 1fb3a1c..0ccb8ee 100644 --- a/app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java @@ -1,4 +1,4 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; import android.content.Intent; import android.util.Log; @@ -9,16 +9,15 @@ import android.widget.Toast; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; -import com.example.myapplication.R; -import com.example.myapplication.activity.FragmentManagement; -import com.example.myapplication.adapter.CapacityEvaluationAdapter; -import com.example.myapplication.adapter.CapacityEvaluationAdapter; -import com.example.myapplication.base.BaseFragment; -import com.example.myapplication.bean.CapacityMeasureBean; -import com.example.myapplication.bean.TaskExplainInfo; -import com.example.myapplication.http.Callback; -import com.example.myapplication.http.HttpInterface; -import com.example.myapplication.http.OkGoBuilder; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; +import com.navinfo.outdoor.adapter.CapacityEvaluationAdapter; +import com.navinfo.outdoor.base.BaseFragment; +import com.navinfo.outdoor.bean.CapacityMeasureBean; +import com.navinfo.outdoor.bean.TaskExplainInfo; +import com.navinfo.outdoor.http.Callback; +import com.navinfo.outdoor.http.HttpInterface; +import com.navinfo.outdoor.http.OkGoBuilder; import com.jcodecraeer.xrecyclerview.ProgressStyle; import com.jcodecraeer.xrecyclerview.XRecyclerView; diff --git a/app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment2.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java similarity index 86% rename from app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment2.java rename to app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java index f0f0e15..69cca07 100644 --- a/app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment2.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java @@ -1,6 +1,5 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import android.content.Intent; import android.util.Log; import android.view.View; import android.widget.ImageView; @@ -9,15 +8,14 @@ import android.widget.Toast; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; -import com.example.myapplication.R; -import com.example.myapplication.adapter.CapacityItemAdapter; -import com.example.myapplication.activity.FragmentManagement; -import com.example.myapplication.base.BaseFragment; -import com.example.myapplication.bean.CapacityMeasureBean; -import com.example.myapplication.bean.TaskExplainInfo; -import com.example.myapplication.http.Callback; -import com.example.myapplication.http.HttpInterface; -import com.example.myapplication.http.OkGoBuilder; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.adapter.CapacityItemAdapter; +import com.navinfo.outdoor.base.BaseFragment; +import com.navinfo.outdoor.bean.CapacityMeasureBean; +import com.navinfo.outdoor.bean.TaskExplainInfo; +import com.navinfo.outdoor.http.Callback; +import com.navinfo.outdoor.http.HttpInterface; +import com.navinfo.outdoor.http.OkGoBuilder; import com.jcodecraeer.xrecyclerview.ProgressStyle; import com.jcodecraeer.xrecyclerview.XRecyclerView; diff --git a/app/src/main/java/com/example/myapplication/fragment/CapacityMeasurementFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java similarity index 92% rename from app/src/main/java/com/example/myapplication/fragment/CapacityMeasurementFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java index 9e7b069..76cb850 100644 --- a/app/src/main/java/com/example/myapplication/fragment/CapacityMeasurementFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java @@ -1,4 +1,4 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; import android.util.Log; import android.view.View; @@ -10,18 +10,16 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.example.myapplication.R; -import com.example.myapplication.adapter.CapacityItemAdapter; -import com.example.myapplication.adapter.CapacityMeasureAdapter; -import com.example.myapplication.base.BaseFragment; -import com.example.myapplication.bean.BolBean; -import com.example.myapplication.bean.CapacityMeasureBean; -import com.example.myapplication.bean.ExamBean; -import com.example.myapplication.bean.ExamSubmitBean; -import com.example.myapplication.bean.MeasureBean; -import com.example.myapplication.http.Callback; -import com.example.myapplication.http.HttpInterface; -import com.example.myapplication.http.OkGoBuilder; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.adapter.CapacityMeasureAdapter; +import com.navinfo.outdoor.base.BaseFragment; +import com.navinfo.outdoor.bean.BolBean; +import com.navinfo.outdoor.bean.ExamBean; +import com.navinfo.outdoor.bean.ExamSubmitBean; +import com.navinfo.outdoor.bean.MeasureBean; +import com.navinfo.outdoor.http.Callback; +import com.navinfo.outdoor.http.HttpInterface; +import com.navinfo.outdoor.http.OkGoBuilder; import com.kongzue.dialog.interfaces.OnDialogButtonClickListener; import com.kongzue.dialog.util.BaseDialog; import com.kongzue.dialog.v3.MessageDialog; diff --git a/app/src/main/java/com/example/myapplication/fragment/ContactFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java similarity index 72% rename from app/src/main/java/com/example/myapplication/fragment/ContactFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java index 641efd1..6208ca3 100644 --- a/app/src/main/java/com/example/myapplication/fragment/ContactFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java @@ -1,7 +1,7 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 联系我们的Fragment diff --git a/app/src/main/java/com/example/myapplication/fragment/EventPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java similarity index 87% rename from app/src/main/java/com/example/myapplication/fragment/EventPrefectureFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java index 4b3607b..d83528f 100644 --- a/app/src/main/java/com/example/myapplication/fragment/EventPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java @@ -1,32 +1,24 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; import android.content.Intent; import android.util.Log; import android.view.View; import android.widget.ImageView; -import android.widget.TextView; import android.widget.Toast; -import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; -import com.example.myapplication.R; -import com.example.myapplication.activity.WebActivity; -import com.example.myapplication.adapter.EventPrefectureAdapter; -import com.example.myapplication.api.UserApplication; -import com.example.myapplication.base.BaseFragment; -import com.example.myapplication.bean.EventPrefectureBean; -import com.example.myapplication.http.Callback; -import com.example.myapplication.http.HttpInterface; -import com.example.myapplication.http.OkGoBuilder; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.WebActivity; +import com.navinfo.outdoor.adapter.EventPrefectureAdapter; +import com.navinfo.outdoor.base.BaseFragment; +import com.navinfo.outdoor.bean.EventPrefectureBean; +import com.navinfo.outdoor.http.Callback; +import com.navinfo.outdoor.http.HttpInterface; +import com.navinfo.outdoor.http.OkGoBuilder; import com.jcodecraeer.xrecyclerview.ProgressStyle; import com.jcodecraeer.xrecyclerview.XRecyclerView; -import com.kongzue.dialog.interfaces.OnBackClickListener; -import com.kongzue.dialog.interfaces.OnDialogButtonClickListener; -import com.kongzue.dialog.util.BaseDialog; -import com.kongzue.dialog.util.DialogSettings; -import com.kongzue.dialog.v3.MessageDialog; import org.json.JSONObject; diff --git a/app/src/main/java/com/example/myapplication/fragment/FindFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java similarity index 92% rename from app/src/main/java/com/example/myapplication/fragment/FindFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java index c4f5c02..02ec4af 100644 --- a/app/src/main/java/com/example/myapplication/fragment/FindFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java @@ -1,13 +1,13 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; import android.content.Intent; import android.view.View; import android.widget.LinearLayout; -import com.example.myapplication.R; -import com.example.myapplication.activity.FragmentManagement; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; +import com.navinfo.outdoor.base.BaseFragment; /** diff --git a/app/src/main/java/com/example/myapplication/fragment/ForgetPawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java similarity index 93% rename from app/src/main/java/com/example/myapplication/fragment/ForgetPawFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java index fca57b7..cc3c5d5 100644 --- a/app/src/main/java/com/example/myapplication/fragment/ForgetPawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java @@ -1,4 +1,4 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; import android.view.View; import android.widget.EditText; @@ -6,8 +6,8 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 忘记密码页面 diff --git a/app/src/main/java/com/example/myapplication/fragment/GatheringFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java similarity index 71% rename from app/src/main/java/com/example/myapplication/fragment/GatheringFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java index a5f0687..1f64d8f 100644 --- a/app/src/main/java/com/example/myapplication/fragment/GatheringFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java @@ -1,7 +1,7 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 收款信息 diff --git a/app/src/main/java/com/example/myapplication/fragment/GradeFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java similarity index 72% rename from app/src/main/java/com/example/myapplication/fragment/GradeFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java index fd9827a..104077d 100644 --- a/app/src/main/java/com/example/myapplication/fragment/GradeFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java @@ -1,7 +1,7 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 我的等级页面的fragment diff --git a/app/src/main/java/com/example/myapplication/fragment/IssueFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java similarity index 72% rename from app/src/main/java/com/example/myapplication/fragment/IssueFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java index 2f773b3..af310dc 100644 --- a/app/src/main/java/com/example/myapplication/fragment/IssueFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java @@ -1,7 +1,7 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 常见问题页面的fragment diff --git a/app/src/main/java/com/example/myapplication/fragment/MapDownloadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java similarity index 72% rename from app/src/main/java/com/example/myapplication/fragment/MapDownloadFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java index dab78a6..62df613 100644 --- a/app/src/main/java/com/example/myapplication/fragment/MapDownloadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java @@ -1,7 +1,7 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 地图下载的Fragment diff --git a/app/src/main/java/com/example/myapplication/fragment/MineFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java similarity index 93% rename from app/src/main/java/com/example/myapplication/fragment/MineFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java index 4ae0186..5cc424b 100644 --- a/app/src/main/java/com/example/myapplication/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -1,4 +1,4 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; import android.content.Intent; import android.view.View; @@ -6,13 +6,10 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; -import com.example.myapplication.R; -import com.example.myapplication.activity.FragmentManagement; -import com.example.myapplication.activity.LoginActivity; -import com.example.myapplication.base.BaseFragment; -import com.gyf.immersionbar.ImmersionBar; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; +import com.navinfo.outdoor.base.BaseFragment; /** * 我的Fragment diff --git a/app/src/main/java/com/example/myapplication/fragment/PrivilegeFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java similarity index 72% rename from app/src/main/java/com/example/myapplication/fragment/PrivilegeFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java index 81fb27a..a78dc9e 100644 --- a/app/src/main/java/com/example/myapplication/fragment/PrivilegeFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java @@ -1,7 +1,7 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 我的等级页面的fragment diff --git a/app/src/main/java/com/example/myapplication/fragment/RecordFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java similarity index 80% rename from app/src/main/java/com/example/myapplication/fragment/RecordFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java index ea37ed3..21f826a 100644 --- a/app/src/main/java/com/example/myapplication/fragment/RecordFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java @@ -1,7 +1,7 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 记录的Fragment diff --git a/app/src/main/java/com/example/myapplication/fragment/RegisterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java similarity index 92% rename from app/src/main/java/com/example/myapplication/fragment/RegisterFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java index a29b73e..4895d3f 100644 --- a/app/src/main/java/com/example/myapplication/fragment/RegisterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java @@ -1,12 +1,12 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; import android.view.View; import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 注册页面 diff --git a/app/src/main/java/com/example/myapplication/fragment/SetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java similarity index 71% rename from app/src/main/java/com/example/myapplication/fragment/SetFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java index ec475c8..310e209 100644 --- a/app/src/main/java/com/example/myapplication/fragment/SetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java @@ -1,7 +1,7 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 设置页面的fragment diff --git a/app/src/main/java/com/example/myapplication/fragment/TaskExWebFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExWebFragment.java similarity index 64% rename from app/src/main/java/com/example/myapplication/fragment/TaskExWebFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/TaskExWebFragment.java index 9b25885..0efe417 100644 --- a/app/src/main/java/com/example/myapplication/fragment/TaskExWebFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExWebFragment.java @@ -1,15 +1,9 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import android.os.Bundle; - -import androidx.fragment.app.Fragment; - -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 发现-任务说明的Item点击进入Web页面 diff --git a/app/src/main/java/com/example/myapplication/fragment/TaskExplainFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java similarity index 88% rename from app/src/main/java/com/example/myapplication/fragment/TaskExplainFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java index b2f67e3..d52ed1e 100644 --- a/app/src/main/java/com/example/myapplication/fragment/TaskExplainFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java @@ -1,22 +1,21 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; import android.content.Intent; import android.util.Log; import android.view.View; import android.widget.ImageView; -import android.widget.Toast; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; -import com.example.myapplication.R; -import com.example.myapplication.activity.FragmentManagement; -import com.example.myapplication.adapter.TaskExplainAdapter; -import com.example.myapplication.base.BaseFragment; -import com.example.myapplication.bean.TaskExplainInfo; -import com.example.myapplication.http.Callback; -import com.example.myapplication.http.HttpInterface; -import com.example.myapplication.http.OkGoBuilder; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; +import com.navinfo.outdoor.adapter.TaskExplainAdapter; +import com.navinfo.outdoor.base.BaseFragment; +import com.navinfo.outdoor.bean.TaskExplainInfo; +import com.navinfo.outdoor.http.Callback; +import com.navinfo.outdoor.http.HttpInterface; +import com.navinfo.outdoor.http.OkGoBuilder; import com.jcodecraeer.xrecyclerview.ProgressStyle; import com.jcodecraeer.xrecyclerview.XRecyclerView; diff --git a/app/src/main/java/com/example/myapplication/fragment/TaskExplainFragment2.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java similarity index 88% rename from app/src/main/java/com/example/myapplication/fragment/TaskExplainFragment2.java rename to app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java index 21bedc8..ddc9a52 100644 --- a/app/src/main/java/com/example/myapplication/fragment/TaskExplainFragment2.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java @@ -1,4 +1,4 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; import android.content.Intent; import android.util.Log; @@ -9,16 +9,15 @@ import android.widget.Toast; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; -import com.example.myapplication.R; +import com.navinfo.outdoor.R; -import com.example.myapplication.activity.FragmentManagement; -import com.example.myapplication.activity.WebActivity; -import com.example.myapplication.adapter.TaskExplainAdapter2; -import com.example.myapplication.base.BaseFragment; -import com.example.myapplication.bean.TaskExplainInfo; -import com.example.myapplication.http.Callback; -import com.example.myapplication.http.HttpInterface; -import com.example.myapplication.http.OkGoBuilder; +import com.navinfo.outdoor.activity.WebActivity; +import com.navinfo.outdoor.adapter.TaskExplainAdapter2; +import com.navinfo.outdoor.base.BaseFragment; +import com.navinfo.outdoor.bean.TaskExplainInfo; +import com.navinfo.outdoor.http.Callback; +import com.navinfo.outdoor.http.HttpInterface; +import com.navinfo.outdoor.http.OkGoBuilder; import com.jcodecraeer.xrecyclerview.ProgressStyle; import com.jcodecraeer.xrecyclerview.XRecyclerView; diff --git a/app/src/main/java/com/example/myapplication/fragment/TaskPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java similarity index 92% rename from app/src/main/java/com/example/myapplication/fragment/TaskPrefectureFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java index 1169857..6bfac95 100644 --- a/app/src/main/java/com/example/myapplication/fragment/TaskPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java @@ -1,4 +1,4 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; import android.content.Intent; import android.util.Log; @@ -9,14 +9,14 @@ import android.widget.Toast; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; -import com.example.myapplication.R; -import com.example.myapplication.activity.WebActivity; -import com.example.myapplication.adapter.TaskPrefectureAdapter; -import com.example.myapplication.base.BaseFragment; -import com.example.myapplication.bean.TaskExplainBean; -import com.example.myapplication.http.Callback; -import com.example.myapplication.http.HttpInterface; -import com.example.myapplication.http.OkGoBuilder; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.WebActivity; +import com.navinfo.outdoor.adapter.TaskPrefectureAdapter; +import com.navinfo.outdoor.base.BaseFragment; +import com.navinfo.outdoor.bean.TaskExplainBean; +import com.navinfo.outdoor.http.Callback; +import com.navinfo.outdoor.http.HttpInterface; +import com.navinfo.outdoor.http.OkGoBuilder; import com.jcodecraeer.xrecyclerview.ProgressStyle; import com.jcodecraeer.xrecyclerview.XRecyclerView; diff --git a/app/src/main/java/com/example/myapplication/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java similarity index 72% rename from app/src/main/java/com/example/myapplication/fragment/TreasureFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index 30b35df..64533ac 100644 --- a/app/src/main/java/com/example/myapplication/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -1,7 +1,7 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 寻宝的Fragment diff --git a/app/src/main/java/com/example/myapplication/fragment/UserDataFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/UserDataFragment.java similarity index 88% rename from app/src/main/java/com/example/myapplication/fragment/UserDataFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/UserDataFragment.java index 484f720..8081e32 100644 --- a/app/src/main/java/com/example/myapplication/fragment/UserDataFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserDataFragment.java @@ -1,6 +1,5 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import android.app.Activity; import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; @@ -10,9 +9,9 @@ import android.widget.ImageView; import androidx.annotation.Nullable; -import com.example.myapplication.R; -import com.example.myapplication.activity.FragmentManagement; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; +import com.navinfo.outdoor.base.BaseFragment; import static android.app.Activity.RESULT_OK; diff --git a/app/src/main/java/com/example/myapplication/fragment/WithdrawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java similarity index 72% rename from app/src/main/java/com/example/myapplication/fragment/WithdrawFragment.java rename to app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java index 44f777e..9ab8bc4 100644 --- a/app/src/main/java/com/example/myapplication/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -1,7 +1,7 @@ -package com.example.myapplication.fragment; +package com.navinfo.outdoor.fragment; -import com.example.myapplication.R; -import com.example.myapplication.base.BaseFragment; +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; /** * 提现页面的fragment diff --git a/app/src/main/java/com/example/myapplication/http/Callback.java b/app/src/main/java/com/navinfo/outdoor/http/Callback.java similarity index 91% rename from app/src/main/java/com/example/myapplication/http/Callback.java rename to app/src/main/java/com/navinfo/outdoor/http/Callback.java index 32281e7..a10ebc4 100644 --- a/app/src/main/java/com/example/myapplication/http/Callback.java +++ b/app/src/main/java/com/navinfo/outdoor/http/Callback.java @@ -1,4 +1,4 @@ -package com.example.myapplication.http; +package com.navinfo.outdoor.http; /** * Created by yzb_android on 2019/12/30. diff --git a/app/src/main/java/com/example/myapplication/http/DialogCallback.java b/app/src/main/java/com/navinfo/outdoor/http/DialogCallback.java similarity index 75% rename from app/src/main/java/com/example/myapplication/http/DialogCallback.java rename to app/src/main/java/com/navinfo/outdoor/http/DialogCallback.java index 28ea463..7eccafc 100644 --- a/app/src/main/java/com/example/myapplication/http/DialogCallback.java +++ b/app/src/main/java/com/navinfo/outdoor/http/DialogCallback.java @@ -1,9 +1,4 @@ -package com.example.myapplication.http; - -import android.app.Activity; -import android.app.AlertDialog; -import android.graphics.drawable.ColorDrawable; -import android.view.KeyEvent; +package com.navinfo.outdoor.http; import com.lzy.okgo.model.Response; import com.lzy.okgo.request.base.Request; diff --git a/app/src/main/java/com/example/myapplication/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java similarity index 95% rename from app/src/main/java/com/example/myapplication/http/HttpInterface.java rename to app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java index d84a93e..177a153 100644 --- a/app/src/main/java/com/example/myapplication/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -1,4 +1,4 @@ -package com.example.myapplication.http; +package com.navinfo.outdoor.http; public class HttpInterface { //http://172.21.91.160:8000/api/user/list diff --git a/app/src/main/java/com/example/myapplication/http/JsonCallback.java b/app/src/main/java/com/navinfo/outdoor/http/JsonCallback.java similarity index 92% rename from app/src/main/java/com/example/myapplication/http/JsonCallback.java rename to app/src/main/java/com/navinfo/outdoor/http/JsonCallback.java index 6a74a27..bb64314 100644 --- a/app/src/main/java/com/example/myapplication/http/JsonCallback.java +++ b/app/src/main/java/com/navinfo/outdoor/http/JsonCallback.java @@ -1,6 +1,6 @@ -package com.example.myapplication.http; +package com.navinfo.outdoor.http; -import com.example.myapplication.util.Whetherisempty; +import com.navinfo.outdoor.util.Whetherisempty; import com.google.gson.Gson; import com.lzy.okgo.callback.AbsCallback; diff --git a/app/src/main/java/com/example/myapplication/http/OkGoBuilder.java b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java similarity index 99% rename from app/src/main/java/com/example/myapplication/http/OkGoBuilder.java rename to app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java index f610c09..cf63b76 100644 --- a/app/src/main/java/com/example/myapplication/http/OkGoBuilder.java +++ b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java @@ -1,7 +1,6 @@ -package com.example.myapplication.http; +package com.navinfo.outdoor.http; import android.app.Activity; -import android.util.Log; import com.lzy.okgo.OkGo; import com.lzy.okgo.model.HttpParams; diff --git a/app/src/main/java/com/example/myapplication/util/CustomScrollView.java b/app/src/main/java/com/navinfo/outdoor/util/CustomScrollView.java similarity index 96% rename from app/src/main/java/com/example/myapplication/util/CustomScrollView.java rename to app/src/main/java/com/navinfo/outdoor/util/CustomScrollView.java index 4429107..fb02e39 100644 --- a/app/src/main/java/com/example/myapplication/util/CustomScrollView.java +++ b/app/src/main/java/com/navinfo/outdoor/util/CustomScrollView.java @@ -1,4 +1,4 @@ -package com.example.myapplication.util; +package com.navinfo.outdoor.util; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/example/myapplication/util/NoSlideViewPager.java b/app/src/main/java/com/navinfo/outdoor/util/NoSlideViewPager.java similarity index 97% rename from app/src/main/java/com/example/myapplication/util/NoSlideViewPager.java rename to app/src/main/java/com/navinfo/outdoor/util/NoSlideViewPager.java index e376918..f750dd7 100644 --- a/app/src/main/java/com/example/myapplication/util/NoSlideViewPager.java +++ b/app/src/main/java/com/navinfo/outdoor/util/NoSlideViewPager.java @@ -1,4 +1,4 @@ -package com.example.myapplication.util; +package com.navinfo.outdoor.util; import android.content.Context; diff --git a/app/src/main/java/com/example/myapplication/util/SoftHideKeyBoardUtil.java b/app/src/main/java/com/navinfo/outdoor/util/SoftHideKeyBoardUtil.java similarity index 98% rename from app/src/main/java/com/example/myapplication/util/SoftHideKeyBoardUtil.java rename to app/src/main/java/com/navinfo/outdoor/util/SoftHideKeyBoardUtil.java index 6752550..cb31042 100644 --- a/app/src/main/java/com/example/myapplication/util/SoftHideKeyBoardUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/SoftHideKeyBoardUtil.java @@ -1,4 +1,4 @@ -package com.example.myapplication.util; +package com.navinfo.outdoor.util; import android.app.Activity; import android.graphics.Rect; diff --git a/app/src/main/java/com/example/myapplication/util/SoftKeyboardStateHelper.java b/app/src/main/java/com/navinfo/outdoor/util/SoftKeyboardStateHelper.java similarity index 98% rename from app/src/main/java/com/example/myapplication/util/SoftKeyboardStateHelper.java rename to app/src/main/java/com/navinfo/outdoor/util/SoftKeyboardStateHelper.java index 453eb73..d5b4bc3 100644 --- a/app/src/main/java/com/example/myapplication/util/SoftKeyboardStateHelper.java +++ b/app/src/main/java/com/navinfo/outdoor/util/SoftKeyboardStateHelper.java @@ -1,4 +1,4 @@ -package com.example.myapplication.util; +package com.navinfo.outdoor.util; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/example/myapplication/util/Whetherisempty.java b/app/src/main/java/com/navinfo/outdoor/util/Whetherisempty.java similarity index 95% rename from app/src/main/java/com/example/myapplication/util/Whetherisempty.java rename to app/src/main/java/com/navinfo/outdoor/util/Whetherisempty.java index f84ed72..33b4854 100644 --- a/app/src/main/java/com/example/myapplication/util/Whetherisempty.java +++ b/app/src/main/java/com/navinfo/outdoor/util/Whetherisempty.java @@ -1,4 +1,4 @@ -package com.example.myapplication.util; +package com.navinfo.outdoor.util; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/model/CapacityEvaluationModel.java b/app/src/main/java/model/CapacityEvaluationModel.java index 86f178c..5723fff 100644 --- a/app/src/main/java/model/CapacityEvaluationModel.java +++ b/app/src/main/java/model/CapacityEvaluationModel.java @@ -1,6 +1,6 @@ package model; -import com.example.myapplication.base.BaseModel; +import com.navinfo.outdoor.base.BaseModel; public class CapacityEvaluationModel extends BaseModel { diff --git a/app/src/main/java/presenter/CapacityEvaluationPresenter.java b/app/src/main/java/presenter/CapacityEvaluationPresenter.java index 30a2ba5..ec2055f 100644 --- a/app/src/main/java/presenter/CapacityEvaluationPresenter.java +++ b/app/src/main/java/presenter/CapacityEvaluationPresenter.java @@ -1,8 +1,6 @@ package presenter; -import com.example.myapplication.base.BasePresenter; - -import model.CapacityEvaluationModel; +import com.navinfo.outdoor.base.BasePresenter; public class CapacityEvaluationPresenter extends BasePresenter { @Override diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 70956b9..2a3c316 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" tools:context="activity.HomeActivity"> - @@ -17,7 +17,7 @@ diff --git a/app/src/test/java/com/example/myapplication/ExampleUnitTest.java b/app/src/test/java/com/navinfo/outdoor/ExampleUnitTest.java similarity index 90% rename from app/src/test/java/com/example/myapplication/ExampleUnitTest.java rename to app/src/test/java/com/navinfo/outdoor/ExampleUnitTest.java index bf43ee5..9adf66f 100644 --- a/app/src/test/java/com/example/myapplication/ExampleUnitTest.java +++ b/app/src/test/java/com/navinfo/outdoor/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.example.myapplication; +package com.navinfo.outdoor; import org.junit.Test;