supervision-android.git

版本1.1.14.02

riku

2020-08-21 44b39e5f10c9ad724e2daa26183bac3d1fc1e349

版本1.1.14.02

已添加10个文件

	.gitignore	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/assetWizardSettings.xml	46 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/codeStyles/Project.xml	116 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/dictionaries/feiyu.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/encodings.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/gradle.xml	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/inspectionProfiles/Project_Default.xml	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/misc.xml	67 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/runConfigurations.xml	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/vcs.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .gitignore

对比新文件
@@ -0,0 +1,11 @@
*.iml
.gradle
/local.properties
/.idea/caches/build_file_checksums.ser
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
.DS_Store
/build
/captures
.externalNativeBuild

 .idea/assetWizardSettings.xml

对比新文件
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="WizardSettings">
    <option name="children">
      <map>
        <entry key="vectorWizard">
          <value>
            <PersistentState>
              <option name="children">
                <map>
                  <entry key="vectorAssetStep">
                    <value>
                      <PersistentState>
                        <option name="children">
                          <map>
                            <entry key="clipartAsset">
                              <value>
                                <PersistentState>
                                  <option name="values">
                                    <map>
                                      <entry key="url" value="jar:file:/C:/Program%20Files/Android/Android%20Studio/plugins/android/lib/android.jar!/images/material_design_icons/social/ic_group_black_24dp.xml" />
                                    </map>
                                  </option>
                                </PersistentState>
                              </value>
                            </entry>
                          </map>
                        </option>
                        <option name="values">
                          <map>
                            <entry key="outputName" value="ic_group_black_24dp" />
                            <entry key="sourceFile" value="C:\Users\feiyu" />
                          </map>
                        </option>
                      </PersistentState>
                    </value>
                  </entry>
                </map>
              </option>
            </PersistentState>
          </value>
        </entry>
      </map>
    </option>
  </component>
</project>

 .idea/codeStyles/Project.xml

对比新文件
@@ -0,0 +1,116 @@
<component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <codeStyleSettings language="XML">
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
      </indentOptions>
      <arrangement>
        <rules>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>xmlns:android</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>xmlns:.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:id</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:name</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>name</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>style</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
              <order>ANDROID_ATTRIBUTE_ORDER</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>.*</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
        </rules>
      </arrangement>
    </codeStyleSettings>
  </code_scheme>
</component>

 .idea/dictionaries/feiyu.xml

对比新文件
@@ -0,0 +1,3 @@
<component name="ProjectDictionaryState">
  <dictionary name="feiyu" />
</component>

 .idea/encodings.xml

对比新文件
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
</project>

 .idea/gradle.xml

对比新文件
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="GradleMigrationSettings" migrationVersion="1" />
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
        <option name="delegatedBuild" value="false" />
        <option name="testRunner" value="PLATFORM" />
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
            <option value="$PROJECT_DIR$/calendarview" />
            <option value="$PROJECT_DIR$/multi-image-selector" />
          </set>
        </option>
        <option name="resolveModulePerSourceSet" value="false" />
      </GradleProjectSettings>
    </option>
  </component>
</project>

 .idea/inspectionProfiles/Project_Default.xml

对比新文件
@@ -0,0 +1,9 @@
<component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
    <inspection_tool class="SerializableHasSerialVersionUIDField" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="ignoreAnonymousInnerClasses" value="false" />
      <option name="superClassString" value="" />
    </inspection_tool>
  </profile>
</component>

 .idea/misc.xml

对比新文件
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="EntryPointsManager">
    <list size="1">
      <item index="0" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
    </list>
  </component>
  <component name="NullableNotNullManager">
    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
    <option name="myNullables">
      <value>
        <list size="12">
          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
          <item index="10" class="java.lang.String" itemvalue="android.annotation.Nullable" />
          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
        </list>
      </value>
    </option>
    <option name="myNotNulls">
      <value>
        <list size="11">
          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
          <item index="9" class="java.lang.String" itemvalue="android.annotation.NonNull" />
          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
        </list>
      </value>
    </option>
  </component>
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
  <component name="SvnBranchConfigurationManager">
    <option name="myConfigurationMap">
      <map>
        <entry key="$PROJECT_DIR$">
          <value>
            <SvnBranchConfiguration>
              <option name="branchUrls">
                <list>
                  <option value="https://192.168.1.200/svn/supervision_online/supervision_online/branches" />
                  <option value="https://192.168.1.200/svn/supervision_online/supervision_online/tags" />
                </list>
              </option>
              <option name="trunkUrl" value="https://192.168.1.200/svn/supervision_online/supervision_online/trunk" />
            </SvnBranchConfiguration>
          </value>
        </entry>
      </map>
    </option>
  </component>
</project>

 .idea/runConfigurations.xml

对比新文件
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="RunConfigurationProducerService">
    <option name="ignoredProducers">
      <set>
        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
      </set>
    </option>
  </component>
</project>

 .idea/vcs.xml

对比新文件
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="$PROJECT_DIR$" vcs="Git" />
  </component>
</project>

对比新文件
			@@ -0,0 +1,11 @@
			*.iml
			.gradle
			/local.properties
			/.idea/caches/build_file_checksums.ser
			/.idea/libraries
			/.idea/modules.xml
			/.idea/workspace.xml
			.DS_Store
			/build
			/captures
			.externalNativeBuild

对比新文件
			@@ -0,0 +1,46 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<project version="4">
			<component name="WizardSettings">
			<option name="children">
			<map>
			<entry key="vectorWizard">
			<value>
			<PersistentState>
			<option name="children">
			<map>
			<entry key="vectorAssetStep">
			<value>
			<PersistentState>
			<option name="children">
			<map>
			<entry key="clipartAsset">
			<value>
			<PersistentState>
			<option name="values">
			<map>
			<entry key="url" value="jar:file:/C:/Program%20Files/Android/Android%20Studio/plugins/android/lib/android.jar!/images/material_design_icons/social/ic_group_black_24dp.xml" />
			</map>
			</option>
			</PersistentState>
			</value>
			</entry>
			</map>
			</option>
			<option name="values">
			<map>
			<entry key="outputName" value="ic_group_black_24dp" />
			<entry key="sourceFile" value="C:\Users\feiyu" />
			</map>
			</option>
			</PersistentState>
			</value>
			</entry>
			</map>
			</option>
			</PersistentState>
			</value>
			</entry>
			</map>
			</option>
			</component>
			</project>

对比新文件
			@@ -0,0 +1,116 @@
			<component name="ProjectCodeStyleConfiguration">
			<code_scheme name="Project" version="173">
			<codeStyleSettings language="XML">
			<indentOptions>
			<option name="CONTINUATION_INDENT_SIZE" value="4" />
			</indentOptions>
			<arrangement>
			<rules>
			<section>
			<rule>
			<match>
			<AND>
			<NAME>xmlns:android</NAME>
			<XML_ATTRIBUTE />
			<XML_NAMESPACE>^$</XML_NAMESPACE>
			</AND>
			</match>
			</rule>
			</section>
			<section>
			<rule>
			<match>
			<AND>
			<NAME>xmlns:.*</NAME>
			<XML_ATTRIBUTE />
			<XML_NAMESPACE>^$</XML_NAMESPACE>
			</AND>
			</match>
			<order>BY_NAME</order>
			</rule>
			</section>
			<section>
			<rule>
			<match>
			<AND>
			<NAME>.*:id</NAME>
			<XML_ATTRIBUTE />
			<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
			</AND>
			</match>
			</rule>
			</section>
			<section>
			<rule>
			<match>
			<AND>
			<NAME>.*:name</NAME>
			<XML_ATTRIBUTE />
			<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
			</AND>
			</match>
			</rule>
			</section>
			<section>
			<rule>
			<match>
			<AND>
			<NAME>name</NAME>
			<XML_ATTRIBUTE />
			<XML_NAMESPACE>^$</XML_NAMESPACE>
			</AND>
			</match>
			</rule>
			</section>
			<section>
			<rule>
			<match>
			<AND>
			<NAME>style</NAME>
			<XML_ATTRIBUTE />
			<XML_NAMESPACE>^$</XML_NAMESPACE>
			</AND>
			</match>
			</rule>
			</section>
			<section>
			<rule>
			<match>
			<AND>
			<NAME>.*</NAME>
			<XML_ATTRIBUTE />
			<XML_NAMESPACE>^$</XML_NAMESPACE>
			</AND>
			</match>
			<order>BY_NAME</order>
			</rule>
			</section>
			<section>
			<rule>
			<match>
			<AND>
			<NAME>.*</NAME>
			<XML_ATTRIBUTE />
			<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
			</AND>
			</match>
			<order>ANDROID_ATTRIBUTE_ORDER</order>
			</rule>
			</section>
			<section>
			<rule>
			<match>
			<AND>
			<NAME>.*</NAME>
			<XML_ATTRIBUTE />
			<XML_NAMESPACE>.*</XML_NAMESPACE>
			</AND>
			</match>
			<order>BY_NAME</order>
			</rule>
			</section>
			</rules>
			</arrangement>
			</codeStyleSettings>
			</code_scheme>
			</component>

对比新文件
			@@ -0,0 +1,3 @@
			<component name="ProjectDictionaryState">
			<dictionary name="feiyu" />
			</component>

对比新文件
			@@ -0,0 +1,4 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<project version="4">
			<component name="Encoding" addBOMForNewFiles="with NO BOM" />
			</project>

对比新文件
			@@ -0,0 +1,23 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<project version="4">
			<component name="GradleMigrationSettings" migrationVersion="1" />
			<component name="GradleSettings">
			<option name="linkedExternalProjectsSettings">
			<GradleProjectSettings>
			<option name="delegatedBuild" value="false" />
			<option name="testRunner" value="PLATFORM" />
			<option name="distributionType" value="DEFAULT_WRAPPED" />
			<option name="externalProjectPath" value="$PROJECT_DIR$" />
			<option name="modules">
			<set>
			<option value="$PROJECT_DIR$" />
			<option value="$PROJECT_DIR$/app" />
			<option value="$PROJECT_DIR$/calendarview" />
			<option value="$PROJECT_DIR$/multi-image-selector" />
			</set>
			</option>
			<option name="resolveModulePerSourceSet" value="false" />
			</GradleProjectSettings>
			</option>
			</component>
			</project>

对比新文件
			@@ -0,0 +1,9 @@
			<component name="InspectionProjectProfileManager">
			<profile version="1.0">
			<option name="myName" value="Project Default" />
			<inspection_tool class="SerializableHasSerialVersionUIDField" enabled="true" level="WARNING" enabled_by_default="true">
			<option name="ignoreAnonymousInnerClasses" value="false" />
			<option name="superClassString" value="" />
			</inspection_tool>
			</profile>
			</component>

对比新文件
			@@ -0,0 +1,67 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<project version="4">
			<component name="EntryPointsManager">
			<list size="1">
			<item index="0" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
			</list>
			</component>
			<component name="NullableNotNullManager">
			<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
			<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
			<option name="myNullables">
			<value>
			<list size="12">
			<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
			<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
			<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
			<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
			<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
			<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
			<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
			<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
			<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
			<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
			<item index="10" class="java.lang.String" itemvalue="android.annotation.Nullable" />
			<item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
			</list>
			</value>
			</option>
			<option name="myNotNulls">
			<value>
			<list size="11">
			<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
			<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
			<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
			<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
			<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
			<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
			<item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
			<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
			<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
			<item index="9" class="java.lang.String" itemvalue="android.annotation.NonNull" />
			<item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
			</list>
			</value>
			</option>
			</component>
			<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
			<component name="SvnBranchConfigurationManager">
			<option name="myConfigurationMap">
			<map>
			<entry key="$PROJECT_DIR$">
			<value>
			<SvnBranchConfiguration>
			<option name="branchUrls">
			<list>
			<option value="https://192.168.1.200/svn/supervision_online/supervision_online/branches" />
			<option value="https://192.168.1.200/svn/supervision_online/supervision_online/tags" />
			</list>
			</option>
			<option name="trunkUrl" value="https://192.168.1.200/svn/supervision_online/supervision_online/trunk" />
			</SvnBranchConfiguration>
			</value>
			</entry>
			</map>
			</option>
			</component>
			</project>

对比新文件
			@@ -0,0 +1,12 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<project version="4">
			<component name="RunConfigurationProducerService">
			<option name="ignoredProducers">
			<set>
			<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
			<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
			<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
			</set>
			</option>
			</component>
			</project>

对比新文件
			@@ -0,0 +1,6 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<project version="4">
			<component name="VcsDirectoryMappings">
			<mapping directory="$PROJECT_DIR$" vcs="Git" />
			</component>
			</project>