Просмотр исходного кода

修复正式服加密配置错误;调整新手任务界面

zengjiebin лет назад: 8
Родитель
Сommit
7793af07f1

+ 1 - 1
app/build.gradle

@@ -113,7 +113,7 @@ android {
             ]
             buildConfigField "String", "DUANDUAN_DATASHARE", '"sheep"'
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheep"'
-            buildConfigField "boolean", "XXTEA_ENCRYPT", 'false'
+            buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
             buildConfigField "String", "API_DOMAIN", '"app.bandai.yunduanzs.cn"'
             buildConfigField "String", "APP_URL", '"http://ss.kfzs.com/"'
 //            buildConfigField "String", "APP_URL", '"http://10.8.220.5:8080/"'//张伟

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActNewbieTaskList.java

@@ -54,7 +54,7 @@ public class ActNewbieTaskList extends BaseActivity {
         BaseMessage baseMessage = (BaseMessage) getIntent().getSerializableExtra(BaseMessage.class.getSimpleName());
         newbieTaskList = baseMessage.getDatas(NewbieTask.class);
         TitleBarUtils.getInstance()
-                .setTitle(this, "新手任务")
+                .setTitle(this, "任务中心")
                 .setTitleFinish(this);
         swipe_container.setFooterView(this, withdrawalListview, R.layout.listview_footer);
         adp = new NewbieTaskAdp(activity, etyList);

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/NewbieTaskAdp.java

@@ -66,7 +66,7 @@ public class NewbieTaskAdp extends BaseAdapter {
         final NewbieTask ety = (NewbieTask) getItem(position);
         holder.newbie_task_iv.setImageResource(ids[ety.getId()]);
         holder.newbie_task_name_tv.setText(ety.getName());
-        holder.newbie_task_money_tv.setText(String.format(Locale.CHINESE, "%.1f", ety.getAmount()));
+        holder.newbie_task_money_tv.setText(String.format(Locale.CHINESE, "+%.1f", ety.getAmount()));
         holder.newbie_task_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

+ 1 - 1
app/src/main/res/drawable/shape_newbie_task_tv.xml

@@ -3,5 +3,5 @@
     android:shape="rectangle">
     <corners android:radius="15dp"/>
 
-    <solid android:color="#2ba245"/>
+    <solid android:color="#ffe55d"/>
 </shape>

+ 1 - 1
app/src/main/res/drawable/sp_dot_red.xml

@@ -4,7 +4,7 @@
     <size
         android:width="2dp"
         android:height="2dp" />
-    <solid android:color="@android:color/holo_red_dark" />
+    <solid android:color="#ff3c33" />
 
 
 </shape>

+ 9 - 2
app/src/main/res/layout/act_newbie_task_list.xml

@@ -6,11 +6,18 @@
     android:orientation="vertical">
 
     <include layout="@layout/title" />
+    <TextView
+        android:id="@+id/my_price"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="新手任务"
+        android:textColor="#7e7e7e"
+        android:textSize="14sp"
+        android:padding="@dimen/content_padding_10"/>
     <com.sheep.gamegroup.view.customview.RefreshLayout
         android:id="@+id/swipe_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/content_padding_10">
+        android:layout_height="match_parent">
 
         <ListView
             android:id="@+id/withdrawal_listview"

+ 3 - 3
app/src/main/res/layout/homepage_act_layout.xml

@@ -127,11 +127,11 @@
                         android:layout_marginBottom="@dimen/content_padding_13"
                         android:paddingTop="@dimen/content_padding_small"
                         android:paddingBottom="@dimen/content_padding_small"
-                        android:paddingStart="@dimen/content_padding_10"
-                        android:paddingEnd="@dimen/content_padding_10"
+                        android:paddingStart="@dimen/content_padding_15"
+                        android:paddingEnd="@dimen/content_padding_15"
                         android:background="@drawable/shape_newbie_task_tv"
                         android:textSize="12sp"
-                        android:textColor="#ffffff"
+                        android:textColor="#5A4E48"
                         android:text="新手任务"/>
                     <ImageView
                         android:layout_width="8dp"