更多页面 图标增加 推送不同页面功能添加

diff --git a/.gitignore b/.gitignore
index d360db4..8551853 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,5 @@ typings/
 # ide
 .idea/*
 
+
+!.idea/*
\ No newline at end of file

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644 (file)
index 0000000..78c2369
Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644 (file)
index 0000000..681f41a
--- /dev/null
+++ b/.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>
\ No newline at end of file

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644 (file)
index 0000000..16dedfe
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="1.8" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file

diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644 (file)
index 0000000..e208459
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file

diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644 (file)
index 0000000..fa7d7ab
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/mobile.iml" filepath="$PROJECT_DIR$/.idea/modules/mobile.iml" group="mobile" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

diff --git a/.idea/modules/mobile.iml b/.idea/modules/mobile.iml
new file mode 100644 (file)
index 0000000..3ad4925
--- /dev/null
+++ b/.idea/modules/mobile.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="mobile" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../..">
+      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644 (file)
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644 (file)
index 0000000..bde36b6
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="b392769a-0bd6-41ea-bb17-fbefaa70f2e8" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ExternalProjectsData">
+    <projectState path="$PROJECT_DIR$">
+      <ProjectState />
+    </projectState>
+  </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <projects_view />
+      </state>
+    </system>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="1eLWiAzaeqGKRph6v4mrkZPGjpb" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/platforms/android" />
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
+      <option name="TEST_OBJECT" value="class" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <method v="2">
+        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="b392769a-0bd6-41ea-bb17-fbefaa70f2e8" name="Default Changelist" comment="" />
+      <created>1594101478069</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1594101478069</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="191" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1594797742072">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="191" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1280.680@0.0.1280.680" timestamp="1594797742072" />
+    <state x="496" y="105" key="AndroidProcessChooserDialog" timestamp="1594797522624">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="496" y="105" key="AndroidProcessChooserDialog/0.0.1280.680@0.0.1280.680" timestamp="1594797522624" />
+    <state x="421" y="95" key="FileChooserDialogImpl" timestamp="1594797895984">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="421" y="95" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1594797895984" />
+    <state width="254" height="198" key="RunAnythingAction_Filter_Popup" timestamp="1594796708793">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state width="254" height="198" key="RunAnythingAction_Filter_Popup/0.0.1280.680@0.0.1280.680" timestamp="1594796708793" />
+    <state x="110" y="120" width="1060" height="440" key="com.android.tools.idea.avdmanager.AvdListDialog" timestamp="1594368044484">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="110" y="120" width="1060" height="440" key="com.android.tools.idea.avdmanager.AvdListDialog/0.0.1280.680@0.0.1280.680" timestamp="1594368044484" />
+    <state x="324" y="164" key="com.intellij.ide.util.TipDialog" timestamp="1594796689148">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="324" y="164" key="com.intellij.ide.util.TipDialog/0.0.1280.680@0.0.1280.680" timestamp="1594796689148" />
+    <state x="297" y="153" key="run.anything.popup" timestamp="1594797548672">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="297" y="153" key="run.anything.popup/0.0.1280.680@0.0.1280.680" timestamp="1594797548672" />
+  </component>
+</project>
\ No newline at end of file

diff --git a/www/img/icon_attendance.png b/www/img/icon_attendance.png
new file mode 100644 (file)
index 0000000..83f9f1d
Binary files /dev/null and b/www/img/icon_attendance.png differ

diff --git a/www/img/icon_conference.png b/www/img/icon_conference.png
new file mode 100644 (file)
index 0000000..53cb52b
Binary files /dev/null and b/www/img/icon_conference.png differ

diff --git a/www/js/mainmenu.js b/www/js/mainmenu.js
index eacec44..a8a5e2d 100644 (file)
--- a/www/js/mainmenu.js
+++ b/www/js/mainmenu.js
@@ -8,16 +8,32 @@ var app = {
              console.log(event.registrationId)
         }, false)
         document.addEventListener("jpush.openNotification", function (event) {
-          var refno
+          var refno,msgtype
+                 var userid = window.localStorage.getItem("userid");
+                 var baseUrl = "https://yy.dlsmk.cn/wisdompolice/app"
           console.log("openNotify:"+event);
           if(device.platform == "Android") {
-            refno = event.extras.refno
+                       msgtype = event.extras.msgtype
+                       if (msgtype ==="conference"){
+                               window.location= baseUrl + "/conference/signupconference?custid="+userid;
+                       }else if(msgtype ==="atte1"){
+                               window.location= baseUrl + "/atte/reviewindex?custid="+userid;
+                       }else if(msgtype ==="atte2"){
+                               window.location= baseUrl + "/atte/searchindex?custid="+userid;
+                       }else if(msgtype ==="atte3"){
+                               window.location= baseUrl + "/atte/reviewClock?custid="+userid;
+                       }else if(msgtype ==="atte4"){
+                               window.location= baseUrl + "/atte/clockhisindex?custid="+userid;
+                       }else{
+                               refno = event.extras.refno
+                               app.openBill(refno);
+                       }
           } else {
             refno = event.refno
             window.JPush.setApplicationIconBadgeNumber(0);
+                       app.openBill(refno);
           }
-          app.openBill(refno);
-          console.log("openNotify:"+refno);
+          //console.log("openNotify:"+refno);
         }, false)
     },
     openBill:function(billno){

diff --git a/www/js/more.js b/www/js/more.js
index bd4cc2a..6c41713 100644 (file)
--- a/www/js/more.js
+++ b/www/js/more.js
@@ -34,11 +34,16 @@ var app = {
             //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
             showRet("https://yy.dlsmk.cn/wisdompolice/app/doordtl?custid="+userid);
         })
-        $("#moreBtn8").click(function(){
+        $("#moreBtn8").click(function(){ //考勤记录
             //window.location = "more.html";
             //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
-            showRet("https://yy.dlsmk.cn/wisdompolice/app/doordtl?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/attedtl?custid="+userid);
         })
+               $("#moreBtn9").click(function(){ //会议记录
+                   //window.location = "more.html";
+                   //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
+                   showRet("https://yy.dlsmk.cn/wisdompolice/app/conference/conferencedtl?custid="+userid);
+               })
         $("#moreBtn2").click(function(){
             //window.location = "more.html";
             //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);

diff --git a/www/more.html b/www/more.html
index 72f6702..a97d9d6 100644 (file)
--- a/www/more.html
+++ b/www/more.html
@@ -51,12 +51,16 @@
             </div>
              <div class="aui-col-xs-3" id="moreBtn7">
                <div class="center-in"><img src="img/icon_more7.png" style="width:28px;height: 28px"></div>
-               <div class="aui-grid-label" style="margin-top:10px;">其他记录</div>
+               <div class="aui-grid-label" style="margin-top:10px;">门禁记录</div>
             </div>
-            <div class="aui-col-xs-3" id="moreBtn8" style="display: none">
-               <div class="center-in"><img src="img/icon_bill.png" style="width:28px;height: 28px"></div>
+            <div class="aui-col-xs-3" id="moreBtn8">
+               <div class="center-in"><img src="img/icon_conference.png" style="width:28px;height: 28px"></div>
                <div class="aui-grid-label" style="margin-top:10px;">考勤记录</div>
             </div>
+                       <div class="aui-col-xs-3" id="moreBtn9">
+                          <div class="center-in"><img src="img/icon_attendance.png" style="width:28px;height: 28px"></div>
+                          <div class="aui-grid-label" style="margin-top:10px;">会议记录</div>
+                       </div>
         </div>
     </section>