Browse Source

修改项目显示名称和基础布局

___coffee_tea_or_me° 1 year ago
parent
commit
b7bd9e720a

+ 1 - 1
.idea/.name

@@ -1 +1 @@
-TYuan
+RenShou

+ 18 - 0
.idea/codeStyles/Project.xml

@@ -1,5 +1,23 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />

+ 0 - 6
.idea/compiler.xml

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

+ 2 - 2
.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_support_fragments_2_7_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments:2.7@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2c510eacbcbac11be732e82017d2462b/jetified-leakcanary-object-watcher-android-support-fragments-2.7/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2c510eacbcbac11be732e82017d2462b/jetified-leakcanary-object-watcher-android-support-fragments-2.7/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6602e75ebd973639f9810157debe6755/jetified-leakcanary-object-watcher-android-support-fragments-2.7/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6602e75ebd973639f9810157debe6755/jetified-leakcanary-object-watcher-android-support-fragments-2.7/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.leakcanary/leakcanary-object-watcher-android-support-fragments/2.7/4b7f0c8b2d2694265a56c0ab8e1daedbb421f860/leakcanary-object-watcher-android-support-fragments-2.7-javadoc.jar!/" />

+ 3 - 3
.idea/libraries/Gradle__jsc_kit_wheel_wheel_view_0_5_4_aar.xml

@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: jsc.kit.wheel:wheel-view:0.5.4@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/324c2035a1c1773aed0d2cbc34478c79/jetified-wheel-view-0.5.4/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/10ff7ca391333c7d68d4b609329ba67b/jetified-wheel-view-0.5.4/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/324c2035a1c1773aed0d2cbc34478c79/jetified-wheel-view-0.5.4/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/324c2035a1c1773aed0d2cbc34478c79/jetified-wheel-view-0.5.4/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/10ff7ca391333c7d68d4b609329ba67b/jetified-wheel-view-0.5.4/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/10ff7ca391333c7d68d4b609329ba67b/jetified-wheel-view-0.5.4/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/jsc.kit.wheel/wheel-view/0.5.4/c5aa387ad1042a950a35d7fbc499a74fa6aa0861/wheel-view-0.5.4-javadoc.jar!/" />

+ 1 - 1
app/src/main/java/com/tofly/dewater/factory/ItemHomeBeanFactory.java

@@ -60,7 +60,7 @@ public class ItemHomeBeanFactory {
             setItemBean("隐患上报", R.mipmap.ic_main_trouble, UiTroubleList.class, false);
             /*抢维修工单 仁寿排水好像没有*/
             if (!NetRequestURL.isExternaRs)
-                setItemBean("抢维修工单", R.mipmap.icon_repir, UiRepair.class, false);
+                    setItemBean("抢维修工单", R.mipmap.icon_repir, UiRepair.class, false);
         }
 
         if (MyApp.getInstance().getPower().isXunJianJiHua()) {

BIN
build/intermediates/lint-cache/api-versions-0-33.0.3.bin


+ 3 - 2
latte-core/src/main/java/com/tofly/latte_core/base/BaseActivity.java

@@ -63,11 +63,12 @@ public abstract class BaseActivity<P extends IPresenter> extends RxAppCompatActi
         View view = setLayoutView();
         if (view == null) {
             setContentView(setLayout());
-        }else {
+        } else {
             setContentView(view);
         }
     }
-    public void initToolBarBase(Toolbar toolbar){
+
+    public void initToolBarBase(Toolbar toolbar) {
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {