4-17

WeiChat/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'me.tatarka.retrolambda'
 //定义时间
 def releaseTime() {
-   // return new Date().format("yyyyMMdd.HHmm.ss")
+    // return new Date().format("yyyyMMdd.HHmm.ss")
     return new Date().format("yyyyMMdd")
 }
 //设置发布的显示的版本号
@@ -17,33 +17,33 @@ def getVersionCode() {
     if (versionFile.canRead()) {
         Properties versionProps = new Properties()
         versionProps.load(new FileInputStream(versionFile))
-        def versionName=versionProps['versionName'].toInteger()
+        def versionName = versionProps['versionName'].toInteger()
         def versionCode = versionProps['versionCode'].toInteger()
-        def debugName=versionProps['debugName'].toInteger()
+        def debugName = versionProps['debugName'].toInteger()
         def debugCode = versionProps['debugCode'].toInteger()
-        def versionArray=new Integer[4]
-    
+        def versionArray = new Integer[4]
+
         def runTasks = gradle.startParameter.taskNames        //仅在assembleRelease任务是增加版本号
-        println 'runTasks:'+runTasks
-        if(':WeiChat:assembleBaiduDebug'in runTasks){
-            println 'runTasks:'+'debug模式打包apk'
+        println 'runTasks:' + runTasks
+        if (':WeiChat:assembleBaiduDebug' in runTasks) {
+            println 'runTasks:' + 'debug模式打包apk'
             versionProps['debugCode'] = (++debugCode).toString()
             versionProps['debugName'] = (++debugName).toString()
             versionProps.store(versionFile.newWriter(), null)
         }
-        if(':WeiChat:assembleBaiduRelease'in runTasks){
-            println 'runTasks:'+'发布模式打包apk'
+        if (':WeiChat:assembleBaiduRelease' in runTasks) {
+            println 'runTasks:' + '发布模式打包apk'
             versionProps['versionCode'] = (++versionCode).toString()
             versionProps['versionName'] = (++versionName).toString()
             versionProps.store(versionFile.newWriter(), null)
         }
-        versionArray[0]=versionName
-        versionArray[1]=versionCode
-        versionArray[2]=debugName
-        versionArray[3]=debugCode
-        
+        versionArray[0] = versionName
+        versionArray[1] = versionCode
+        versionArray[2] = debugName
+        versionArray[3] = debugCode
+
         println versionArray[0].toString()
-        return  versionArray
+        return versionArray
     } else {
         throw new GradleException("Could not find version.properties!")
     }
@@ -52,7 +52,7 @@ def getVersionCode() {
 
 android {
     def versionArray = getVersionCode()
-   
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -69,7 +69,7 @@ android {
     buildToolsVersion rootProject.ext.android.buildToolsVersion
 
     defaultConfig {
-        def versionNames="v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)
+        def versionNames = "v" + versionArray[0].toString().substring(0, 1) + "." + versionArray[0].toString().substring(1, 2) + "." + versionArray[0].toString().substring(2, 3)
         applicationId project.applicationId
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
@@ -129,13 +129,13 @@ android {
                     //赋值app属性版本名
                     //variant.mergedFlavor.versionName = getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
                     //variant.mergedFlavor.versionName ="v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)
-                    def releaseInfo= "v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)+ "_" + variant.productFlavors[0].name+"(Build"+versionArray[1]+")"
+                    def releaseInfo = "v" + versionArray[0].toString().substring(0, 1) + "." + versionArray[0].toString().substring(1, 2) + "." + versionArray[0].toString().substring(2, 3) + "_" + variant.productFlavors[0].name + "(Build" + versionArray[1] + ")"
                     fileName = "WeiChat_${releaseInfo}_release.apk"
 
                 } else if (variant.buildType.name.equals('debug')) {
                     //赋值app属性版本名
-                    variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"+"_debug"
-                    def debugInfo= getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"
+                    variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name + "(Build" + versionArray[3] + ")" + "_debug"
+                    def debugInfo = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name + "(Build" + versionArray[3] + ")"
                     fileName = "WeiChat_${debugInfo}_debug.apk"
 
                 }
@@ -180,6 +180,8 @@ dependencies {
     compile project(':appbooking')
 //    compile project(':android-pdf-viewer')
     compile project(':apputils')
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'com.android.support:support-v4:26.+'
 }
 
 buildscript {

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.xzjmyk.pm.activity"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-          android:versionCode="158"
-          android:versionName="6.1.9">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.xzjmyk.pm.activity"
+    android:versionCode="158"
+    android:versionName="6.1.9">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -83,6 +83,7 @@
     <!-- android:protectionLevel="normal"> -->
     <!-- </permission> -->
 
+
     <!-- 百度自动更新 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -129,12 +130,13 @@
 
         <!-- 启动页面 -->
         <activity
-            android:icon="@drawable/uuu"
-            android:name=".ui.SplashActivity">
+            android:name=".ui.SplashActivity"
+            android:icon="@drawable/uuu">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.modular.main.SplashActivity" />
                 <action android:name="cat.ereza.customactivityoncrash.RESTART" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -154,15 +156,14 @@
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.account.LoginHistoryActivity" />
-        <!---->
+        <!--  -->
         <activity android:name=".ui.account.DataDownloadActivity">
             <intent-filter>
                 <action android:name="com.modular.main.DataDownloadActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
-
         <activity android:name=".ui.account.RegisterActivity" />
         <activity android:name=".ui.account.RegisterPasswordActivity" />
         <activity android:name=".ui.account.RegisterUserBasicInfoActivity" />
@@ -174,18 +175,21 @@
         <activity android:name=".ui.erp.activity.SaleDetailActivity">
             <intent-filter>
                 <action android:name="com.modular.plat.SaleDetailActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.erp.activity.LeaveActivity">
             <intent-filter>
                 <action android:name="com.modular.plat.LeaveActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.erp.activity.ExtraLeaveActivity">
             <intent-filter>
                 <action android:name="com.modular.plat.ExtraLeaveActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -195,6 +199,7 @@
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="com.modular.plat.WorkExtraActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -203,6 +208,7 @@
             android:label="@string/oatravel_apply">
             <intent-filter>
                 <action android:name="com.modular.plat.TravelActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -210,16 +216,17 @@
         <activity android:name=".ui.message.SelectActivity">
             <intent-filter>
                 <action android:name="com.modular.message.SelectActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.erp.activity.SaleChartActivity" />
         <activity android:name=".ui.erp.activity.QueryActivity" />
         <activity android:name=".ui.erp.activity.ErpMenActivity" />
-
         <activity android:name=".ui.circle.view.CardInfoActivity">
             <intent-filter>
                 <action android:name="com.modular.view.CardInfoActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -248,13 +255,14 @@
             android:hardwareAccelerated="false">
             <intent-filter>
                 <action android:name="com.modular.main.WebViewCommActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
         <activity android:name=".ui.erp.activity.WebViewLoadActivity">
             <intent-filter>
                 <action android:name="com.modular.main.WebViewLoadActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -265,6 +273,7 @@
         <activity android:name=".ui.platform.task.TaskActivity">
             <intent-filter>
                 <action android:name="com.modular.task.TaskActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -291,6 +300,7 @@
             android:windowSoftInputMode="stateUnspecified|adjustNothing">
             <intent-filter>
                 <action android:name="com.modular.main.MainActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -298,12 +308,14 @@
         <activity android:name=".ui.message.ChatActivity">
             <intent-filter>
                 <action android:name="com.modular.message.ChatActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.message.MucChatActivity">
             <intent-filter>
                 <action android:name="com.modular.message.MucChatActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -312,18 +324,18 @@
             android:name=".ui.message.AddContactsActivity"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden">
-
             <intent-filter>
                 <action android:name="com.modular.main.AddContactsActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
         <activity android:name="com.modular.appmessages.activity.ManageAllSubscriptionActivity" />
         <!-- 群聊 -->
         <activity android:name=".ui.groupchat.SelectContactsActivity">
             <intent-filter>
                 <action android:name="com.modular.groupchat.SelectContactsActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -340,6 +352,7 @@
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden">
             <intent-filter>
                 <action android:name="com.modilar.circle.SendShuoshuoActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -353,6 +366,7 @@
         <activity android:name=".ui.circle.BaiduMapActivity">
             <intent-filter>
                 <action android:name="com.modular.baidu.BaiduMapActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -366,11 +380,10 @@
         <activity android:name=".ui.me.LocalVideoActivity">
             <intent-filter>
                 <action android:name="com.modular.im.LocalVideoActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
-
         <activity android:name=".video.VideoRecordActivity" />
         <activity
             android:name="com.uas.appme.other.activity.CardcastActivity"
@@ -381,7 +394,6 @@
         <activity android:name=".CaptureResultActivity" />
         <!-- Tool Activity -->
 
-
         <activity
             android:name=".ui.tool.SelectConstantActivity"
             android:screenOrientation="portrait" />
@@ -393,6 +405,7 @@
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="com.modular.basic.BasicInfoActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -401,6 +414,7 @@
             android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="com.modular.tool.VideoPlayActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -409,6 +423,7 @@
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="com.modular.main.WebViewActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -420,6 +435,7 @@
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="com.modular.im.SendBaiDuLocate" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -479,6 +495,7 @@
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="com.modular.message.InstantMessageActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -495,6 +512,7 @@
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="com.modular.afilechooser.FileReceiverActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -514,6 +532,7 @@
         <activity android:name=".ui.message.SelectCardActivity">
             <intent-filter>
                 <action android:name="com.modular.main.SelectCardActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -559,11 +578,11 @@
             android:name=".video.VideoActivity"
             android:theme="@style/Theme.AppCompat.NoActionBar" />
         <activity android:name=".ui.erp.activity.CompanyActivity" />
-
         <activity android:name=".ui.circle.PhoneSelectActivity" />
         <activity android:name=".ui.erp.activity.crm.ClientActivity">
             <intent-filter>
                 <action android:name="com.modular.crm.ClientActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -581,20 +600,20 @@
             android:windowSoftInputMode="adjustUnspecified|stateHidden">
             <intent-filter>
                 <action android:name="com.modualr.appworks.OutofficeActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".ui.erp.activity.oa.OARegisterActivity"
             android:label="@string/meet_signin"
             android:theme="@style/OAThemeMeet">
             <intent-filter>
                 <action android:name="com.modular.metting.appworks.OARegisterActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".ui.erp.activity.crm.VisitReportAddActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -606,6 +625,7 @@
             android:windowSoftInputMode="adjustUnspecified|stateHidden">
             <intent-filter>
                 <action android:name="com.modular.appworks.TaskAddActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -621,7 +641,6 @@
             android:theme="@style/OAThemeSignin" />
         -->
 
-
         <activity
             android:name=".ui.erp.activity.oa.LocationMapActivity"
             android:label="@string/unoffice" />
@@ -629,7 +648,6 @@
             android:name=".ui.erp.activity.oa.AlarmaActivity"
             android:label="@string/signin_setting"
             android:theme="@style/OAThemeSignin" />
-
         <activity
             android:name=".ui.message.SubscripSetActivity"
             android:label="申请订阅" />
@@ -646,7 +664,6 @@
             android:name=".ui.erp.activity.crm.ContactManAddActivity"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
-
         <activity
             android:name=".ui.erp.activity.oa.OutLogListActivity"
             android:label="@string/my_mission"
@@ -654,10 +671,10 @@
         <activity android:name=".ui.erp.activity.crm.SubsActivity" />
         <activity android:name="com.uas.appme.other.activity.UpdateSingleTextActivity" />
         <activity android:name="com.uas.appme.other.activity.UpdateSexActivity" />
-
         <activity android:name=".ui.erp.activity.oa.OAActivity">
             <intent-filter>
                 <action android:name="com.modular.work.OAActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -707,8 +724,6 @@
             android:configChanges="keyboardHidden|orientation"
             android:exported="false"
             android:windowSoftInputMode="adjustResize" />
-
-
         <activity
             android:name="com.umeng.socialize.editorpage.ShareActivity"
             android:excludeFromRecents="true"
@@ -719,6 +734,7 @@
             android:label="@string/title_friend_add">
             <intent-filter>
                 <action android:name="com.modular.groupchat.CreateGroupActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -823,13 +839,11 @@
             android:value="EmEVqG9NiKchcSbkoGkiyG2F2rp8YNmf" />
         <!-- 百度推送相关结束 -->
 
-
         <activity
             android:name=".ui.erp.activity.oa.DestinationActivity"
             android:label="@string/activity_select_aims" />
         <!-- 动态表单 -->
 
-
         <service
             android:name=".util.oa.AutoErpService"
             android:enabled="true"
@@ -842,6 +856,7 @@
             android:label="@string/activity_select_aims">
             <intent-filter>
                 <action android:name="com.modular.form.SelectAimActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -851,15 +866,16 @@
             android:windowSoftInputMode="stateUnspecified|adjustNothing">
             <intent-filter>
                 <action android:name="com.modular.appworks.SelectRemarkActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".ui.erp.activity.oa.FlihtsTimeActivity"
             android:label="@string/work_time_setting">
             <intent-filter>
                 <action android:name="com.modular.appworks.FlihtsTimeActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -868,10 +884,10 @@
             android:label="@string/work_day_setting">
             <intent-filter>
                 <action android:name="com.modular.appworks.FlightsDateActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".ui.erp.activity.oa.SelectDepartmentActivity"
             android:configChanges="keyboardHidden|orientation"
@@ -879,6 +895,7 @@
             android:windowSoftInputMode="stateUnspecified|adjustNothing">
             <intent-filter>
                 <action android:name="com.modular.common.SelectDepartmentActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -892,11 +909,11 @@
             android:windowSoftInputMode="stateUnspecified|adjustNothing">
             <intent-filter>
                 <action android:name="com.modular.main.SelectCollisionActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-
         <!-- 消息红点模块 -->
         <activity android:name=".ui.erp.activity.oa.WaittingWorksActivity" />
         <activity
@@ -907,7 +924,6 @@
         <activity
             android:name=".ui.platform.pageforms.LeavePageActivity"
             android:label="@string/vacation_doc" />
-
         <activity
             android:name=".ui.platform.pageforms.TravelPageActivity"
             android:label="@string/travel_doc"
@@ -915,18 +931,21 @@
         <activity android:name=".ui.platform.pageforms.FormDetailActivity">
             <intent-filter>
                 <action android:name="com.modular.appwork.FormDetailActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.platform.task.TaskB2BActivity">
             <intent-filter>
                 <action android:name="com.modular.task.TaskB2BActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.platform.task.TaskAddB2BActivity">
             <intent-filter>
                 <action android:name="com.modular.task.TaskAddB2BActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -937,6 +956,7 @@
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="com.modular.oa.PlatLeaveAddActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -945,12 +965,14 @@
             android:label="导航">
             <intent-filter>
                 <action android:name="com.modular.changedealman.ChangeDealManActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity android:name="com.uas.appworks.CRM.erp.activity.TaskAddErpActivity">
             <intent-filter>
                 <action android:name="com.modular.task.TaskAddErpActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -978,36 +1000,37 @@
             android:label="@string/work_day">
             <intent-filter>
                 <action android:name="com.modular.appworks.FlihtsDateSelectActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.erp.activity.ADActivity" />
         <activity
             android:name=".ui.erp.activity.oa.AddContactsActivity"
-            android:label="@string/add_contact"></activity>
+            android:label="@string/add_contact" />
         <activity
             android:name=".ui.erp.activity.oa.AddVisitReportActivity"
             android:label="@string/visitrecord" />
-
         <activity
             android:name=".ui.me.InfoCodeActivity"
             android:label="@string/info_2dcode" />
         <activity
             android:name=".ui.me.ScanInfoResultsActivity"
             android:label="@string/Results_of_scan" />
-
         <activity
             android:name=".ui.erp.activity.secretary.SelectPContactsActivity"
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.erp.activity.secretary.BookingDetailActivity">
             <intent-filter>
                 <action android:name="com.modular.booking.BookingDetailActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.erp.activity.secretary.BookingListActivity">
             <intent-filter>
                 <action android:name="com.modular.booking.BookingListActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -1017,29 +1040,27 @@
         <activity
             android:name="com.core.utils.pictureselector.PictureSelectorDemo"
             android:label="PictureSelectorDemo" />
-
         <activity
             android:name="com.xzjmyk.pm.im.audio.FaceRecognition.FaceView.OnlineFaceDemo"
             android:label="在线人脸识别" />
         <activity android:name=".ui.erp.activity.oa.FileLoadingActivity" />
-
         <activity
             android:name=".ui.erp.activity.message.PersonalRegActivity"
             android:label="个人注册">
             <intent-filter>
                 <action android:name="com.modular.login.PersonalRegActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
         <activity android:name=".ui.me.TemperatureActivity" />
-
         <activity android:name="com.core.widget.view.selectcalendar.SelectCalendarActivity" />
         <activity
             android:name=".ui.erp.activity.oa.NavigationActivity"
             android:label="@string/navigation">
             <intent-filter>
                 <action android:name="com.modular.appworks.NavigationActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -1047,31 +1068,40 @@
             android:name="com.modular.appmessages.activity.UUSportActivity"
             android:label="@string/set_sport" />
 
-
-        <!--微信支付回调页面-->
+        <!-- 微信支付回调页面 -->
         <activity
-            android:name="com.xzjmyk.pm.activity.wxapi.WXEntryActivity"
+            android:name=".wxapi.WXEntryActivity"
             android:exported="true"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:scheme="wxd1deafafe3fd9a21" />
             </intent-filter>
         </activity>
         <activity
-            android:name="com.xzjmyk.pm.activity.wxapi.WXPayEntryActivity"
+            android:name=".wxapi.WXPayEntryActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@android:style/Theme.Translucent.NoTitleBar">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:scheme="wxd1deafafe3fd9a21" />
             </intent-filter>
         </activity>
 
-        <service android:name="com.core.service.InitializeService"/>
+        <service android:name="com.core.service.InitializeService" />
+
+        <activity
+            android:name=".ui.me.PayTestActivity"
+            android:label="支付退款测试" />
+        <activity android:name=".ui.me.PayListActivity"
+            android:label="支付退款测试"></activity>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -111,7 +111,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private RelativeLayout my_qr_code_rl;
     @ViewInject(R.id.picture_selector_rl)
     private RelativeLayout picture_selector_rl;
-
+    @ViewInject(R.id.paytest_rl)
+    private RelativeLayout paytest_rl;
 
     @ViewInject(R.id.app_friend_rl)
     private RelativeLayout app_friend_rl;
@@ -366,6 +367,12 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 return true;
             }
         });
+        paytest_rl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startActivity(new Intent(ct,PayTestActivity.class));
+            }
+        });
 
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/PayListActivity.java

@@ -0,0 +1,22 @@
+package com.xzjmyk.pm.activity.ui.me;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import com.xzjmyk.pm.activity.R;
+
+public class PayListActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_pay_list);
+        initView();
+        initData();
+    }
+
+    private void initView() {
+    }
+    private void initData() {
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/PayTestActivity.java

@@ -0,0 +1,48 @@
+package com.xzjmyk.pm.activity.ui.me;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import com.core.base.BaseActivity;
+import com.xzjmyk.pm.activity.R;
+
+public class PayTestActivity extends BaseActivity {
+    private int paytype = -1;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_pay_test);
+        initView();
+    }
+
+    private void initView() {
+        findViewById(R.id.wxpay_btn).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                paytype = 1;
+              gotoPayActivity(paytype);
+            }
+        });
+        findViewById(R.id.alipay_btn).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                paytype = 2;
+                gotoPayActivity(paytype);
+            }
+        });
+        findViewById(R.id.unionpay_btn).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                paytype = 3;
+                gotoPayActivity(paytype);
+        }
+        });
+    }
+
+    private void gotoPayActivity(int type) {
+        startActivity(new Intent(this,PayListActivity.class)
+                                    .putExtra("paytype",type));
+    }
+}

WeiChat/src/main/res/layout/activity_pay_list.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.xzjmyk.pm.activity.ui.me.PayListActivity">
+
+</android.support.constraint.ConstraintLayout>

WeiChat/src/main/res/layout/activity_pay_test.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/base_bg"
+    android:orientation="vertical"
+    >
+    <Button
+        android:id="@+id/wxpay_btn"
+        android:text="微信"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/bg_bule_btn"
+        android:gravity="center"
+        android:textColor="@color/white"
+        android:layout_marginTop="50dp"
+        android:layout_marginLeft="50dp"
+        android:layout_marginRight="50dp"
+        />
+    <Button
+        android:id="@+id/alipay_btn"
+        android:text="支付宝"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/bg_bule_btn"
+        android:gravity="center"
+        android:textColor="@color/white"
+        android:layout_marginTop="20dp"
+        android:layout_marginLeft="50dp"
+        android:layout_marginRight="50dp"
+        />
+
+    <Button
+        android:id="@+id/unionpay_btn"
+        android:text="银联"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/bg_bule_btn"
+        android:gravity="center"
+        android:textColor="@color/white"
+        android:layout_marginTop="20dp"
+        android:layout_marginLeft="50dp"
+        android:layout_marginRight="50dp"
+        />
+
+
+</LinearLayout>

WeiChat/src/main/res/layout/content_pay_test.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context="com.xzjmyk.pm.activity.ui.me.PayTestActivity"
+    tools:showIn="@layout/activity_pay_test">
+
+</android.support.constraint.ConstraintLayout>

WeiChat/src/main/res/layout/fragment_me.xml

@@ -640,6 +640,33 @@
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/paytest_rl"
+            style="@style/IMTbleLine_UP_Me"
+            android:layout_marginTop="7dp"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:visibility="visible">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/icon_uu_setting"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="支付退款"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <ImageView
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="8dp"
+                android:background="@drawable/oa_next"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
     </LinearLayout>
 
 </ScrollView>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Apr 02 09:50:54 CST 2018
-debugName=356
+#Tue Apr 17 17:58:07 CST 2018
+debugName=364
 versionName=624
-debugCode=356
+debugCode=364
 versionCode=163