version:1.5

fix:迁移到奥乐云平台
add:

build.gradle

@@ -9,8 +9,16 @@ buildscript {
     }
 }
 
+allprojects {
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            options.compilerArgs.add('-Xbootclasspath/p:libs/framework.jar')
+        }
+    }
+}
+
 def appName() {
-    return "colorfulos"
+    return "奥乐云桌面"
 }
 
 def releaseTime() {
@@ -24,26 +32,41 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.protobuf'
 
 android {
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            Set<File> fileSet = options.bootstrapClasspath.getFiles()
+            List<File> newFileList =  new ArrayList<>();
+            //JAVA语法，可连续调用，输入参数建议为相对路径
+            newFileList.add(new File("libs/framework.jar"))
+            //最后将原始参数添加
+            newFileList.addAll(fileSet)
+            options.bootstrapClasspath = files(
+                    newFileList.toArray()
+            )
+        }
+    }
+
     lintOptions {
         checkReleaseBuilds false
         abortOnError false
     }
+
     compileSdkVersion COMPILE_SDK
     buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
         minSdkVersion 26
         targetSdkVersion 28
-        versionCode 2
-        versionName "1.1"
+        versionCode 6
+        versionName "1.5"
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
             abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
             // 还可以添加 'x86', 'x86_64', 'mips', 'mips64'
         }
         manifestPlaceholders = [
-                JPUSH_PKGNAME: "com.android.colorfulos",
-                JPUSH_APPKEY : "12db92240df0226d5e2f3b61", //JPush 上注册的包名对应的 Appkey.
+                JPUSH_PKGNAME: "com.aoleyun.os",
+                JPUSH_APPKEY : "0c7ba5a1622dba78d5bd00cc", //JPush 上注册的包名对应的 Appkey.
                 JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可.
         ]
 
@@ -148,14 +171,14 @@ android {
     productFlavors {
         aosp {
             dimension "app"
-            applicationId 'com.android.colorfulos'
-            testApplicationId 'com.android.colorfulos.tests'
+            applicationId 'com.aoleyun.os'
+            testApplicationId 'com.aoleyun.os.tests'
         }
 
         l3go {
             dimension "app"
-            applicationId 'com.android.colorfulos'
-            testApplicationId 'com.android.colorfulos.tests'
+            applicationId 'com.aoleyun.os'
+            testApplicationId 'com.aoleyun.os.tests'
         }
 
         /*withQuickstep {
@@ -250,6 +273,8 @@ repositories {
 }
 
 dependencies {
+    compileOnly files('libs/framework.jar')
+
     implementation "androidx.dynamicanimation:dynamicanimation:${ANDROID_X_VERSION}"
     implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
     implementation "androidx.preference:preference:${ANDROID_X_VERSION}"
@@ -277,20 +302,45 @@ dependencies {
     androidTestImplementation "androidx.annotation:annotation:${ANDROID_X_VERSION}"
 
     //RxJava和Retrofit
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.8'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.12'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
-
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
+    //gson
     implementation 'com.google.code.gson:gson:2.8.7'
-
+    //mmkv
+    implementation 'com.tencent:mmkv-static:1.2.10'
     //极光推送
     implementation 'cn.jiguang.sdk:jpush:3.8.6'  // 此处以JPush 3.8.6 版本为例。
     implementation 'cn.jiguang.sdk:jcore:2.6.0'  // 此处以JCore 2.6.0 版本为例。
     //下载
     implementation 'me.laoyuyu.aria:core:3.8.16'
     annotationProcessor 'me.laoyuyu.aria:compiler:3.8.16'
+    //工具类
+    implementation 'com.blankj:utilcodex:1.30.6'
+}
+
+preBuild {
+    doLast {
+        def imlFile = file(project.name + ".iml")
+        println 'Change ' + project.name + '.iml order'
+        try {
+            def parsedXml = (new XmlParser()).parse(imlFile)
+            def jdkNode = parsedXml.component[1].orderEntry.find { it.'@type' == 'jdk' }
+            parsedXml.component[1].remove(jdkNode)
+            def sdkString = "Android API " + android.compileSdkVersion.substring("android-".length()) + " Platform"
+            println 'what' + sdkString
+            new Node(parsedXml.component[1], 'orderEntry', ['type': 'jdk', 'jdkName': sdkString, 'jdkType': 'Android SDK'])
+            groovy.xml.XmlUtil.serialize(parsedXml, new FileOutputStream(imlFile))
+        } catch (FileNotFoundException e) {
+            // nop, iml not found
+            println "no iml found"
+        }
+    }
+    //https://www.pianshen.com/article/93481144911/
+    //https://blog.csdn.net/dhl_1986/article/details/102856026
+    //使用系统编译后的framework.jar
 }
 
 protobuf {
@@ -303,9 +353,9 @@ protobuf {
                 task.builtins {
                     remove java
                     javanano {
-                        option "java_package=launcher_log_extension.proto|com.android.colorfulos.userevent.nano"
-                        option "java_package=launcher_log.proto|com.android.colorfulos.userevent.nano"
-                        option "java_package=launcher_dump.proto|com.android.colorfulos.model.nano"
+                        option "java_package=launcher_log_extension.proto|com.aoleyun.os.userevent.nano"
+                        option "java_package=launcher_log.proto|com.aoleyun.os.userevent.nano"
+                        option "java_package=launcher_dump.proto|com.aoleyun.os.model.nano"
                         option "enum_style=java"
                     }
                 }