Merge remote-tracking branch 'origin/master'

杨帅
2 parents 24d280d8 f0088f9c
Showing 15 changed files with 48 additions and 19 deletions
app/src/main/java/com/example/modulepedometer/MyApp.java
build.gradle
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/TakePartView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/MyRecordInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ShareRecordActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
moudle_pedometer/src/main/res/drawable-hdpi/bmcg_tak.png
moudle_pedometer/src/main/res/drawable-xhdpi/bmcg_tak.png
moudle_pedometer/src/main/res/drawable-xxhdpi/bmcg_tak.png
moudle_pedometer/src/main/res/layout/activity_share_record.xml
moudle_pedometer/src/main/res/layout/fragment_registration_info.xml
moudle_pedometer/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@ public class MyApp extends Application {
         String userId = "";
         AppConfig.init(getApplicationContext(), BuildConfig.APP_ID, BuildConfig.APP_KEY, BuildConfig.APP_SCERET,
                 0, BuildConfig.DEBUG, "", "",
-                userId, "", "", "", "");
+                userId, "", "", "", "","","","");
         initARouter();
         //在使用SDK各组件之前初始化context信息，传入ApplicationContext
         SDKInitializer.initialize(getApplicationContext());
@@ -68,7 +68,7 @@ ext {
     //qmui
     qmui = '1.1.5'
-    libBase = '1.0.9'
+    libBase = '1.3.4'
     libNetwork = '1.1.0'
     libLargeImage = '1.0.1'
     libEmoj = '1.9.8'
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.1.5",
+            version: "0.1.7",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -111,7 +111,7 @@ public class TakePartView implements MvpView {
     public void showEmpty(){
         fragment.binding.empty.setVisibility(View.VISIBLE);
         fragment.binding.refreshLayout.setVisibility(View.GONE);
-        fragment.binding.empty.show("还没有人参加哦", "", R.drawable.zhuangtai_kong);
+        fragment.binding.empty.show("暂无参与", "", R.drawable.bmcg_tak);
     }
@@ -100,6 +100,7 @@ public class MyRecordInfo {
         private int signupNum;
         private long start_time;
         private String title;
+        private String day;
         private List<String> faceUrl;
         public String getAddress() {
@@ -158,6 +159,14 @@ public class MyRecordInfo {
             this.title = title;
         }
+        public String getDay() {
+            return day;
+        }
+
+        public void setDay(String day) {
+            this.day = day;
+        }
+
         public List<String> getFaceUrl() {
             return faceUrl;
         }
@@ -23,7 +23,5 @@ public class RunLineActivity extends AppCompatActivity {
         setContentView(R.layout.activity_run_line);
         getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new RunLineFragment()).commit();
-//        getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new CollRunningFinishFragment()).commit();
-
     }
 }
@@ -14,6 +14,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cnlive.libs.base.arouter.QrService;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsListener;
@@ -53,7 +54,7 @@ public class ShareRecordActivity extends AppCompatActivity {
         setContentView(R.layout.activity_share_record);
         cord_name = findViewById(R.id.cord_name);
-        cord_name.setText("我在" + getIntent().getStringExtra("raceTitle") + "中的最佳成绩");
+        cord_name.setText("我在中国网家家" + getIntent().getStringExtra("raceTitle") + "中的最佳成绩");
         ((TextView) findViewById(R.id.kilo_share)).setText(getIntent().getStringExtra("kilo"));
         ((TextView) findViewById(R.id.step_share)).setText(getIntent().getStringExtra("step"));
         ((TextView) findViewById(R.id.time_share)).setText(getIntent().getStringExtra("time"));
@@ -97,9 +98,9 @@ public class ShareRecordActivity extends AppCompatActivity {
             }
         });
-//        QrService service= (QrService) ARouter.getInstance().build("/app/base/qrservice").navigation(this);
-//        Bitmap bitmap= service.createQRNoIconBitmap("321212312312312",240);
-//        ((ImageView) findViewById(R.id.down_img)).setImageBitmap(bitmap);
+        QrService service= (QrService) ARouter.getInstance().navigation(QrService.class);
+        Bitmap bitmap= service.createQRNoIconBitmap("http://apiwjj.cnlive.com/download/index.html",320);
+        ((ImageView) findViewById(R.id.down_img)).setImageBitmap(bitmap);
     }
     private void share(){
@@ -65,10 +65,11 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
         myViewHolder.join_person.initIconData(list.get(i).getFaceUrl());
         if(state.equals("0")){
             myViewHolder.day_num.setVisibility(View.VISIBLE);
-            myViewHolder.after_finish.setText("天后结束");
-            myViewHolder.day_num.setText("2");
+            myViewHolder.after_finish.setVisibility(View.GONE);
+            myViewHolder.day_num.setText(list.get(i).getDay());
         }else {
             myViewHolder.day_num.setVisibility(View.GONE);
+            myViewHolder.after_finish.setVisibility(View.VISIBLE);
             myViewHolder.after_finish.setText("已结束");
         }
     }
@@ -41,6 +41,8 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
     }
     public void commitInfo(){
-        getPresenter().commitInfo(getActivity(),CommonInfo.getStreetId(getActivity()), "10514343","15210479774","","");
+        getPresenter().commitInfo(getActivity(),CommonInfo.getStreetId(getActivity()),"10514343","15210479774",
+                binding.sexText.getText().toString().trim().equals("未选择")?"":binding.sexText.getText().toString().trim(),
+                binding.birthday.getText().toString().trim().equals("未选择")?"":binding.birthday.getText().toString().trim());
     }
 }
@@ -258,8 +258,7 @@
                     android:id="@+id/down_img"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:src="@drawable/erwe" />
+                    android:layout_weight="1" />
             </LinearLayout>
         </RelativeLayout>
@@ -83,14 +83,23 @@
                 android:padding="15dp">
                 <TextView
-                    android:id="@+id/sex_text"
+                    android:id="@+id/sex"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="#333333"
                     android:textSize="16sp"
-                    android:text="性别（非必填） 未选择"
+                    android:text="性别（非必填） "
                     />
+                <TextView
+                    android:id="@+id/sex_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/sex"
+                    android:text="未选择"
+                    android:textColor="#333333"
+                    android:textSize="16sp"/>
+
                 <ImageView
                     android:layout_width="8dp"
                     android:layout_height="13dp"
@@ -111,12 +120,22 @@
                 android:padding="15dp">
                 <TextView
+                    android:id="@+id/birthday_t"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#333333"
+                    android:textSize="16sp"
+                    android:text="生日（非必填） "
+                    />
+
+                <TextView
                     android:id="@+id/birthday"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/birthday_t"
                     android:textColor="#333333"
                     android:textSize="16sp"
-                    android:text="生日（非必填） 未选择"
+                    android:text="未选择 "
                     />
                 <ImageView
@@ -48,7 +48,7 @@
     <string name="loc_open_gps">定位失败，建议您打开GPS!</string>
     <string name="loc_open_wifi">定位失败，建议您打开Wi-Fi!</string>
     <string name="beijing">北京</string>
-    <string name="goline">约跑线路</string>
+    <string name="goline">线上赛事</string>
     <string name="myactivity">我的活动</string>
     <string name="_123">123</string>
     <string name="has_part">人已参与</string>