diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java
index 74a91e9..8a16201 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java
@@ -63,8 +63,8 @@ public class App extends Application {
}
//在使用SDK各组件之前初始化context信息，传入ApplicationContext
// 路由初始化
- JVerificationInterface.setDebugMode(true);
- JVerificationInterface.init(this, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
+// JVerificationInterface.setDebugMode(true);
+// JVerificationInterface.init(this, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
//友盟
//设置非debug版本开启
if (!isDebugVersion(con)) {
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/TopMsgPopup.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/TopMsgPopup.kt
index 9e43498..5cf36cf 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/TopMsgPopup.kt
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/TopMsgPopup.kt
@@ -5,17 +5,20 @@ import com.arpa.hndahesudintocctmsdriver.R
import com.lxj.xpopup.core.PositionPopupView
import com.lxj.xpopup.enums.DragOrientation
import kotlinx.android.synthetic.main.popup_qq_msg.view.tvMessage
+import kotlinx.android.synthetic.main.popup_qq_msg.view.tvTitle
/**
* Description: 自定义自由定位Position弹窗
* Create by dance, at 2019/6/14
*/
-class TopMsgPopup(context: Context, message: String) : PositionPopupView(context) {
+class TopMsgPopup(context: Context,title:String, message: String) : PositionPopupView(context) {
private var message: String
+ private var title: String
init {
this.message = message
+ this.title = title
}
override fun getImplLayoutId(): Int {
return R.layout.popup_qq_msg
@@ -28,5 +31,6 @@ class TopMsgPopup(context: Context, message: String) : PositionPopupView(context
override fun onCreate() {
super.onCreate()
tvMessage.text = message
+ tvTitle.text = title
}
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java
index 478e082..77b21ec 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java
@@ -62,14 +62,14 @@ public class MakeUpService extends Service {
@Override
public void onCreate() {
super.onCreate();
- palyMp3();
+// palyMp3();
}
//开始
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
Log.e("服务开启","-----");
-
+ palyMp3();
return START_STICKY;
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/UiAuxiliary.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/UiAuxiliary.java
index 6d36e1f..cd833c6 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/UiAuxiliary.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/UiAuxiliary.java
@@ -39,7 +39,7 @@ public class UiAuxiliary {
}
public static void delLogin(Context con){
- JPushInterface.deleteAlias(con,0);
+// JPushInterface.deleteAlias(con,0);
SPUtils.remove(con,"curWaybillId");
SPUtil.insSP(con,LoginActivity.USER,LoginActivity.USER_TOKEN,"");
SPUtil.insSP(con,LoginActivity.USER,LoginActivity.USER_UNAME,"");
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java
index 469e774..a67bf82 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java
@@ -566,7 +566,7 @@ public class HomeFragment extends BaseFragment {
v1.setOnClickListener(v2 -> {
switch (position) {
case 0:
- PermissionUtils.Companion.getInstance().showPermissionMessage(getActivity(), "用于向您推荐可能感兴趣的住宿、饮食、加油站、汽车维修等",
+ PermissionUtils.Companion.getInstance().showPermissionMessage(getActivity(),"位置权限使用说明", "用于向您推荐可能感兴趣的住宿、饮食、加油站、汽车维修等",
new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
(allGranted, grantedList, deniedList) -> {
if (allGranted) {
@@ -1114,35 +1114,35 @@ public class HomeFragment extends BaseFragment {
public void initAlct() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// if (!OneDayShowUtils.getInstance().todayIsShowQx(con)){
- boolean b = EasyPermissions.hasPermissions(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE,
- Manifest.permission.READ_EXTERNAL_STORAGE,
- Manifest.permission.ACCESS_FINE_LOCATION,
- Manifest.permission.ACCESS_COARSE_LOCATION);
- if (b) {
- ALProcess.verification(con);
- }
-// PermissionX.init(getActivity())
-// .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
-// Manifest.permission.READ_EXTERNAL_STORAGE,
-// Manifest.permission.ACCESS_FINE_LOCATION,
-// Manifest.permission.ACCESS_COARSE_LOCATION)
-// .request((allGranted, grantedList, deniedList) -> {
-// if (allGranted) {
-// ALProcess.verification(con);
-// } else {
-// boolean accessCoarseLocation = deniedList.contains("android.permission.ACCESS_FINE_LOCATION");
-// boolean contains = deniedList.contains("android.permission.WRITE_EXTERNAL_STORAGE");
-// if (accessCoarseLocation | contains) {
-// new MessageUtils().showSimCenPop(con, "缺少定位权限或媒体和文件权限,会导致无法结算运费,去开启！", "取消", "确认", () -> {
-// Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-// Uri uri = Uri.fromParts("package", getPackageName(), null);
-// intent.setData(uri);
-// startActivity(intent);
-// });
-// }
-//
-// }
-// });
+// boolean b = EasyPermissions.hasPermissions(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE,
+// Manifest.permission.READ_EXTERNAL_STORAGE,
+// Manifest.permission.ACCESS_FINE_LOCATION,
+// Manifest.permission.ACCESS_COARSE_LOCATION);
+// if (b) {
+// ALProcess.verification(con);
+// }
+ PermissionX.init(getActivity())
+ .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
+ Manifest.permission.READ_EXTERNAL_STORAGE,
+ Manifest.permission.ACCESS_FINE_LOCATION,
+ Manifest.permission.ACCESS_COARSE_LOCATION)
+ .request((allGranted, grantedList, deniedList) -> {
+ if (allGranted) {
+ ALProcess.verification(con);
+ } else {
+ boolean accessCoarseLocation = deniedList.contains("android.permission.ACCESS_FINE_LOCATION");
+ boolean contains = deniedList.contains("android.permission.WRITE_EXTERNAL_STORAGE");
+ if (accessCoarseLocation | contains) {
+ new MessageUtils().showSimCenPop(con, "缺少定位权限或媒体和文件权限,会导致无法结算运费,去开启！", "取消", "确认", () -> {
+ Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+ Uri uri = Uri.fromParts("package", getPackageName(), null);
+ intent.setData(uri);
+ startActivity(intent);
+ });
+ }
+
+ }
+ });
// }
} else {
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
index d4759d0..177dbd6 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
@@ -103,7 +103,7 @@ public class LoginActivity extends BaseActivity {
SPUtil.insSP(con, USER, USER_UNAME, loginBean.getData().getUname());
SPUtil.insSP(con, USER, USER_RNAME, loginBean.getData().getRname());
SPUtil.insSP(con, USER, USER_ID, loginBean.getData().getId() + "");
- JPushInterface.setAlias(con, 0, loginBean.getData().getUname());
+// JPushInterface.setAlias(con, 0, loginBean.getData().getUname());
appInfoBean.setStatus("0");
appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
ur.postAppInfo(appInfoBean,"post");
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java
index 9298bad..c261300 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java
@@ -343,8 +343,8 @@ public class WelcomeActivity extends BaseAppCompatActivity {
}
//在使用SDK各组件之前初始化context信息，传入ApplicationContext
// 路由初始化
- JVerificationInterface.setDebugMode(true);
- JVerificationInterface.init(con, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
+// JVerificationInterface.setDebugMode(true);
+// JVerificationInterface.init(con, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
//友盟
//设置非debug版本开启
if (!isDebugVersion(con)) {
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/PermissionUtils.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/PermissionUtils.kt
index 85d7788..27d5ca8 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/PermissionUtils.kt
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/PermissionUtils.kt
@@ -39,7 +39,7 @@ class PermissionUtils {
* @param callback RequestCallback
* @return BasePopupView?
*/
- fun showPermissionMessage(activity: FragmentActivity, message: String,vararg permission:String,callback: MyRequestCallback){
+ fun showPermissionMessage(activity: FragmentActivity,title:String, message: String,vararg permission:String,callback: MyRequestCallback){
val show = XPopup.Builder(activity)
.hasShadowBg(false)
.hasBlurBg(false)
@@ -49,6 +49,7 @@ class PermissionUtils {
.asCustom(
TopMsgPopup(
activity,
+ title,
message
)
)
diff --git a/app/src/main/res/drawable/bg_round2.xml b/app/src/main/res/drawable/bg_round2.xml
index d930abc..1bdbd1d 100644
--- a/app/src/main/res/drawable/bg_round2.xml
+++ b/app/src/main/res/drawable/bg_round2.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/popup_qq_msg.xml b/app/src/main/res/layout/popup_qq_msg.xml
index be8ffd3..4dd7a22 100644
--- a/app/src/main/res/layout/popup_qq_msg.xml
+++ b/app/src/main/res/layout/popup_qq_msg.xml
@@ -4,14 +4,23 @@
android:background="@drawable/bg_round2"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_16"
+ android:padding="20dp"
android:layout_height="wrap_content">
+
\ No newline at end of file