Bladeren bron

修复不能更新的问题,同时取消掉友盟日志的兼容

songw 3 maanden geleden
bovenliggende
commit
48bdf79971

+ 14 - 7
app/build.gradle

@@ -10,8 +10,11 @@ android {
         udapda {
             keyAlias 'jiaweisi_wms_alias'
             keyPassword 'pdakeystone'
-            storeFile file('C:\\sigin\\jiaweisi_wms.jks')
             storePassword 'pdakeystone'
+            storeFile file('C:\\sigin\\jiaweisi_wms.jks')
+
+//            v1SigningEnabled true
+//            v2SigningEnabled true
         }
     }
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -24,7 +27,8 @@ android {
         versionCode rootProject.ext.android.versionCode
         versionName rootProject.ext.android.versionName
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        consumerProguardFiles 'proguard-rules.pro'
+
         multiDexEnabled true // 确保启用多DEX支持
         javaCompileOptions {
             annotationProcessorOptions {
@@ -33,7 +37,7 @@ android {
         }
         ndk {
             //设置支持的SO库架构(开发者可以根据需要,选择一个或多个平台的so)
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            abiFilters "armeabi" , "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
         }
     }
     bundle {
@@ -50,6 +54,7 @@ android {
     }
     buildTypes {
         release {
+            signingConfig signingConfigs.udapda
             minifyEnabled false // 是否启用代码混淆,默认是false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -71,7 +76,7 @@ android {
 //                    def fileName
 //                    if (outputFile != null && outputFile.name.endsWith('.apk')) {
 //                        def releaseInfo = getVersionName()
-//                        fileName = "普耐尔WMS_RELEASE_${releaseInfo}.apk"
+//                        fileName = "贾维斯_WMS_RELEASE_${releaseInfo}.apk"
 //                        outputFileName = fileName
 //                    }
 //                }
@@ -92,6 +97,7 @@ android {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
     }
+
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
             def outputFile = output.outputFile
@@ -169,9 +175,10 @@ dependencies {
     implementation 'com.permissionx.guolindev:permissionx:1.3.0'
 
     // 友盟基础组件库(所有友盟业务SDK都依赖基础组件库)
-    implementation 'com.umeng.umsdk:common:9.4.4' //(必选)
-    implementation 'com.umeng.umsdk:asms:1.4.1' // asms包依赖(必选)
-    implementation 'com.umeng.umsdk:apm:1.5.2' // U-APM包依赖(必选) 错误分析升级为独立SDK,看crash数据请一定集成
+//    implementation 'com.umeng.umsdk:common:9.4.4' //(必选)
+//    implementation 'com.umeng.umsdk:asms:1.4.1' // asms包依赖(必选)
+//    implementation 'com.umeng.umsdk:apm:1.5.2' // U-APM包依赖(必选) 错误分析升级为独立SDK,看crash数据请一定集成
+
 
     implementation 'org.greenrobot:eventbus:3.1.1'  //eventBus
     implementation 'org.apache.commons:commons-text:1.9'

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -22,7 +22,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-
+ 
     <application
         android:name="uas.erp.jiaweisi_wms.application.PdaApplication"
         android:allowBackup="true"

+ 22 - 23
app/src/main/java/uas/erp/jiaweisi_wms/application/PdaApplication.java

@@ -12,8 +12,7 @@ import android.util.Log;
 import com.android.volley.RequestQueue;
 import com.android.volley.toolbox.Volley;
 import com.facebook.stetho.Stetho;
-import com.umeng.analytics.MobclickAgent;
-import com.umeng.commonsdk.UMConfigure;
+
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -98,7 +97,7 @@ public class PdaApplication extends Application {
         mSoundMap.put(SoundUtil.SOUND_TETHYS, mSoundPool.load(this, R.raw.tethys, 1));
         mSoundMap.put(SoundUtil.SOUND_TITAN, mSoundPool.load(this, R.raw.titan, 1));
         //友盟统计SDK
-        initUmeng();
+        //initUmeng();
     }
     private CountDownTimer countDownTimer = new CountDownTimer(COUNTDOWN_TIME, COUNTDOWN_INTERVAL) {
 
@@ -135,26 +134,26 @@ public class PdaApplication extends Application {
         countDownTimer.cancel();
     }
 
-    private void initUmeng() {
-        //2.在Application.oncreate()中调用预初始化函数
-        UMConfigure.preInit(this, "6823029879267e02106205b9","umeng");
-        UMConfigure.setLogEnabled(true);
-        //3.客户端用户同意隐私政策后,正式初始化友盟+SDK
-        UMConfigure.init(
-                this,
-                "6823029879267e02106205b9",
-                "umeng",
-                UMConfigure.DEVICE_TYPE_PHONE, ""
-        );
-        // 页面数据采集模式
-        // setPageCollectionMode接口参数说明:
-        // 1. MobclickAgent.PageMode.AUTO: 建议大多数用户使用本采集模式,SDK在此模式下自动采集Activity
-        // 页面访问路径,开发者不需要针对每一个Activity在onResume/onPause函数中进行手动埋点。在此模式下,
-        // 开发者如需针对Fragment、CustomView等自定义页面进行页面统计,直接调用MobclickAgent.onPageStart/
-        // MobclickAgent.onPageEnd手动埋点即可。此采集模式简化埋点工作,唯一缺点是在Android 4.0以下设备中
-        // 统计不到Activity页面数据和各类基础指标(提示:目前Android 4.0以下设备市场占比已经极小)。
-        MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO);
-    }
+//    private void initUmeng() {
+//        //2.在Application.oncreate()中调用预初始化函数
+//        UMConfigure.preInit(this, "68a571e5e563686f4283e880","umeng");
+//        UMConfigure.setLogEnabled(true);
+//        //3.客户端用户同意隐私政策后,正式初始化友盟+SDK
+//        UMConfigure.init(
+//                this,
+//                "68a571e5e563686f4283e880",
+//                "umeng",
+//                UMConfigure.DEVICE_TYPE_PHONE, ""
+//        );
+//        // 页面数据采集模式
+//        // setPageCollectionMode接口参数说明:
+//        // 1. MobclickAgent.PageMode.AUTO: 建议大多数用户使用本采集模式,SDK在此模式下自动采集Activity
+//        // 页面访问路径,开发者不需要针对每一个Activity在onResume/onPause函数中进行手动埋点。在此模式下,
+//        // 开发者如需针对Fragment、CustomView等自定义页面进行页面统计,直接调用MobclickAgent.onPageStart/
+//        // MobclickAgent.onPageEnd手动埋点即可。此采集模式简化埋点工作,唯一缺点是在Android 4.0以下设备中
+//        // 统计不到Activity页面数据和各类基础指标(提示:目前Android 4.0以下设备市场占比已经极小)。
+//        MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO);
+//    }
 
     @Override
     public void onTerminate() {

+ 1 - 2
app/src/main/java/uas/erp/jiaweisi_wms/fragment/IndexSettingFragment.java

@@ -208,8 +208,7 @@ public class IndexSettingFragment extends BaseFragment implements View.OnClickLi
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-
-        initDatas();
+//        initDatas();
     }
 
     @Override

+ 0 - 2
app/src/main/java/uas/erp/jiaweisi_wms/fragment/StorageRechargeListFragment.java

@@ -12,7 +12,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
-import com.efs.sdk.base.core.util.Log;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 
@@ -194,7 +193,6 @@ public class StorageRechargeListFragment extends BaseFragment implements HttpCal
             }
             if (o != null) {
                 String result = o.toString();
-                Log.e("aaa","收料数据是: " + result);
                 if (JsonUtils.validate(result)) {
                     JSONObject resultObject = JSON.parseObject(result);
                     JSONArray dataArray = resultObject.getJSONArray("data");

+ 2 - 0
app/src/main/java/uas/erp/jiaweisi_wms/util/CommonUtil.java

@@ -499,6 +499,7 @@ public class CommonUtil {
             ErrorMsg errorMsg = JsonTools.parseJsonToBean(new String(volleyError.networkResponse.data), ErrorMsg.class);
             if (errorMsg != null && errorMsg.exceptionInfo != null) {
                 errorStr = errorMsg.exceptionInfo;
+                MyLog.e("aaa","错误信息:" + errorMsg.exceptionInfo);
             } else {
                 errorStr = "系统错误";
             }
@@ -584,6 +585,7 @@ public class CommonUtil {
             ErrorMsg errorMsg = JsonTools.parseJsonToBean(new String(volleyError.networkResponse.data), ErrorMsg.class);
             if (errorMsg != null && errorMsg.exceptionInfo != null) {
                 errorStr = errorMsg.exceptionInfo;
+                MyLog.e("aaa","错误信息:" + errorMsg.exceptionInfo);
             } else {
                 errorStr = "系统错误";
             }

+ 161 - 0
app/src/main/java/uas/erp/jiaweisi_wms/util/MyLog.java

@@ -0,0 +1,161 @@
+package uas.erp.jiaweisi_wms.util;
+
+import android.annotation.SuppressLint;
+import android.util.Log;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 带日志文件输入,又可控开关的日志调试
+ */
+@SuppressLint("SimpleDateFormat")
+public class MyLog {
+	public static Boolean MYLOG_SWITCH = true; // 日志文件总开关
+	private static Boolean MYLOG_WRITE_TO_FILE = true;// 日志写入文件开关
+	private static char MYLOG_TYPE = 'v';// 输入日志类型,w代表只输出告警信息等,v代表输出所有信息
+	@SuppressLint("SdCardPath")
+	private static String MYLOG_PATH_SDCARD_DIR1 = "/sdcard/MSShow";    // 日志文件在sdcard中的路径
+	private static String MYLOG_PATH_SDCARD_DIR2 = "/Log";
+	private static String MYLOG_PATH_SDCARD_DIR = MYLOG_PATH_SDCARD_DIR1+MYLOG_PATH_SDCARD_DIR2;
+	private static String MYLOGFILEName = "Log.txt";// 本类输出的日志文件名称
+
+	@SuppressLint("SimpleDateFormat")
+	private static SimpleDateFormat myLogSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// 日志的输出格式
+
+	private static boolean isDebug = true;		//普通log的开关
+	private static String TAG = "英唐" +"-----------";
+
+	public static void e(String msg){
+		if(isDebug){
+			Log.e(TAG, msg);
+		}
+	}
+
+	public static void w(String msg){
+		if(isDebug){
+			Log.w(TAG, msg);
+		}
+	}
+
+	public static void d(String msg){
+		if(isDebug){
+			Log.d(TAG, msg);
+		}
+	}
+
+	public static void i(String msg){
+		if(isDebug){
+			Log.i(TAG, msg);
+		}
+	}
+
+	public static void w(String tag, Object msg) { // 警告信息
+		log(tag, msg.toString(), 'w');
+	}
+
+	public static void e(String tag, Object msg) { // 错误信息
+		log(tag, msg.toString(), 'e');
+	}
+
+	public static void d(String tag, Object msg) {// 调试信息
+		log(tag, msg.toString(), 'd');
+	}
+
+	public static void i(String tag, Object msg) {//
+		log(tag, msg.toString(), 'i');
+	}
+
+	public static void v(String tag, Object msg) {
+		log(tag, msg.toString(), 'v');
+	}
+
+	public static void w(String tag, String text) {
+		log(tag, text, 'w');
+	}
+
+	public static void e(String tag, String text) {
+		log(tag, text, 'e');
+	}
+
+	public static void d(String tag, String text) {
+		log(tag, text, 'd');
+	}
+
+	public static void i(String tag, String text) {
+		log(tag, text, 'i');
+	}
+
+	public static void v(String tag, String text) {
+		log(tag, text, 'v');
+	}
+
+	/**
+	 * 根据tag, msg和等级,输出日志
+	 */
+	private static void log(String tag, String msg, char level) {
+		msg = "\r\n"+msg;
+		if (MYLOG_SWITCH) {
+			if ('e' == level && ('e' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) { // 输出错误信息
+				Log.e(tag, msg);
+			} else if ('w' == level && ('w' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+				Log.w(tag, msg);
+			} else if ('d' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+				Log.d(tag, msg);
+			} else if ('i' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+				Log.i(tag, msg);
+			} else {
+				Log.v(tag, msg);
+			}
+			if (MYLOG_WRITE_TO_FILE) {
+				writeLogtoFile(String.valueOf(level), tag, msg);
+			}
+		}
+	}
+
+	/**
+	 * 打开日志文件并写入日志
+	 * **/
+	private static void writeLogtoFile(String mylogtype, String tag, String text) {// 新建或打开日志文件
+		isExist(MYLOG_PATH_SDCARD_DIR1);
+		isExist(MYLOG_PATH_SDCARD_DIR);
+		Date nowtime = new Date();
+//		String needWriteFiel = logfile.format(nowtime);
+		String needWriteMessage = myLogSdf.format(nowtime) + "    " + mylogtype
+				+ "    " + tag + "    " + text;
+		File file = new File(MYLOG_PATH_SDCARD_DIR, MYLOGFILEName);
+		try {
+			FileWriter filerWriter = new FileWriter(file, true);// 后面这个参数代表是不是要接上文件中原来的数据,不进行覆盖
+			BufferedWriter bufWriter = new BufferedWriter(filerWriter);
+			bufWriter.write(needWriteMessage);
+			bufWriter.newLine();
+			bufWriter.close();
+			filerWriter.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 删除制定的日志文件
+	 * */
+	public static void delFile() {// 删除日志文件
+		File file = new File(MYLOG_PATH_SDCARD_DIR, MYLOGFILEName);
+		if (file.exists()) {
+			file.delete();
+		}
+	}
+
+	public static void isExist(String path) {
+		File file = new File(path);
+		// 判断文件夹是否存在,如果不存在则创建文件夹
+		if (!file.exists()) {
+			file.mkdir();
+		}
+
+	}
+}