Ver Fonte

天津卖顿解决鸿蒙3.0闪退

zhou.xiaoning há 2 anos atrás
pai
commit
4fababd2d2

+ 10 - 0
RMA/.idea/jarRepositories.xml

@@ -46,5 +46,15 @@
       <option name="name" value="maven2" />
       <option name="url" value="https://maven.aliyun.com/repository/gradle-plugin" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://www.jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>

+ 3 - 3
RMA/app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "cn.muchinfo.rma"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 50063
-        versionName "5.0.63"
+        versionCode 50070
+        versionName "5.0.70"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //指定room.schemaLocation生成的文件路径
@@ -213,7 +213,7 @@ dependencies {
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation "org.jetbrains.kotlin:kotlin-reflect:1.4.10"
     //图表
-    implementation 'com.github.AAChartModel:AAChartCore-Kotlin:-SNAPSHOT'
+    implementation 'com.github.AAChartModel:AAChartCore-Kotlin:7.2.0'
     implementation 'q.rorbin:badgeview:1.1.3'
     api 'com.luozm.captcha:captcha:1.1.2'
     implementation 'com.sunfusheng:marqueeview:1.3.3'

+ 11 - 3
RMA/app/src/main/java/cn/muchinfo/rma/global/utils/TimeUtils.java

@@ -544,17 +544,25 @@ public class TimeUtils {
     public static String covnDate3(String dateTime) {
         DateFormat df2 = null;
         Date date1 = null;
+        String s = null;
+
         try {
+//            DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+//            Date date = df.parse(dateTime);
+//            SimpleDateFormat df1 = new SimpleDateFormat("EEE MMM dd HH:mm:ss Z yyyy", Locale.UK);
+//            date1 = df1.parse(date.toString());
+//            df2 = new SimpleDateFormat("MM-dd");
+
             DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
             Date date = df.parse(dateTime);
-            SimpleDateFormat df1 = new SimpleDateFormat("EEE MMM dd HH:mm:ss Z yyyy", Locale.UK);
-            date1 = df1.parse(date.toString());
             df2 = new SimpleDateFormat("MM-dd");
+            s = df2.format(date);
 
         } catch (ParseException e) {
             e.printStackTrace();
         }
-        return df2.format(date1);
+
+        return s;
     }
 
 

+ 2 - 2
RMA/app/src/main/java/cn/muchinfo/rma/view/base/app/Constant.kt

@@ -7,7 +7,7 @@ object Constant {
      * 获取基础url的接口
      */
 //    const val baseurl = "http://103.40.249.123:38280/cfg?key=mtp_20" // 天津麦顿模拟盘
-//    const val baseurl = "http://47.104.141.54:38280/cfg?key=mtp_20" // 天津麦顿实盘
+    const val baseurl = "http://47.104.141.54:38280/cfg?key=mtp_20" // 天津麦顿实盘
 //      const val baseurl = "http://218.17.158.45:21001/cfg?key=test_tjmd" // 天津麦顿 邓工外网
 //    const val baseurl = "http://103.40.249.123:28280/cfg?key=mtp_20"//云融大宗
 //    const val baseurl = "http://103.40.249.123:8280/cfg?key=mtp_20"//千海金外盘
@@ -41,7 +41,7 @@ object Constant {
 //    const val baseurl = "http://192.168.31.176:8080/cfg?key=test_176" // 邓工 新会陈皮
 //    const val baseurl = "http://192.168.31.139:8080/cfg?key=test_139" // 麦顿
 //    const val baseurl = "http://218.17.158.45:15203/cfg?key=test_176" // 邓工 新会陈皮 176外网
-    const val baseurl = "http://192.168.31.204:8080/cfg?key=test_204" // 邓工 大宗测试
+//    const val baseurl = "http://192.168.31.204:8080/cfg?key=test_204" // 邓工 大宗测试
 
     /**
      * 用sp存储基础url的key

+ 2 - 1
RMA/build.gradle

@@ -18,7 +18,8 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url "https://jitpack.io" }
+//        maven { url "https://jitpack.io" }
+        maven { url "https://www.jitpack.io" }
     }
 }