svn迁移git

.gitignore

@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/.name

@@ -0,0 +1 @@
+CellsysArt

.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="17" />
+  </component>
+</project>

.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>

.idea/deploymentTargetSelector.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-01-02T02:13:55.421437200Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Airkoon_wm\.android\avd\Medium_Phone_API_35.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>

.idea/gradle.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/AirkoonBaseProLib" />
+            <option value="$PROJECT_DIR$/CellsysRxSDK" />
+            <option value="$PROJECT_DIR$/TaskQueue" />
+            <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/common_base" />
+            <option value="$PROJECT_DIR$/editor" />
+            <option value="$PROJECT_DIR$/module_main" />
+            <option value="$PROJECT_DIR$/module_user" />
+          </set>
+        </option>
+        <option name="resolveExternalAnnotations" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

.idea/migrations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,9 @@
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

AirkoonBaseProLib/build.gradle

@@ -0,0 +1,54 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 30
+    defaultConfig {
+        minSdkVersion 24
+        targetSdkVersion 28
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        demo {
+
+        }
+    }
+    buildFeatures {
+        dataBinding = true
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    namespace 'com.airkoon.base'
+}
+
+dependencies {
+//    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    //选图片控件
+//    api 'com.github.LuckSiege.PictureSelector:picture_library:v2.4.6'
+    api 'io.github.lucksiege:pictureselector:v2.4.6'
+//    api 'io.github.lucksiege:pictureselector:v3.10.6'
+    //glide
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
+    //qmui
+    //api 'com.qmuiteam:qmui:1.4.0'
+
+    implementation "androidx.activity:activity:1.2.0"
+    implementation "androidx.fragment:fragment:1.3.0"
+}

AirkoonBaseProLib/build/.transforms/127b7603e6601c07caa0c5b9f883b2ae/results.bin

@@ -0,0 +1 @@
+i/

AirkoonBaseProLib/build/.transforms/a9dc6195367103c1769b704787d484af/results.bin

@@ -0,0 +1 @@
+o/debug

AirkoonBaseProLib/build/generated/ap_generated_sources/debug/out/androidx/databinding/DataBindingComponent.java

@@ -0,0 +1,4 @@
+package androidx.databinding;
+
+public interface DataBindingComponent {
+}

AirkoonBaseProLib/build/generated/ap_generated_sources/debug/out/androidx/databinding/library/baseAdapters/BR.java

@@ -0,0 +1,5 @@
+package androidx.databinding.library.baseAdapters;
+
+public class BR {
+  public static int _all = 0;
+}

AirkoonBaseProLib/build/generated/ap_generated_sources/debug/out/com/airkoon/base/BR.java

@@ -0,0 +1,5 @@
+package com.airkoon.base;
+
+public class BR {
+  public static int _all = 0;
+}

AirkoonBaseProLib/build/generated/ap_generated_sources/debug/out/com/airkoon/base/DataBinderMapperImpl.java

@@ -0,0 +1,83 @@
+package com.airkoon.base;
+
+import android.util.SparseArray;
+import android.util.SparseIntArray;
+import android.view.View;
+import androidx.databinding.DataBinderMapper;
+import androidx.databinding.DataBindingComponent;
+import androidx.databinding.ViewDataBinding;
+import java.lang.Integer;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.RuntimeException;
+import java.lang.String;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class DataBinderMapperImpl extends DataBinderMapper {
+  private static final SparseIntArray INTERNAL_LAYOUT_ID_LOOKUP = new SparseIntArray(0);
+
+  @Override
+  public ViewDataBinding getDataBinder(DataBindingComponent component, View view, int layoutId) {
+    int localizedLayoutId = INTERNAL_LAYOUT_ID_LOOKUP.get(layoutId);
+    if(localizedLayoutId > 0) {
+      final Object tag = view.getTag();
+      if(tag == null) {
+        throw new RuntimeException("view must have a tag");
+      }
+    }
+    return null;
+  }
+
+  @Override
+  public ViewDataBinding getDataBinder(DataBindingComponent component, View[] views, int layoutId) {
+    if(views == null || views.length == 0) {
+      return null;
+    }
+    int localizedLayoutId = INTERNAL_LAYOUT_ID_LOOKUP.get(layoutId);
+    if(localizedLayoutId > 0) {
+      final Object tag = views[0].getTag();
+      if(tag == null) {
+        throw new RuntimeException("view must have a tag");
+      }
+      switch(localizedLayoutId) {
+      }
+    }
+    return null;
+  }
+
+  @Override
+  public int getLayoutId(String tag) {
+    if (tag == null) {
+      return 0;
+    }
+    Integer tmpVal = InnerLayoutIdLookup.sKeys.get(tag);
+    return tmpVal == null ? 0 : tmpVal;
+  }
+
+  @Override
+  public String convertBrIdToString(int localId) {
+    String tmpVal = InnerBrLookup.sKeys.get(localId);
+    return tmpVal;
+  }
+
+  @Override
+  public List<DataBinderMapper> collectDependencies() {
+    ArrayList<DataBinderMapper> result = new ArrayList<DataBinderMapper>(1);
+    result.add(new androidx.databinding.library.baseAdapters.DataBinderMapperImpl());
+    return result;
+  }
+
+  private static class InnerBrLookup {
+    static final SparseArray<String> sKeys = new SparseArray<String>(1);
+
+    static {
+      sKeys.put(0, "_all");
+    }
+  }
+
+  private static class InnerLayoutIdLookup {
+    static final HashMap<String, Integer> sKeys = new HashMap<String, Integer>(0);
+  }
+}

AirkoonBaseProLib/build/generated/data_binding_trigger/debug/com/airkoon/base/DataBindingTriggerClass.java

@@ -0,0 +1,4 @@
+package com.airkoon.base;
+
+@androidx.databinding.BindingBuildInfo
+public class DataBindingTriggerClass {}

AirkoonBaseProLib/build/generated/source/buildConfig/debug/com/airkoon/base/BuildConfig.java

@@ -0,0 +1,10 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.airkoon.base;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.airkoon.base";
+  public static final String BUILD_TYPE = "debug";
+}

AirkoonBaseProLib/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.airkoon.base" >
+
+    <uses-sdk android:minSdkVersion="24" />
+
+</manifest>

AirkoonBaseProLib/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json

@@ -0,0 +1,18 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
+    "kind": "Directory"
+  },
+  "applicationId": "com.airkoon.base",
+  "variantName": "debug",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "outputFile": "AndroidManifest.xml"
+    }
+  ],
+  "elementType": "File"
+}

AirkoonBaseProLib/build/intermediates/aar_metadata/debug/aar-metadata.properties

@@ -0,0 +1,5 @@
+aarFormatVersion=1.0
+aarMetadataVersion=1.0
+minCompileSdk=1
+minCompileSdkExtension=0
+minAndroidGradlePluginVersion=1.0.0

AirkoonBaseProLib/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

@@ -0,0 +1 @@
+{"compiler-4.9.0.jar (com.github.bumptech.glide:compiler:4.9.0)":"INCREMENTAL_AP","databinding-compiler-8.0.0.jar (androidx.databinding:databinding-compiler:8.0.0)":"INCREMENTAL_AP"}

AirkoonBaseProLib/build/intermediates/data_binding_artifact/debug/com.airkoon.base-setter_store.json

@@ -0,0 +1 @@
+{"version":5,"adapterMethods":{"adapter":[[{"viewType":"androidx.recyclerview.widget.RecyclerView","valueType":"com.airkoon.base.BaseBindingAdapter"},{"type":"com.airkoon.base.databinding.MyDataBindingAdapter","method":"setRecycleViewAdapter","requiresOldValue":false,"isStatic":true,"componentClass":null}]],"android:layout_alignParentRight":[[{"viewType":"android.view.View","valueType":"boolean"},{"type":"com.airkoon.base.databinding.MyDataBindingAdapter","method":"setAlignParentRight","requiresOldValue":false,"isStatic":true,"componentClass":null}]],"android:layout_toRightOf":[[{"viewType":"android.view.View","valueType":"int"},{"type":"com.airkoon.base.databinding.MyDataBindingAdapter","method":"setToRightOf","requiresOldValue":false,"isStatic":true,"componentClass":null}]],"android:src":[[{"viewType":"android.widget.ImageView","valueType":"int"},{"type":"com.airkoon.base.databinding.ImageViewAttrAdapter","method":"setSrc","requiresOldValue":false,"isStatic":true,"componentClass":null}]],"imageUrl":[[{"viewType":"android.widget.ImageView","valueType":"java.lang.String"},{"type":"com.airkoon.base.databinding.MyDataBindingAdapter","method":"loadimage","requiresOldValue":false,"isStatic":true,"componentClass":null}]],"textWatcher":[[{"viewType":"android.widget.EditText","valueType":"com.airkoon.base.databinding.BaseTextWatcher"},{"type":"com.airkoon.base.databinding.MyDataBindingAdapter","method":"addTextWatcher","requiresOldValue":false,"isStatic":true,"componentClass":null}]]},"renamedMethods":{},"conversionMethods":{},"untaggableTypes":{},"multiValueAdapters":[[{"viewType":"androidx.recyclerview.widget.RecyclerView","attributes":["adapter","divider_left","divider_top","divider_right","divider_bottom"],"parameterTypes":["com.airkoon.base.BaseBindingAdapter","int","int","int","int"],"requireAll":false,"attributeIndices":{"adapter":0,"divider_bottom":4,"divider_left":1,"divider_right":3,"divider_top":2}},{"type":"com.airkoon.base.databinding.MyDataBindingAdapter","method":"setRecycleViewAdapter","requiresOldValue":false,"isStatic":true,"componentClass":null}]],"inverseAdapters":{},"inverseMethods":{},"twoWayMethods":{},"useAndroidX":true}

AirkoonBaseProLib/build/intermediates/data_binding_export_class_list/debug/out.jar

@@ -0,0 +1 @@
+androidx.databinding.DataBindingComponent

AirkoonBaseProLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -0,0 +1,16 @@
+#Fri Nov 08 14:06:53 CST 2024
+com.airkoon.base.AirkoonBaseProLib-main-6\:/drawable-xhdpi/ic_add_image.png=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\ic_add_image.png
+com.airkoon.base.AirkoonBaseProLib-main-6\:/drawable-xhdpi/ic_back_arrow.png=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\ic_back_arrow.png
+com.airkoon.base.AirkoonBaseProLib-main-6\:/drawable-xhdpi/ic_delete_menu.png=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\ic_delete_menu.png
+com.airkoon.base.AirkoonBaseProLib-main-6\:/drawable-xhdpi/ic_orange_arrow_down.png=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\ic_orange_arrow_down.png
+com.airkoon.base.AirkoonBaseProLib-main-6\:/drawable-xhdpi/ic_orange_arrow_up.png=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\ic_orange_arrow_up.png
+com.airkoon.base.AirkoonBaseProLib-main-6\:/drawable/ic_back.xml=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\drawable\\ic_back.xml
+com.airkoon.base.AirkoonBaseProLib-main-6\:/drawable/ic_fanhui.xml=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\drawable\\ic_fanhui.xml
+com.airkoon.base.AirkoonBaseProLib-main-6\:/drawable/picture_icon_shadow_bg.xml=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\drawable\\picture_icon_shadow_bg.xml
+com.airkoon.base.AirkoonBaseProLib-main-6\:/drawable/picture_icon_video.xml=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\drawable\\picture_icon_video.xml
+com.airkoon.base.AirkoonBaseProLib-main-6\:/drawable/picture_list_sina_text_color.xml=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\drawable\\picture_list_sina_text_color.xml
+com.airkoon.base.AirkoonBaseProLib-main-6\:/layout/activity_base.xml=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\layout\\activity_base.xml
+com.airkoon.base.AirkoonBaseProLib-main-6\:/layout/activity_base_fragment.xml=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\layout\\activity_base_fragment.xml
+com.airkoon.base.AirkoonBaseProLib-main-6\:/layout/fragment_base.xml=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\layout\\fragment_base.xml
+com.airkoon.base.AirkoonBaseProLib-main-6\:/layout/fragment_base_list.xml=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\layout\\fragment_base_list.xml
+com.airkoon.base.AirkoonBaseProLib-main-6\:/layout/gv_filter_image.xml=D\:\\mycode\\android_artprofessor\\trunk\\AirkoonBaseProLib\\build\\intermediates\\packaged_res\\debug\\layout\\gv_filter_image.xml

AirkoonBaseProLib/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr format="enum" name="statu_bar_font_mode">
+        <enum name="dark_mode" value="0"/>
+        <enum name="light_mode" value="1"/>
+    </attr>
+    <attr format="color" name="toolbarBackground"/>
+    <attr format="color" name="toolbarMenuBackground"/>
+    <attr format="color" name="toolbarMenuTextColor"/>
+    <attr format="dimension" name="toolbarMenuTextsize"/>
+    <attr format="color" name="toolbarMoreButtonColor"/>
+    <attr format="reference" name="toolbarNavigationIcon"/>
+    <attr format="dimension" name="toolbarNavigationInteval"/>
+    <attr format="color" name="toolbarTextColor"/>
+    <attr format="dimension" name="toolbarTextsize"/>
+    <color name="app_color_53575e">#53575e</color>
+    <color name="app_color_9b">#9b9b9b</color>
+    <color name="app_color_black">#000000</color>
+    <color name="app_color_blue">#7D7DFF</color>
+    <color name="app_color_c51">#f94c51</color>
+    <color name="app_color_divider">#B6B6B6</color>
+    <color name="app_color_e0ff6100">#E0FF6100</color>
+    <color name="app_color_f6">#f6f6f6</color>
+    <color name="app_color_fa">#fafafa</color>
+    <color name="app_color_green">#43c117</color>
+    <color name="app_color_grey">#393a3e</color>
+    <color name="app_color_red">#FF0000</color>
+    <color name="app_color_transparent">#00000000</color>
+    <color name="app_color_white">#FFFFFF</color>
+    <color name="colorAccent">#000000</color>
+    <color name="colorPrimary">#2d8cf0</color>
+    <color name="colorPrimaryDark">#2d8cf0</color>
+    <color name="common_azure">#00BDB5</color>
+    <color name="common_azure_shallow">#D1F2F2</color>
+    <color name="common_background">#f8f8f9</color>
+    <color name="common_border">#dddee1</color>
+    <color name="common_brown">#A4683C</color>
+    <color name="common_brown_shallow">#EDE3DA</color>
+    <color name="common_content">#495060</color>
+    <color name="common_darkgreen">#30B843</color>
+    <color name="common_darkgreen_shallow">#D5F1DC</color>
+    <color name="common_darkprimary">#2b85e4</color>
+    <color name="common_disabled">#bbbec4</color>
+    <color name="common_divider">#e9eaec</color>
+    <color name="common_error">#ed3f14</color>
+    <color name="common_grass_gray">#EFF0F1</color>
+    <color name="common_hibiscus">#9D1BB3</color>
+    <color name="common_hibiscus_shallow">#EAD5F1</color>
+    <color name="common_lightprimary">#5cadff</color>
+    <color name="common_olivegreen">#89C933</color>
+    <color name="common_olivegreeng_shallow">#E6F5D9</color>
+    <color name="common_orange">#F57B00</color>
+    <color name="common_orange_shallow">#FDE8D2</color>
+    <color name="common_pitch_black">#323334</color>
+    <color name="common_pitch_blackash">#859AA5</color>
+    <color name="common_pitch_blackash_shallow">#E6EBEF</color>
+    <color name="common_powder">#E23499</color>
+    <color name="common_powder_shallow">#F7D7EC</color>
+    <color name="common_primary">#2d8cf0</color>
+    <color name="common_purple">#6632BA</color>
+    <color name="common_purple_shallow">#E0D8F2</color>
+    <color name="common_red">#E64C3D</color>
+    <color name="common_red_shallow">#FADBDA</color>
+    <color name="common_seablue">#007EFF</color>
+    <color name="common_seablue_shallow">#CAE6FF</color>
+    <color name="common_sub">#80848f</color>
+    <color name="common_success">#19be6b</color>
+    <color name="common_title">#1c2438</color>
+    <color name="common_warning">#ff9900</color>
+    <color name="common_white">#FEFFFF</color>
+    <color name="common_yellow">#FCC000</color>
+    <color name="common_yellowy_shallow">#FDF3CC</color>
+    <color name="topbar_title_color">#FEFFFF</color>
+    <dimen name="common_back_icon_height">30dp</dimen>
+    <dimen name="common_conners_radius">10dp</dimen>
+    <dimen name="common_divider_height">1px</dimen>
+    <dimen name="common_padding">10dp</dimen>
+    <dimen name="common_textsize">14dp</dimen>
+    <dimen name="common_topbar_height">50dp</dimen>
+    <dimen name="title_textsize">18dp</dimen>
+    <item name="top_bar_left_btn" type="id"/>
+    <item name="top_bar_right_btn" type="id"/>
+    <item name="top_bar_right_view" type="id"/>
+    <string name="common_loading_tips">加载中...</string>
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+        
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+
+        
+        
+
+        
+        <item name="android:statusBarColor">@color/common_white</item>
+        <item name="android:windowBackground">@color/common_white</item>
+        <item name="android:windowIsTranslucent">true</item>
+        
+        <item name="toolbarTextsize">18sp</item>
+        <item name="toolbarTextColor">#212121</item>
+        <item name="toolbarBackground">@color/common_white</item>
+        <item name="toolbarNavigationIcon">@drawable/ic_fanhui</item>
+        <item name="toolbarNavigationInteval">0dp</item>
+        <item name="toolbarMoreButtonColor">#212121</item>
+        <item name="toolbarMenuBackground">@color/common_white</item>
+        <item name="toolbarMenuTextsize">14sp</item>
+        <item name="toolbarMenuTextColor">#212121</item>
+        
+        <item name="statu_bar_font_mode">light_mode</item>
+    </style>
+    <style name="ChatTextStyle">
+        <item name="android:textSize">14sp</item>
+    </style>
+    <style name="CommonTextStyle">
+        <item name="android:textSize">@dimen/common_textsize</item>
+        <item name="android:textColor">@color/common_content</item>
+        <item name="android:padding">@dimen/common_padding</item>
+    </style>
+    <style name="DefaultThemeOfToolBar">
+        
+        <item name="android:statusBarColor">@color/common_white</item>
+        <item name="android:windowBackground">@color/common_white</item>
+        <item name="android:windowIsTranslucent">true</item>
+        
+        <item name="toolbarTextsize">18sp</item>
+        <item name="toolbarTextColor">#212121</item>
+        <item name="toolbarBackground">@color/common_white</item>
+        <item name="toolbarNavigationIcon">@drawable/ic_fanhui</item>
+        <item name="toolbarNavigationInteval">0dp</item>
+        <item name="toolbarMoreButtonColor">#212121</item>
+        <item name="toolbarMenuBackground">@color/common_white</item>
+        <item name="toolbarMenuTextsize">14sp</item>
+        <item name="toolbarMenuTextColor">#212121</item>
+        
+        <item name="statu_bar_font_mode">light_mode</item>
+    </style>
+    <style name="MyToolBar" parent="Widget.AppCompat.Toolbar">
+        
+        <item name="titleTextAppearance">@style/MyToolBar.Title</item>
+        
+        <item name="android:background">?attr/toolbarBackground</item>
+        
+        <item name="navigationIcon">?attr/toolbarNavigationIcon</item>
+        
+        <item name="titleTextColor">?attr/toolbarTextColor</item>
+        
+        <item name="contentInsetStartWithNavigation">?attr/toolbarNavigationInteval</item>
+    </style>
+    <style name="MyToolBar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textSize">?attr/toolbarTextsize</item>
+    </style>
+    <style name="OverflowMenuStyle" parent="Widget.AppCompat.Light.PopupMenu.Overflow">
+        <item name="overlapAnchor">false</item>  
+    </style>
+    <style name="ToolBarTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        
+        <item name="colorControlNormal">?attr/toolbarMoreButtonColor</item>
+        
+        <item name="colorButtonNormal">#333333</item>
+    </style>
+    <style name="ToolbarPopupTheme" parent="@style/ThemeOverlay.AppCompat.Dark">
+        
+        <item name="android:colorBackground">?attr/toolbarMenuBackground</item>
+        
+        <item name="android:textColor">?attr/toolbarMenuTextColor</item>
+        
+        <item name="android:textSize">?attr/toolbarMenuTextsize</item>
+        
+        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
+    </style>
+</resources>

AirkoonBaseProLib/build/intermediates/incremental/debug/packageDebugResources/merger.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res"><file name="ic_back" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\drawable\ic_back.xml" qualifiers="" type="drawable"/><file name="ic_fanhui" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\drawable\ic_fanhui.xml" qualifiers="" type="drawable"/><file name="picture_icon_shadow_bg" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\drawable\picture_icon_shadow_bg.xml" qualifiers="" type="drawable"/><file name="picture_icon_video" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\drawable\picture_icon_video.xml" qualifiers="" type="drawable"/><file name="picture_list_sina_text_color" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\drawable\picture_list_sina_text_color.xml" qualifiers="" type="drawable"/><file name="ic_add_image" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\drawable-xhdpi\ic_add_image.png" qualifiers="xhdpi-v4" type="drawable"/><file name="ic_back_arrow" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\drawable-xhdpi\ic_back_arrow.png" qualifiers="xhdpi-v4" type="drawable"/><file name="ic_delete_menu" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\drawable-xhdpi\ic_delete_menu.png" qualifiers="xhdpi-v4" type="drawable"/><file name="ic_orange_arrow_down" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\drawable-xhdpi\ic_orange_arrow_down.png" qualifiers="xhdpi-v4" type="drawable"/><file name="ic_orange_arrow_up" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\drawable-xhdpi\ic_orange_arrow_up.png" qualifiers="xhdpi-v4" type="drawable"/><file name="activity_base" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\layout\activity_base.xml" qualifiers="" type="layout"/><file name="activity_base_fragment" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\layout\activity_base_fragment.xml" qualifiers="" type="layout"/><file name="fragment_base" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\layout\fragment_base.xml" qualifiers="" type="layout"/><file name="fragment_base_list" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\layout\fragment_base_list.xml" qualifiers="" type="layout"/><file name="gv_filter_image" path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\layout\gv_filter_image.xml" qualifiers="" type="layout"/><file path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\values\attr_toolbar.xml" qualifiers=""><attr format="dimension" name="toolbarTextsize"/><attr format="color" name="toolbarTextColor"/><attr format="color" name="toolbarBackground"/><attr format="reference" name="toolbarNavigationIcon"/><attr format="dimension" name="toolbarNavigationInteval"/><attr format="color" name="toolbarMoreButtonColor"/><attr format="color" name="toolbarMenuBackground"/><attr format="dimension" name="toolbarMenuTextsize"/><attr format="color" name="toolbarMenuTextColor"/><attr format="enum" name="statu_bar_font_mode">
+        <enum name="dark_mode" value="0"/>
+        <enum name="light_mode" value="1"/>
+    </attr></file><file path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\values\colors.xml" qualifiers=""><color name="colorPrimary">#2d8cf0</color><color name="colorPrimaryDark">#2d8cf0</color><color name="colorAccent">#000000</color><color name="topbar_title_color">#FEFFFF</color><color name="common_white">#FEFFFF</color><color name="common_pitch_black">#323334</color><color name="common_grass_gray">#EFF0F1</color><color name="common_pitch_blackash_shallow">#E6EBEF</color><color name="common_pitch_blackash">#859AA5</color><color name="common_brown_shallow">#EDE3DA</color><color name="common_brown">#A4683C</color><color name="common_hibiscus_shallow">#EAD5F1</color><color name="common_hibiscus">#9D1BB3</color><color name="common_purple_shallow">#E0D8F2</color><color name="common_purple">#6632BA</color><color name="common_powder_shallow">#F7D7EC</color><color name="common_powder">#E23499</color><color name="common_seablue_shallow">#CAE6FF</color><color name="common_seablue">#007EFF</color><color name="common_azure_shallow">#D1F2F2</color><color name="common_azure">#00BDB5</color><color name="common_darkgreen_shallow">#D5F1DC</color><color name="common_darkgreen">#30B843</color><color name="common_olivegreeng_shallow">#E6F5D9</color><color name="common_olivegreen">#89C933</color><color name="common_yellowy_shallow">#FDF3CC</color><color name="common_yellow">#FCC000</color><color name="common_orange_shallow">#FDE8D2</color><color name="common_orange">#F57B00</color><color name="common_red_shallow">#FADBDA</color><color name="common_red">#E64C3D</color><color name="common_background">#f8f8f9</color><color name="common_divider">#e9eaec</color><color name="common_border">#dddee1</color><color name="common_disabled">#bbbec4</color><color name="common_sub">#80848f</color><color name="common_content">#495060</color><color name="common_title">#1c2438</color><color name="common_error">#ed3f14</color><color name="common_warning">#ff9900</color><color name="common_success">#19be6b</color><color name="common_darkprimary">#2b85e4</color><color name="common_lightprimary">#5cadff</color><color name="common_primary">#2d8cf0</color></file><file path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\values\dimen.xml" qualifiers=""><dimen name="title_textsize">18dp</dimen><dimen name="common_padding">10dp</dimen><dimen name="common_textsize">14dp</dimen><dimen name="common_topbar_height">50dp</dimen><dimen name="common_back_icon_height">30dp</dimen><dimen name="common_conners_radius">10dp</dimen><dimen name="common_divider_height">1px</dimen></file><file path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\values\ids.xml" qualifiers=""><item name="top_bar_left_btn" type="id"/><item name="top_bar_right_btn" type="id"/><item name="top_bar_right_view" type="id"/></file><file path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\values\select_phtot_colors.xml" qualifiers=""><color name="app_color_grey">#393a3e</color><color name="app_color_black">#000000</color><color name="app_color_f6">#f6f6f6</color><color name="app_color_fa">#fafafa</color><color name="app_color_divider">#B6B6B6</color><color name="app_color_c51">#f94c51</color><color name="app_color_green">#43c117</color><color name="app_color_53575e">#53575e</color><color name="app_color_transparent">#00000000</color><color name="app_color_white">#FFFFFF</color><color name="app_color_blue">#7D7DFF</color><color name="app_color_9b">#9b9b9b</color><color name="app_color_e0ff6100">#E0FF6100</color><color name="app_color_red">#FF0000</color></file><file path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\values\strings.xml" qualifiers=""><string name="common_loading_tips">加载中...</string></file><file path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\values\styles.xml" qualifiers=""><style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+        
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+
+        
+        
+
+        
+        <item name="android:statusBarColor">@color/common_white</item>
+        <item name="android:windowBackground">@color/common_white</item>
+        <item name="android:windowIsTranslucent">true</item>
+        
+        <item name="toolbarTextsize">18sp</item>
+        <item name="toolbarTextColor">#212121</item>
+        <item name="toolbarBackground">@color/common_white</item>
+        <item name="toolbarNavigationIcon">@drawable/ic_fanhui</item>
+        <item name="toolbarNavigationInteval">0dp</item>
+        <item name="toolbarMoreButtonColor">#212121</item>
+        <item name="toolbarMenuBackground">@color/common_white</item>
+        <item name="toolbarMenuTextsize">14sp</item>
+        <item name="toolbarMenuTextColor">#212121</item>
+        
+        <item name="statu_bar_font_mode">light_mode</item>
+    </style><style name="CommonTextStyle">
+        <item name="android:textSize">@dimen/common_textsize</item>
+        <item name="android:textColor">@color/common_content</item>
+        <item name="android:padding">@dimen/common_padding</item>
+    </style><style name="ChatTextStyle">
+        <item name="android:textSize">14sp</item>
+    </style><style name="MyToolBar" parent="Widget.AppCompat.Toolbar">
+        
+        <item name="titleTextAppearance">@style/MyToolBar.Title</item>
+        
+        <item name="android:background">?attr/toolbarBackground</item>
+        
+        <item name="navigationIcon">?attr/toolbarNavigationIcon</item>
+        
+        <item name="titleTextColor">?attr/toolbarTextColor</item>
+        
+        <item name="contentInsetStartWithNavigation">?attr/toolbarNavigationInteval</item>
+    </style><style name="MyToolBar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textSize">?attr/toolbarTextsize</item>
+    </style><style name="ToolBarTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        
+        <item name="colorControlNormal">?attr/toolbarMoreButtonColor</item>
+        
+        <item name="colorButtonNormal">#333333</item>
+    </style><style name="ToolbarPopupTheme" parent="@style/ThemeOverlay.AppCompat.Dark">
+        
+        <item name="android:colorBackground">?attr/toolbarMenuBackground</item>
+        
+        <item name="android:textColor">?attr/toolbarMenuTextColor</item>
+        
+        <item name="android:textSize">?attr/toolbarMenuTextsize</item>
+        
+        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
+    </style><style name="OverflowMenuStyle" parent="Widget.AppCompat.Light.PopupMenu.Overflow">
+        <item name="overlapAnchor">false</item>  
+    </style></file><file path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\main\res\values\themes.xml" qualifiers=""><style name="DefaultThemeOfToolBar">
+        
+        <item name="android:statusBarColor">@color/common_white</item>
+        <item name="android:windowBackground">@color/common_white</item>
+        <item name="android:windowIsTranslucent">true</item>
+        
+        <item name="toolbarTextsize">18sp</item>
+        <item name="toolbarTextColor">#212121</item>
+        <item name="toolbarBackground">@color/common_white</item>
+        <item name="toolbarNavigationIcon">@drawable/ic_fanhui</item>
+        <item name="toolbarNavigationInteval">0dp</item>
+        <item name="toolbarMoreButtonColor">#212121</item>
+        <item name="toolbarMenuBackground">@color/common_white</item>
+        <item name="toolbarMenuTextsize">14sp</item>
+        <item name="toolbarMenuTextColor">#212121</item>
+        
+        <item name="statu_bar_font_mode">light_mode</item>
+    </style></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\mycode\android_artprofessor\trunk\AirkoonBaseProLib\build\generated\res\resValues\debug"/></dataSet><mergedItems/></merger>