xiahjay · JiYumeng · Aug 28, 2014 · Aug 28, 2014 · Aug 29, 2014 · Aug 29, 2014
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,4 @@ project.properties
 
 # Proguard folder generated by Eclipse
 proguard/
+.svn/
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,6 @@
 eclipse.preferences.version=1
 encoding//src/com/example/headdiary/hddialog/EndTimeDialog.java=UTF-8
+encoding//src/com/example/headdiary/hddialog/EndTimeQuestion.java=UTF-8
+encoding//src/com/example/headdiary/hddialog/SelectMonthDialog.java=UTF-8
 encoding//src/com/example/headdiary/hddialog/StartTimeDialog.java=UTF-8
+encoding//src/com/example/headdiary/hddialog/StartTimeQuestion.java=UTF-8
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -16,13 +16,32 @@
     <!-- 查看网络连接状态的权限 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+    <!--以下为必须的权限 -->
+
+<uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
+<uses-permission android:name="android.permission.WAKE_LOCK" />
+<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+<uses-permission android:name="android.permission.VIBRATE" />
+<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+<uses-permission android:name="getui.permission.GetuiService" />
+
+<!--自定义权限-->
+<permission
+	android:name="getui.permission.GetuiService"
+	android:protectionLevel="normal" >
+</permission>
+
+
     <application
         android:name="com.example.headdiary.util.MyApplication"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        android:windowSoftInputMode="stateAlwaysHidden" >
+        android:windowSoftInputMode="stateAlwaysHidden" 
+        android:launchMode="singleInstance">
         <activity
             android:name="com.example.headdiary.MainActivity"
             android:label="@string/app_name" >
@@ -39,6 +58,10 @@
         </activity>
         <activity
             android:name="com.example.headdiary.HomeActivity"
+            android:label="@string/title_activity_home">
+        </activity>
+        <activity
+            android:name="com.example.headdiary.UnfinishedDiaryActivity"
             android:label="@string/title_activity_home" >
         </activity>
         <activity
@@ -50,55 +73,120 @@
             android:label="@string/title_activity_start_time_diaglog"
             android:theme="@style/MyDialogStyle" >
         </activity>
+        <activity
+            android:name="com.example.headdiary.hddialog.SelectMonthDialog"
+            android:label="@string/title_activity_start_time_diaglog"
+            android:theme="@style/MyDialogStyle" >
+        </activity>
+         <activity
+            android:name="com.example.headdiary.hddialog.StartTimeQuestion"
+            android:label="@string/title_activity_start_time_diaglog"
+            android:theme="@style/MyDialogStyle" >
+        </activity>
         <activity
             android:name="com.example.headdiary.hddialog.EndTimeDialog"
             android:label="@string/title_activity_end_time_dialog"
             android:theme="@style/MyDialogStyle" >
+        </activity>
+         <activity
+            android:name="com.example.headdiary.hddialog.EndTimeQuestion"
+            android:label="@string/title_activity_end_time_dialog"
+            android:theme="@style/MyDialogStyle" >
         </activity>
         <activity
             android:name="com.example.headdiary.hddialog.AchePositionDialog"
             android:label="@string/title_activity_ache_position_dialog"
             android:theme="@style/MyDialogStyle" >
+        </activity>
+         <activity
+            android:name="com.example.headdiary.hddialog.AchePositionQuestion"
+            android:label="@string/title_activity_ache_position_dialog"
+            android:theme="@style/MyDialogStyle" >
         </activity>
         <activity
             android:name="com.example.headdiary.hddialog.AcheTypeDialog"
             android:label="@string/title_activity_ache_type_dialog"
             android:theme="@style/MyDialogStyle" >
+        </activity>
+         <activity
+            android:name="com.example.headdiary.hddialog.AcheTypeQuestion"
+            android:label="@string/title_activity_ache_type_dialog"
+            android:theme="@style/MyDialogStyle" >
         </activity>
         <activity
             android:name="com.example.headdiary.hddialog.AcheDegreeDialog"
             android:label="@string/title_activity_ache_degree"
             android:theme="@style/MyDialogStyle" >
         </activity>
+        <activity
+            android:name="com.example.headdiary.hddialog.AcheDegreeQuestion"
+            android:label="@string/title_activity_ache_degree"
+            android:theme="@style/MyDialogStyle" >
+        </activity>
         <activity
             android:name="com.example.headdiary.hddialog.ActivityAggravateDialog"
             android:label="@string/title_activity_activity_aggravate_dialog"
             android:theme="@style/MyDialogStyle" >
+        </activity>
+         <activity
+            android:name="com.example.headdiary.hddialog.ActivityAggravateQuestion"
+            android:label="@string/title_activity_activity_aggravate_dialog"
+            android:theme="@style/MyDialogStyle" >
         </activity>
         <activity
             android:name="com.example.headdiary.hddialog.ProdromeDialog"
             android:label="@string/title_activity_prodrome_dialog"
             android:theme="@style/MyDialogStyle" >
+        </activity>
+         <activity
+            android:name="com.example.headdiary.hddialog.ProdromeQuestion"
+            android:label="@string/title_activity_prodrome_dialog"
+            android:theme="@style/MyDialogStyle" >
         </activity>
         <activity
             android:name="com.example.headdiary.hddialog.CompanionDialog"
             android:label="@string/title_activity_companion0_diaglog"
             android:theme="@style/MyDialogStyle" >
         </activity>
+        <activity
+            android:name="com.example.headdiary.hddialog.CompanionQuestion"
+            android:label="@string/title_activity_companion0_diaglog"
+            android:theme="@style/MyDialogStyle" >
+        </activity>
+          <activity
+            android:name="com.example.headdiary.hddialog.CompanionQ1"
+            android:label="@string/title_activity_companion0_diaglog"
+            android:theme="@style/MyDialogStyle" >
+        </activity>
         <activity
             android:name="com.example.headdiary.hddialog.MitigatingDialog"
             android:label="@string/title_activity_mitigating_dialog"
             android:theme="@style/MyDialogStyle" >
         </activity>
+        <activity
+            android:name="com.example.headdiary.hddialog.MitigatingQuestion"
+            android:label="@string/title_activity_mitigating_dialog"
+            android:theme="@style/MyDialogStyle" >
+        </activity>
         <activity
             android:name="com.example.headdiary.hddialog.PrecipiatingDialog"
             android:label="@string/title_activity_precipiating_dialog"
             android:theme="@style/MyDialogStyle" >
+        </activity>
+         <activity
+            android:name="com.example.headdiary.hddialog.PrecipiatingQuestion"
+            android:label="@string/title_activity_precipiating_dialog"
+            android:theme="@style/MyDialogStyle" >
         </activity>
         <activity
             android:name="com.example.headdiary.hddialog.AddDrugDialog"
             android:label="@string/title_activity_add_drug_dialog"
             android:theme="@style/MyDialogStyle" >
+        </activity>
+         <activity
+            android:name="com.example.headdiary.hddialog.AddDrugQuestion"
+            android:label="@string/title_activity_add_drug_dialog"
+            android:theme="@style/MyDialogStyle" >
         </activity>
         <activity
             android:name="com.example.headdiary.MainDoctorActivity"
@@ -115,16 +203,138 @@
         <activity
             android:name="com.example.headdiary.MainDocumentActivity"
             android:label="@string/title_activity_main_document" >
+        </activity>
+         <activity
+            android:name="com.example.headdiary.DoctorOnlineActivity"
+            android:label="@string/title_activity_main_document" >
         </activity>
         <activity
             android:name="com.example.headdiary.MainAnalysisActivity"
             android:label="@string/title_activity_main_analysis" >
+        </activity>
+         <activity
+            android:name="com.example.headdiary.GraphicActivity"
+            android:label="@string/title_activity_main_analysis" >
+        </activity>
+          <activity
+            android:name="com.example.headdiary.UIADemoActivity"
+            android:label="@string/title_activity_main_analysis" >
         </activity>
         <activity
             android:name="com.example.headdiary.RegisterActivity"
             android:label="@string/title_activity_register" 
             android:windowSoftInputMode="stateAlwaysHidden">
         </activity>
+
+      <!-- 个推SDK配置开始 -->
+      <!-- 配置的第三方参数属性 -->
+      <meta-data 
+       android:name="PUSH_APPID" 
+       android:value="fDGJSsU22U7etxd2nUG751" />
+
+      <meta-data 
+       android:name="PUSH_APPSECRET" 
+       android:value="U7YUHInuqb9CltOAKby1u7" />
+
+      <meta-data 
+       android:name="PUSH_APPKEY" 
+       android:value="lwgZ9rlfQoAZOXvpUoeGR5" />
+
+      <meta-data 
+       android:name="PUSH_GROUPID" 
+       android:value="" />
+
+      <!-- 配置第三方Receiver -->
+      <receiver
+       android:name="com.example.headdiary.PushDemoReceiver"
+       android:exported="false" >
+        <intent-filter>
+         <action android:name="com.igexin.sdk.action.fDGJSsU22U7etxd2nUG751" />
+        </intent-filter>
+      </receiver>
+
+     <!--配置SDK核心服务-->
+      <service android:name="com.igexin.sdk.PushService"
+	   android:exported="true"
+	   android:label="NotificationCenter"
+	   android:process=":pushservice" >
+      </service>
+
+      <receiver android:name="com.igexin.sdk.PushReceiver">
+	   <intent-filter>
+		<action android:name="android.intent.action.BOOT_COMPLETED" />
+		<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+		<action android:name="android.intent.action.USER_PRESENT" />
+		<action android:name="com.igexin.sdk.action.refreshls" />
+	   </intent-filter>
+      </receiver>
+
+      <receiver 
+       android:name="com.igexin.sdk.PushReceiver"
+	   android:exported="false" >
+	    <intent-filter>
+    	 <action android:name="com.igexin.sdk.action.pushmanager" />
+	    </intent-filter>
+      </receiver>
+
+      <activity 
+       android:name="com.igexin.sdk.PushActivity"
+	   android:process=":pushservice"
+	   android:theme="@android:style/Theme.Translucent.NoTitleBar"
+	   android:taskAffinity="com.igexin.sdk.PushActivityTask"
+	   android:excludeFromRecents="true"
+	   android:exported="false">
+     </activity>
+
+    <!-- 配置弹框activity -->
+     <activity 
+      android:name="com.igexin.getuiext.activity.GetuiExtActivity"  
+	  android:process=":pushservice"
+	  android:configChanges="orientation|keyboard|keyboardHidden"
+	  android:excludeFromRecents="true"
+	  android:taskAffinity="android.task.myServicetask"
+	  android:theme="@android:style/Theme.Translucent.NoTitleBar"
+	  android:exported="false" />
+
+    <receiver 
+     android:name="com.igexin.getuiext.service.PayloadReceiver"
+	 android:exported="false" >	    
+	 <intent-filter>
+      <!-- 这个com.igexin.sdk.action.7fjUl2Z3LH6xYy7NQK4ni4固定，不能修改  -->
+	  <action android:name="com.igexin.sdk.action.7fjUl2Z3LH6xYy7NQK4ni4" />
+	  <!-- android:name="com.igexin.sdk.action.第三方的appId" -->			
+	  <action android:name="com.igexin.sdk.action.fDGJSsU22U7etxd2nUG751" />
+	 </intent-filter>
+    </receiver>
+
+    <service 
+     android:name="com.igexin.getuiext.service.GetuiExtService" 
+	 android:process=":pushservice" />
+
+   <!-- 个推download模块配置-->
+    <service 
+     android:name="com.igexin.download.DownloadService"
+	 android:process=":pushservice" />
+
+    <receiver
+	android:exported="false" 
+	android:name="com.igexin.download.DownloadReceiver"> 
+	 <intent-filter>
+	  <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+	 </intent-filter>
+    </receiver>
+
+    <provider 
+    android:name="com.igexin.download.DownloadProvider" 
+	android:process=":pushservice" 
+	android:authorities="downloads.com.example.headdiary"/>
+	<!-- android:authorities="downloads.第三方包名" -->
+<!-- ====================================================== -->
+
+
+
     </application>
 
+
+
 </manifest>
diff --git a/libs/GetuiExt-1.2.2.jar b/libs/GetuiExt-1.2.2.jar
diff --git a/libs/GetuiSdk2.2.5.9.jar b/libs/GetuiSdk2.2.5.9.jar
diff --git a/libs/armeabi/libgetuiext.so b/libs/armeabi/libgetuiext.so
diff --git a/res/anim/bottomitem_in.xml b/res/anim/bottomitem_in.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<scale xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXScale="0.9"
+    android:toXScale="1"
+    android:fromYScale="0.9"
+    android:toYScale="1"
+    android:pivotX="50%"
+    android:pivotY="0"
+    android:duration="300" >
+</scale>
diff --git a/res/anim/inuptodown.xml b/res/anim/inuptodown.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <translate
+        android:duration="500"
+        android:fromYDelta="-15%"
+        android:toYDelta="0" />
+
+</set>
diff --git a/res/anim/outdowntoup.xml b/res/anim/outdowntoup.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <translate
+        android:duration="300"
+        android:fromYDelta="0"
+        android:toYDelta="-15%" />
+
+</set>
diff --git a/res/anim/topitem_in.xml b/res/anim/topitem_in.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<scale xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXScale="0.9"
+    android:toXScale="1"
+    android:fromYScale="0.9"
+    android:toYScale="1"
+    android:pivotX="50%"
+    android:pivotY="100%"
+    android:duration="300" >
+</scale>
diff --git a/res/drawable-hdpi/arrow1.png b/res/drawable-hdpi/arrow1.png
diff --git a/res/drawable-hdpi/arrow2.png b/res/drawable-hdpi/arrow2.png
diff --git a/res/drawable-hdpi/arrow_left.png b/res/drawable-hdpi/arrow_left.png
diff --git a/res/drawable-hdpi/arrow_left1.png b/res/drawable-hdpi/arrow_left1.png
diff --git a/res/drawable-hdpi/arrow_right.png b/res/drawable-hdpi/arrow_right.png
diff --git a/res/drawable-hdpi/arrow_right1.png b/res/drawable-hdpi/arrow_right1.png
diff --git a/res/drawable-hdpi/bg1.jpg b/res/drawable-hdpi/bg1.jpg
diff --git a/res/drawable-hdpi/bg_shezhi.9.png b/res/drawable-hdpi/bg_shezhi.9.png
diff --git a/res/drawable-hdpi/btn_big_popsubmit_disable.9.png b/res/drawable-hdpi/btn_big_popsubmit_disable.9.png
diff --git a/res/drawable-hdpi/comment_divider_line.png b/res/drawable-hdpi/comment_divider_line.png
diff --git a/res/drawable-hdpi/ic_pulltorefresh_arrow.png b/res/drawable-hdpi/ic_pulltorefresh_arrow.png
diff --git a/res/drawable-hdpi/line_cross.png b/res/drawable-hdpi/line_cross.png
diff --git a/res/drawable-hdpi/list_item_bg1.9.png b/res/drawable-hdpi/list_item_bg1.9.png
diff --git a/res/drawable-hdpi/listview_item_background.9.png b/res/drawable-hdpi/listview_item_background.9.png
diff --git a/res/drawable-hdpi/nav_menu_bg.png b/res/drawable-hdpi/nav_menu_bg.png
diff --git a/res/drawable-hdpi/nav_menu_home.png b/res/drawable-hdpi/nav_menu_home.png
diff --git a/res/drawable-hdpi/nav_menu_home_selected.png b/res/drawable-hdpi/nav_menu_home_selected.png
diff --git a/res/drawable-hdpi/nav_menu_hot.png b/res/drawable-hdpi/nav_menu_hot.png
diff --git a/res/drawable-hdpi/nav_menu_hot_selected.png b/res/drawable-hdpi/nav_menu_hot_selected.png
diff --git a/res/drawable-hdpi/publish_input_bg.9.png b/res/drawable-hdpi/publish_input_bg.9.png
diff --git a/res/drawable-hdpi/push.png b/res/drawable-hdpi/push.png
diff --git a/res/drawable-hdpi/security_row_qq_bg.9.png b/res/drawable-hdpi/security_row_qq_bg.9.png
diff --git a/res/drawable-hdpi/slash_line.png b/res/drawable-hdpi/slash_line.png
diff --git a/res/drawable-hdpi/tab_unread_bg.9.png b/res/drawable-hdpi/tab_unread_bg.9.png
diff --git a/res/drawable-ldpi/push.png b/res/drawable-ldpi/push.png
diff --git a/res/drawable-mdpi/push.png b/res/drawable-mdpi/push.png
diff --git a/res/drawable/i_shade.xml b/res/drawable/i_shade.xml
@@ -0,0 +1,10 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <gradient
+        android:angle="90"
+        android:endColor="@color/gray"
+        android:centerColor="@color/blue"
+        android:startColor="@color/gray" />
+
+</shape>
diff --git a/res/drawable/slash_bg.xml b/res/drawable/slash_bg.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap android:src="@drawable/slash_line" android:tileMode="repeat"
+  xmlns:android="http://schemas.android.com/apk/res/android" />
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,3 +36,4 @@ project.properties

		# Proguard folder generated by Eclipse
		proguard/
		.svn/