2 コミット 2d4d90ceb6 ... 5849d3ffce

作者 SHA1 メッセージ 日付
  songw 5849d3ffce 添加友盟混淆 3 日 前
  songw ca0b4ef36a 修改为锡膏通用项目 2 週間 前

+ 2 - 2
app/build.gradle

@@ -41,8 +41,8 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                   // fileName = "联淦_锡膏管理_UAS_RELEASE_${releaseInfo}.apk"
-                    fileName = "百岗锡膏_UAS_RELEASE_${releaseInfo}.apk"
+                    fileName = "通用_锡膏管理_UAS_RELEASE_${releaseInfo}.apk"
+//                    fileName = "联淦_锡膏管理_UAS_RELEASE_${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
                     fileName = "RD_UAS_PDA_WANLIDA_DEBUG_${debugInfo}.apk"

+ 15 - 1
app/proguard-rules.pro

@@ -166,4 +166,18 @@
 ################################
 ##实体类
 #-keep class com.uas.lg_smart.bean.** {*;}
-##-keep .** {*;}
+##-keep .** {*;}
+
+
+#友盟混淆
+-keep class com.umeng.** {*;}
+-keep class org.repackage.** {*;}
+-keep class com.uyumao.** { *; }
+-keepclassmembers class * {
+   public <init> (org.json.JSONObject);
+}
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+

+ 0 - 1
app/src/main/java/com/uas/lg_smart/fragment/SolderChargingFragment.java

@@ -69,7 +69,6 @@ public class SolderChargingFragment extends BaseFragment {
     protected void initViews() {
         setTitle("锡膏上料");
         ((FunctionActivity) getActivity()).setScanIvVisible(true);
-
         mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
 
         mBarcodeEditText = root.findViewById(R.id.solder_charging_barcode_et);

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="my_app_name">百岗_锡膏</string>
+    <string name="my_app_name">锡膏_通用</string>
     <string name="my_app_name_test">锡膏管理</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>