diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..f9f33c3 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..7bfef59 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 62b6730..1b29773 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 30 buildToolsVersion "30.0.3" - // ndkVersion '23.0.7123448' + ndkVersion '23.0.7123448' defaultConfig { applicationId "com.navinfo.outdoor" @@ -27,7 +27,21 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } } - +//efs { +// //是否对启动过程进程插桩的开关，如果使用自动集成监控则必须开启 +// isAutoTrack = true +// //您自定义Application的类名称，必填项，如没有自定义则填写系统Application +// applicationName = "UserApplication" +// //您自定义Activity的类名称，必填项，将您所有Activity的类名按如下格式填写 +// activityList = [ +// "MainActivity", +// "WebActivity", +// "LoginActivity", +// "ImageShowActivity", +// "HomeActivity" +// //...... +// ] +//} dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) @@ -40,6 +54,9 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'com.umeng.umsdk:common:9.3.8' + implementation 'com.umeng.umsdk:asms:1.2.2' + implementation 'com.umeng.umsdk:apm:1.2.0' //状态栏侵染 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 847b16d..d1495c3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,26 +1,35 @@ - - - + + + + + + + + + + + + android:value="480" /> + android:value="800" /> + diff --git a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java index c7540b2..91caaee 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java @@ -24,6 +24,8 @@ public class MainActivity extends BaseActivity { @Override protected void initData() { super.initData(); + + new CountDownTimer(3000, 1000) { @Override public void onTick(long l) { diff --git a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java index a6513b3..13e8e6c 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java +++ b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java @@ -9,6 +9,8 @@ import com.lzy.okgo.cookie.CookieJarImpl; import com.lzy.okgo.cookie.store.DBCookieStore; import com.lzy.okgo.interceptor.HttpLoggingInterceptor; import com.lzy.okgo.model.HttpHeaders; +import com.umeng.commonsdk.UMConfigure; +import com.umeng.umcrash.UMCrash; import java.util.concurrent.TimeUnit; import java.util.logging.Level; @@ -23,6 +25,15 @@ public class UserApplication extends Application { public void onCreate() { super.onCreate(); userApplication=this; + UMConfigure.init(this, "60b885bd6c421a3d97db55e6", "navinfo", UMConfigure.DEVICE_TYPE_PHONE, ""); + /** + *设置组件化的Log开关 + *参数: boolean 默认为false，如需查看LOG设置为true + */ + UMConfigure.setLogEnabled(true); + String e ="测试自定义异常代码是否运行！！！！！！"; + UMCrash.generateCustomLog(e,"UmengException"); + initOkGo(); } @@ -66,6 +77,8 @@ public class UserApplication extends Application { .addCommonHeaders(headers) //全局统一超时重连次数，默认为三次，那么最差的情况会请求4次(一次原始请求，三次重连请求)，不需要可以设置为0; .setRetryCount(0); + } + } diff --git a/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java b/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java index 0306ee5..ce35758 100644 --- a/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java @@ -117,4 +117,5 @@ public abstract class BaseActivity extends AppCompatActivity { } } + } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java index 0ccb8ee..1a32cb6 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java @@ -20,6 +20,7 @@ import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; import com.jcodecraeer.xrecyclerview.ProgressStyle; import com.jcodecraeer.xrecyclerview.XRecyclerView; +import com.umeng.umcrash.UMCrash; import org.json.JSONObject; @@ -108,6 +109,11 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC dismissLoadingDialog(); Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); Log.d("TAG", "onError: " + e.getMessage()); + /** + * 友盟+ + * 返回自定义报错信息 + */ + UMCrash.generateCustomLog("网络请求报错-位置：CapacityEvaluationFragment"+e.getMessage(),"UmengException"); } }).build(); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java index 788bb85..1673139 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java @@ -20,6 +20,7 @@ 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.umeng.umcrash.UMCrash; import org.json.JSONObject; @@ -73,6 +74,8 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener @Override protected void initView() { super.initView(); + + ivIssueFinish =findViewById(R.id.iv_issue_finish); mainIssueRecycler =findViewById(R.id.main_issue_recycler); ivIssueFinish.setOnClickListener(this::onClick); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java index 7fd5872..a99a2d3 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java @@ -17,7 +17,7 @@ import static android.app.Activity.RESULT_OK; /** * 实名认证 */ -public class UserAttestationFragment extends BaseFragment implements View.OnClickListener{ +public class UserAttestationFragment extends BaseFragment implements View.OnClickListener { private ImageView ivAttestation2; private ImageView ivAttestation1; @@ -46,30 +46,31 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic @Override public void onClick(View v) { - switch (v.getId()){ + switch (v.getId()) { case R.id.iv_attestation: getActivity().finish(); break; case R.id.iv_attestation1: Intent ivAttestation1 = new Intent("android.media.action.IMAGE_CAPTURE"); - startActivityForResult(ivAttestation1,100); + startActivityForResult(ivAttestation1, 100); break; case R.id.iv_attestation2: Intent ivAttestation2 = new Intent("android.media.action.IMAGE_CAPTURE"); - startActivityForResult(ivAttestation2,200); + startActivityForResult(ivAttestation2, 200); break; } } + @Override public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode==100&&resultCode==RESULT_OK){ - Bundle extras=data.getExtras();//从Intent中获取附加值 - Bitmap bitmap=(Bitmap) extras.get("data");//从附加值中获取返回的图像 + if (requestCode == 100 && resultCode == RESULT_OK) { + Bundle extras = data.getExtras();//从Intent中获取附加值 + Bitmap bitmap = (Bitmap) extras.get("data");//从附加值中获取返回的图像 ivAttestation1.setImageBitmap(bitmap);//显示图像 - }else if (requestCode==200&&resultCode==RESULT_OK){ - Bundle extras=data.getExtras();//从Intent中获取附加值 - Bitmap bitmap=(Bitmap) extras.get("data");//从附加值中获取返回的图像 + } else if (requestCode == 200 && resultCode == RESULT_OK) { + Bundle extras = data.getExtras();//从Intent中获取附加值 + Bitmap bitmap = (Bitmap) extras.get("data");//从附加值中获取返回的图像 ivAttestation2.setImageBitmap(bitmap);//显示图像 } } diff --git a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java index cf63b76..587a1c1 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java +++ b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java @@ -6,6 +6,7 @@ import com.lzy.okgo.OkGo; import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; import com.lzy.okgo.request.PostRequest; +import com.umeng.umcrash.UMCrash; import org.json.JSONArray; import org.json.JSONObject; @@ -195,6 +196,11 @@ public class OkGoBuilder { if (throwable != null) { throwable.printStackTrace(); callback.onError(throwable, 2); + /** + * 友盟+ + * 使用自定义错误，查看时请在错误列表页面选择【自定义异常】 + */ + UMCrash.generateCustomLog("网络请求报错-位置：OKGOBuilder"+throwable,"UmengException"); } } }); diff --git a/app/src/main/res/drawable/ic_baseline_arrow_forward.xml b/app/src/main/res/drawable/ic_baseline_arrow_forward.xml index b52f4a2..df3857f 100644 --- a/app/src/main/res/drawable/ic_baseline_arrow_forward.xml +++ b/app/src/main/res/drawable/ic_baseline_arrow_forward.xml @@ -1,5 +1,5 @@ diff --git a/app/src/main/res/drawable/map_down_shape.xml b/app/src/main/res/drawable/map_down_shape.xml new file mode 100644 index 0000000..36a9a69 --- /dev/null +++ b/app/src/main/res/drawable/map_down_shape.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/text_color.xml b/app/src/main/res/drawable/text_color.xml index 9afee0d..e1d8a15 100644 --- a/app/src/main/res/drawable/text_color.xml +++ b/app/src/main/res/drawable/text_color.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 05cfa66..eafe790 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -45,7 +45,7 @@ android:layout_width="300dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:hint="ID/手机号" + android:hint=" ID/手机号" android:paddingBottom="20dp" android:textColorHint="@color/colorTransparent" android:textCursorDrawable="@drawable/text_color" @@ -69,7 +69,7 @@ android:layout_width="300dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:hint="请输入密码" + android:hint=" 请输入密码" android:paddingBottom="15dp" android:textColorHint="@color/colorTransparent" android:textCursorDrawable="@drawable/text_color" diff --git a/app/src/main/res/layout/issue_problem_item.xml b/app/src/main/res/layout/issue_problem_item.xml index 348a936..5d74438 100644 --- a/app/src/main/res/layout/issue_problem_item.xml +++ b/app/src/main/res/layout/issue_problem_item.xml @@ -1,16 +1,19 @@ - - + xmlns:app="http://schemas.android.com/apk/res-auto" + android:background="?android:attr/selectableItemBackground" + android:orientation="vertical" + android:paddingTop="15dp"> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/map_download_fragment.xml b/app/src/main/res/layout/map_download_fragment.xml index c1f62ec..2e1a879 100644 --- a/app/src/main/res/layout/map_download_fragment.xml +++ b/app/src/main/res/layout/map_download_fragment.xml @@ -1,15 +1,16 @@ + android:layout_height="match_parent"> + @@ -20,13 +21,12 @@ android:layout_height="45dp" android:layout_alignParentLeft="true" android:layout_marginLeft="15dp" - android:src="@drawable/icon_arrow" - /> + android:src="@drawable/icon_arrow" /> @@ -65,6 +65,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/linearLayout2" /> + app:layout_constraintTop_toBottomOf="@+id/linearLayout2"/> \ No newline at end of file diff --git a/app/src/main/res/layout/mine_fragment.xml b/app/src/main/res/layout/mine_fragment.xml index 03f7bc7..18c79a0 100644 --- a/app/src/main/res/layout/mine_fragment.xml +++ b/app/src/main/res/layout/mine_fragment.xml @@ -159,7 +159,7 @@ android:drawableRight="@drawable/ic_baseline_arrow_forward" android:gravity="center" android:text="LV.1" - android:textSize="18sp" /> + android:textSize="16sp" /> + diff --git a/app/src/main/res/layout/user_data_fragment.xml b/app/src/main/res/layout/user_data_fragment.xml index f5f9e10..9062e61 100644 --- a/app/src/main/res/layout/user_data_fragment.xml +++ b/app/src/main/res/layout/user_data_fragment.xml @@ -17,12 +17,12 @@ + android:src="@drawable/icon_arrow" /> - - - diff --git a/build.gradle b/build.gradle index 2e59c2d..ea50806 100644 --- a/build.gradle +++ b/build.gradle @@ -4,13 +4,17 @@ buildscript { google() jcenter() maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} + maven { url 'https://repo1.maven.org/maven2/' } + } dependencies { classpath "com.android.tools.build:gradle:4.0.0" + + } // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files - } + } allprojects { @@ -19,6 +23,7 @@ allprojects { jcenter() maven { url 'https://jitpack.io' } maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} + maven { url 'https://repo1.maven.org/maven2/' } } }